Commit Graph

27 Commits

Author SHA1 Message Date
Michael Stahl
733b831970 swunolocking1: swtypes.hxx: rename frame anchor types
enum RndStdIds: rename frame anchor types (FLY_*) to be more intuitive.
 [note the completely ridiculous number of files that care about anchor types]
2010-01-05 16:37:41 +01:00
Oliver Bolte
56a1f3affc CWS-TOOLING: integrate CWS cmcfixes49 2008-10-10 13:02:43 +00:00
Rüdiger Timm
f5f3652d40 INTEGRATION: CWS swlists01 (1.24.56); FILE MERGED
2008/05/08 16:32:13 od 1.24.56.2: RESYNC: (1.24-1.25); FILE MERGED
2008/03/06 09:54:19 od 1.24.56.1: #i86732# refactoring due to revised <SwFmt> interface
2008-06-13 08:54:06 +00:00
Rüdiger Timm
0944cc87c0 INTEGRATION: CWS changefileheader (1.24.118); FILE MERGED
2008/04/01 15:57:14 thb 1.24.118.3: #i85898# Stripping all external header guards
2008/04/01 12:54:12 thb 1.24.118.2: #i85898# Stripping all external header guards
2008/03/31 16:54:20 rt 1.24.118.1: #i87441# Change license header to LPGL v3.
2008-04-10 13:37:47 +00:00
Jens-Heiner Rechtien
f022886e9f INTEGRATION: CWS sw8u10bf02 (1.23.96); FILE MERGED
2007/11/30 13:51:11 od 1.23.96.1: #i65798# method <SwAnchoredDrawObject::_SetPositioningAttr()>
	 - set for as-character anchored drawing object also the
	   corresponding flag at <SwDrawFrmFmt> instance.
2008-01-04 12:21:14 +00:00
Jens-Heiner Rechtien
8a1ae40eaf INTEGRATION: CWS swwarnings (1.22.42); FILE MERGED
2007/04/11 07:02:50 tl 1.22.42.2: #i69287# warning-free code
2007/04/03 12:59:55 tl 1.22.42.1: #i69287# warning-free code
2007-09-27 08:00:38 +00:00
Oliver Bolte
ae1f985c16 INTEGRATION: CWS swqbf90 (1.21.16); FILE MERGED
2007/01/03 13:49:57 od 1.21.16.1: #i73079# method <SwAnchoredDrawObject::_SetPositioningAttr()>
	 - vertical position already correct for alignment to character and
	   to line of text
2007-01-23 07:31:22 +00:00
Rüdiger Timm
011e2963c7 INTEGRATION: CWS swqbf89 (1.19.52); FILE MERGED
2006/11/16 10:42:54 od 1.19.52.2: RESYNC: (1.19-1.20); FILE MERGED
2006/11/10 11:07:16 od 1.19.52.1: #i71182# method <SwAnchoredDrawObject::_SetPositioningAttr()>
	 - change only position in <SwFmtHoriOrient> and <SwFmtVertOrient>
	   atrributes without losing other sub attributes.
2006-12-01 13:25:16 +00:00
Vladimir Glazounov
4e459f3d9e INTEGRATION: CWS swqbf88 (1.19.26); FILE MERGED
2006/10/05 09:26:32 od 1.19.26.1: #i70122# classes <SwAnchoredDrawObject> and <SwFlyFrm>
	 - new method <GetObjBoundRect()>
2006-11-01 14:12:14 +00:00
Oliver Bolte
ebfc619857 INTEGRATION: CWS pchfix02 (1.17.2); FILE MERGED
2006/09/01 17:51:46 kaib 1.17.2.1: #i68856# Added header markers and pch files
2006-09-16 20:16:07 +00:00
Oliver Bolte
14e7f91809 INTEGRATION: CWS swqbf81 (1.16.38); FILE MERGED
2006/08/21 11:06:19 od 1.16.38.2: RESYNC: (1.16-1.17); FILE MERGED
2006/08/21 07:35:43 od 1.16.38.1: #i68520# - performance provement:
	   - introduce cache for bounding rectangle in class <SwAnchoredObject>
2006-09-15 10:41:37 +00:00
Jens-Heiner Rechtien
fc683c5091 INTEGRATION: CWS writercorehandoff (1.15.22); FILE MERGED
2006/07/27 14:43:46 fme 1.15.22.2: RESYNC: (1.15-1.16); FILE MERGED
2006/04/11 09:59:15 tra 1.15.22.1: #i50348
2006-08-14 15:24:22 +00:00
Oliver Bolte
00de8127c0 INTEGRATION: CWS swqbf67 (1.15.116); FILE MERGED
2006/05/24 14:32:52 od 1.15.116.1: #b6418964# method <SwAnchoredDrawObject::MakeObjPos()>
	   - reset internal flag <mbNotYetPostioned> after all needed
	     actions are performed in order to avoid callbacks from drawing layer.
2006-07-13 10:30:58 +00:00
Oliver Bolte
c4d0e76d44 INTEGRATION: CWS swdrawobjpos203 (1.14.124); FILE MERGED
2006/03/20 08:31:48 od 1.14.124.1: #i62875# class <SwAnchoredDrawObject>
	 - initialize <mbCaptureAfterLayoutDirChange> in construtor.
	 - implementation of overloaded method <UpdateLayoutDir()> and
	   new method <IsOutsidePage()>.
	 - capturing of drawing object on page in method <MakeObjPos()>,
	   <mbCaptureAfterLayoutDirChange> is set.
2006-03-22 11:24:04 +00:00
Jens-Heiner Rechtien
aa86f5c295 INTEGRATION: CWS dbwizardpp1 (1.12.68); FILE MERGED
2005/12/05 16:41:43 bc 1.12.68.2: RESYNC: (1.12-1.13); FILE MERGED
2005/08/16 12:38:19 od 1.12.68.1: #i53320# class <SwAnchoredDrawObject>
	 - access member <mbNotYetAttachedToAnchorFrame> directly.
2005-12-28 16:12:26 +00:00
Rüdiger Timm
ed69f12395 INTEGRATION: CWS ooo19126 (1.12.96); FILE MERGED
2005/09/05 13:40:11 rt 1.12.96.1: #i54170# Change license header: remove SISSL
2005-09-09 03:06:30 +00:00
Oliver Bolte
5a24c2cd70 INTEGRATION: CWS swqbf34 (1.11.144); FILE MERGED
2005/06/28 12:30:22 od 1.11.144.2: #i50356# - on format of at-paragrapgh/at-character anchored object format
           the anchor frame, which contains the anchor position, instead
           of the master anchor frame.
2005/06/28 09:00:32 od 1.11.144.1: #i45952# <SwAnchoredDrawObject::_SetPositioningAttr()> - indicate at
         frame format that positioning attributes are set.
2005-07-08 10:02:43 +00:00
Vladimir Glazounov
9a7897db90 INTEGRATION: CWS swqbugfixes17 (1.9.154); FILE MERGED
2005/03/11 11:50:12 od 1.9.154.3: #i44334#, #i44681# - set positioning attributes, if not already set.
		   - convert positioning attributes, if position is
		     in horizontal-left-to-right-layout
2005/03/09 15:14:44 od 1.9.154.2: #i44559# <SwAnchoredDrawObject::InvalidateObjPos()>
	 - on notify of anchor text frame for as-character drawing objects
	   assure, that text hint for the drawing object already exists
2005/03/08 09:19:33 od 1.9.154.1: #i44339# methods of classes <SwAnchoredObject> and <SwAnchoredDrawObject>
	 - include code to increase its savety.
2005-03-23 11:58:15 +00:00
Vladimir Glazounov
d3d1b81e84 INTEGRATION: CWS swqbugfixes16 (1.9.128); FILE MERGED
2005/03/01 11:18:44 od 1.9.128.2: #i43255# <SwPosNotify::~SwPosNotify()> - refine condition to notify
	 anchor text frame to avoid unneeded invalidations.
2005/02/22 13:35:05 od 1.9.128.1: #i43255# positioning of anchored objects
	 - refine condition, if anchor frame has to be formatted.
2005-03-23 10:52:27 +00:00
Vladimir Glazounov
40181c7afe INTEGRATION: CWS swqbugfixes10 (1.8.4); FILE MERGED
2004/11/30 11:47:03 od 1.8.4.3: #118547# <SwAnchoredObject::InvalidateObjPos()> - correct invalidation for
	 as-character anchored drawing objects.
2004/11/30 11:27:51 od 1.8.4.2: #i35635# - adjustments to bring drawing objects into visible layer
	   as late as possible
2004/11/29 14:22:29 od 1.8.4.1: #i35007# <SwAnchoredDrawObject::_InvalidatePage(..)
	 - correct invalidation for as-character anchored drawing objects
2004-12-23 09:06:08 +00:00
Oliver Bolte
9a1507e7e2 INTEGRATION: CWS swqbugfixes09 (1.5.40); FILE MERGED
2004/11/15 14:07:44 od 1.5.40.5: RESYNC: (1.6-1.7); FILE MERGED
2004/11/05 11:58:58 od 1.5.40.4: #i26945# - adjustments for negative positioned objects in tables
2004/11/03 14:36:47 od 1.5.40.3: RESYNC: (1.5-1.6); FILE MERGED
2004/10/21 07:05:05 od 1.5.40.2: #i34640# - on background notification additionally notify anchor frame,
           if object has change its page frame
2004/10/18 14:31:31 od 1.5.40.1: #i34995# <SwAnchoredDrawObject::_MakeObjPosAnchoredAtLayout()>
         - set anchor position of drawing object for the filters
2004-11-16 14:43:35 +00:00
Jens-Heiner Rechtien
6cacd9bebc INTEGRATION: CWS swqbugfixes08 (1.5.4); FILE MERGED
2004/09/29 11:02:25 od 1.5.4.2: #117975# <SwAnchoredDrawObject::MakeObjPos()> - perform conversion of
         positioning attributes only for 'master' drawing objects.
2004/09/23 09:23:57 od 1.5.4.1: #i33751# method <SwPageFrm& SwAnchoredObject::GetPageFrmOfAnchor()> is replaced
         by method <SwPageFrm* SwAnchoredObject::FindPageFrmOfAnchor()>
2004-11-09 12:46:22 +00:00
Pascal Junck
9aeed6e3c5 INTEGRATION: CWS dbwizard1 (1.4.18); FILE MERGED
2004/10/25 07:21:56 od 1.4.18.4: #i36010# - set positioning attributes, if position layout direction is 'HoriL2R'
2004/10/20 10:54:09 od 1.4.18.3: #i35798# - replace method <_ConvertPositioningAttr()> by method
           <_SetPositioningAttr()>
2004/10/11 16:16:05 tv 1.4.18.2: RESYNC: (1.4-1.5); FILE MERGED
2004/10/01 12:38:07 od 1.4.18.1: #i34748# class <SwAnchoredDrawObject> - change handling of last object
         rectangle.
2004-10-27 11:31:25 +00:00
Oliver Bolte
dcd26dd2c8 INTEGRATION: CWS swqbugfixes06 (1.3.6); FILE MERGED
2004/08/31 06:16:25 od 1.3.6.6: finishing resolution of merge conflicts.
2004/08/30 12:53:41 od 1.3.6.5: RESYNC: (1.3-1.4); FILE MERGED
2004/08/25 14:55:32 od 1.3.6.4: #i3317# - apply temporarly straightforward positioning process, if
          position oscillation is detected or object overlaps with previous
          column.
2004/08/24 08:07:25 od 1.3.6.3: #i33313# <SwAnchoredDrawObject::AdjustPositioningAttr(..)>
         - handle new parameter <_pNewObjRect>
2004/08/12 14:51:35 od 1.3.6.2: #i32270# <SwAnchoredDrawObject::InvalidateObjPos()> - also invalidate page
	 frame, at which the drawing object is registered at.
2004/08/12 14:24:56 od 1.3.6.1: #i28795# <SwAnchoredDrawObject::MakeObjPos()> - adapt positioning algorithm
         for at-paragraph|at-character anchored Writer fly frames for
         drawing objects.
2004-09-09 09:56:17 +00:00
Rüdiger Timm
b1f803fdef INTEGRATION: CWS swdrawobjapi (1.2.60); FILE MERGED
2004/08/12 05:34:40 od 1.2.60.4: resolve 'conflict' introduced by inadequat merge
2004/08/10 09:31:46 od 1.2.60.3: #i28749# class <SwAnchoredDrawObject> - implementation of position
         attribute converion from OpenOffice.org file format shape position
2004/08/06 04:46:56 od 1.2.60.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:22:21 od 1.2.60.1: #i31698# - adjustments for changed drawing object API in Writer
2004-08-23 07:01:56 +00:00
Oliver Düsterhoff
dcb4116047 #i28701# integration of cws swobjpos04 into master 2004-08-03 05:00:02 +00:00
Hans-Joachim Lankenau
c0def28a4b INTEGRATION: CWS swdrawpositioning (1.1.2); FILE ADDED
2004/06/17 10:22:54 od 1.1.2.5: #i26791# - further adjustments for the unification of the positioning
	   of Writer fly frames and drawing objects.
2004/06/01 12:06:02 od 1.1.2.4: #i26791# - use object geometry instead of its bounding rectangle
	 - method to set and convert positioning attributes.
	 - apply calculated position to to-page/to-fly anchored objects
2004/04/23 09:12:52 od 1.1.2.3: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects
2004/04/08 05:01:55 od 1.1.2.2: #i26791# - further adjustements for the unification of the positioning
	   of Writer fly frames and drawing objects
2004/04/07 09:01:57 od 1.1.2.1: #i26791# implementation of new class <SwAnchoredDrawObject> for the
	 unification of the positioning of Writer fly frames and
	 drawing objects
2004-06-28 12:37:26 +00:00