Commit Graph

25 Commits

Author SHA1 Message Date
Jens-Heiner Rechtien
86398ecd59 INTEGRATION: CWS swwarnings (1.24.162); FILE MERGED
2007/05/29 11:31:03 os 1.24.162.2: RESYNC: (1.24-1.25); FILE MERGED
2007/04/03 12:59:56 tl 1.24.162.1: #i69287# warning-free code
2007-09-27 08:00:49 +00:00
Rüdiger Timm
7449a9ae74 INTEGRATION: CWS os94 (1.24.186); FILE MERGED
2007/03/12 08:10:42 os 1.24.186.1: #i75235# unused methods removed
2007-04-25 08:07:03 +00:00
Vladimir Glazounov
8878bfef9c INTEGRATION: CWS swqbf88 (1.23.26); FILE MERGED
2006/10/05 09:24:39 od 1.23.26.1: #i70122# method <SwAnchoredObject::GetObjRectWithSpaces()>
	 - use bounding rectangle of anchored object.
2006-11-01 14:12:28 +00:00
Oliver Bolte
db7d9b9c40 INTEGRATION: CWS pchfix02 (1.21.2); FILE MERGED
2006/09/01 17:51:46 kaib 1.21.2.1: #i68856# Added header markers and pch files
2006-09-16 20:16:21 +00:00
Oliver Bolte
0c649c4535 INTEGRATION: CWS swqbf81 (1.20.22); FILE MERGED
2006/08/21 11:06:26 od 1.20.22.2: RESYNC: (1.20-1.21); FILE MERGED
2006/08/21 07:35:44 od 1.20.22.1: #i68520# - performance provement:
	   - introduce cache for bounding rectangle in class <SwAnchoredObject>
2006-09-15 10:41:59 +00:00
Jens-Heiner Rechtien
677d5271f2 INTEGRATION: CWS writercorehandoff (1.14.88); FILE MERGED
2006/07/27 14:43:56 fme 1.14.88.8: RESYNC: (1.19-1.20); FILE MERGED
2006/04/05 13:08:56 tra 1.14.88.7: RESYNC: (1.18-1.19); FILE MERGED
2006/03/17 08:08:56 tra 1.14.88.6: RESYNC: (1.17-1.18); FILE MERGED
2005/11/04 12:58:01 tra 1.14.88.5: #i50348#
2005/10/25 08:31:04 tra 1.14.88.4: RESYNC: (1.15-1.16); FILE MERGED
2005/09/13 14:05:06 tra 1.14.88.3: RESYNC: (1.14-1.15); FILE MERGED
2005/07/14 05:01:14 fme 1.14.88.2: #i50348# Make SwDoc accessible via interfaces
2005/07/12 11:21:30 tra 1.14.88.1: #i50348#make SwDoc interface based
2006-08-14 15:24:35 +00:00
Rüdiger Timm
c8c082cf75 INTEGRATION: CWS swqbf75 (1.19.190); FILE MERGED
2006/07/24 11:45:33 od 1.19.190.1: #b6449874# class <SwAnchoredObject>
	   - implementation of new method <SetTmpConsiderWrapInfluenceOfOtherObjs(..)>
2006-07-26 07:16:52 +00:00
Oliver Bolte
f39636ed1f INTEGRATION: CWS swdrawobjpos203 (1.18.88); FILE MERGED
2006/03/20 08:33:17 od 1.18.88.1: #i62875# method <SwAnchoredObject::ChgAnchor(..)>
	 - do not call <ObjectAttachedToAnchorFrame> is no new anchor frame.
2006-03-22 11:24:22 +00:00
Jens-Heiner Rechtien
acd7eaa1e2 INTEGRATION: CWS swqbf50 (1.17.102); FILE MERGED
2006/01/02 13:21:45 od 1.17.102.1: #125977# <SwAnchoredObject::SetPageFrm(..)>
	 - clear member <mpVertPosOrientFrm>, if it doesn't fit to new
	   page frame.
2006-01-27 13:35:17 +00:00
Jens-Heiner Rechtien
0715824e0b INTEGRATION: CWS swqbf40 (1.15.16); FILE MERGED
2005/10/11 10:25:40 od 1.15.16.2: RESYNC: (1.15-1.16); FILE MERGED
2005/09/29 11:50:00 od 1.15.16.1: #i55204# <SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos()>
	 - correction: wrapping style influence has been considered,
	   if condition <IsTmpConsiderWrapInfluence()> is hold.
2005-10-27 15:01:12 +00:00
Jens-Heiner Rechtien
a2b1449da2 INTEGRATION: CWS swqbf35 (1.14.144); FILE MERGED
2005/09/22 16:06:51 fme 1.14.144.2: RESYNC: (1.14-1.15); FILE MERGED
2005/08/09 07:15:24 od 1.14.144.1: #i52904# class <SwObjPositioningInProgress>
	 - consider nested usage of this class
2005-09-28 10:10:14 +00:00
Rüdiger Timm
ca05018e29 INTEGRATION: CWS ooo19126 (1.14.226); FILE MERGED
2005/09/05 13:40:12 rt 1.14.226.1: #i54170# Change license header: remove SISSL
2005-09-09 03:07:08 +00:00
Rüdiger Timm
6f79f9c9d7 INTEGRATION: CWS swqbugfixes18 (1.11.58); FILE MERGED
2005/03/15 11:51:48 fme 1.11.58.1: #i45019# Do not search for cell frame if object is anchored to page frame
2005-03-30 09:53:19 +00:00
Vladimir Glazounov
28a1beeed7 INTEGRATION: CWS swqbugfixes17 (1.11.18); FILE MERGED
2005/03/08 09:19:33 od 1.11.18.1: #i44339# methods of classes <SwAnchoredObject> and <SwAnchoredDrawObject>
	 - include code to increase its savety.
2005-03-23 11:58:31 +00:00
Vladimir Glazounov
b8e2de5e8c INTEGRATION: CWS swqbugfixes16 (1.10.76); FILE MERGED
2005/03/03 08:42:33 od 1.10.76.3: RESYNC: (1.10-1.11); FILE MERGED
2005/03/03 07:45:16 od 1.10.76.2: #i43913# <SwAnchoredObject::HasClearedEnvironment()> - layout frame,
	 the vertical position is oriented at, has to be set.
2005/02/22 13:32:19 od 1.10.76.1: #i43255# class <SwAnchoredObject> - implementation of
	 new method <ConsiderObjWrapInfluenceOfOtherObjs()>
2005-03-23 10:52:41 +00:00
Vladimir Glazounov
a6793aa76f INTEGRATION: CWS swqbugfixes14 (1.10.4); FILE MERGED
2005/01/28 12:35:43 od 1.10.4.1: #i33818# <SwAnchoredObject::GetRelPosToPageFrm(..)> - adjustment to
	 improvement WW8 export of anchored object positions.
2005-02-22 07:19:21 +00:00
Kurt Zenker
15a72d55df INTEGRATION: CWS swqbugfixes12 (1.9.8); FILE MERGED
2005/01/11 12:29:53 od 1.9.8.2: #i40147# class <SwAnchoredObject> - new member <mbKeepLockedPositionForSection>
2005/01/07 15:39:03 od 1.9.8.1: #i30669# - implementation of new methods, which provides needed layout
	   information for the WW8 filter.
2005-01-21 09:33:21 +00:00
Vladimir Glazounov
79d9cea3f2 INTEGRATION: CWS swqbugfixes10 (1.8.4); FILE MERGED
2004/12/03 15:26:59 od 1.8.4.1: #115759# <SwAnchoredObject::GetVertPosOrientFrm()> is inline now
2004-12-23 09:06:20 +00:00
Oliver Bolte
783db50edb INTEGRATION: CWS swqbugfixes09 (1.6.40); FILE MERGED
2004/11/15 14:07:50 od 1.6.40.4: RESYNC: (1.6-1.7); FILE MERGED
resolve merge conflict.
2004/11/03 12:17:05 od 1.6.40.3: #114798# <SwAnchoredObject::InvalidationOfPosAllowed()
         - no check, if page frame layout is in progress needed.
2004/10/26 08:26:44 od 1.6.40.2: #i35911# class <SwAnchoredObject> - new member <mbClearedEnvironment>
         inclusive accessors, new method <HasClearedEnvironment()>, and
         adjustment to method <SetTmpConsiderWrapInfluence(..)> to
	 collect anchored object in the <SwLayouter> instance, if its
         wrapping style influence has been temporarly applied
2004/10/18 06:37:07 od 1.6.40.1: #i26945# class <SwAnchoredObject> - implementation and usage of new methods
         <FindAnchorCharFrm()> and <GetAnchorFrmContainingAnchPos()>
2004-11-16 14:44:00 +00:00
Jens-Heiner Rechtien
4a9d1f9985 INTEGRATION: CWS swqbugfixes08 (1.6.4); FILE MERGED
2004/09/23 14:28:35 od 1.6.4.2: #i34520# <SwAnchoredObject::ConsiderObjWrapInfluenceOnObjPos()> -
         no check on the anchored objects layer, because text also
         wraps around anchored object, which are in the layer Hell
2004/09/23 09:23:57 od 1.6.4.1: #i33751# method <SwPageFrm& SwAnchoredObject::GetPageFrmOfAnchor()> is replaced
         by method <SwPageFrm* SwAnchoredObject::FindPageFrmOfAnchor()>
2004-11-09 12:46:39 +00:00
Oliver Bolte
92720007d6 INTEGRATION: CWS swqbugfixes06 (1.4.6); FILE MERGED
2004/08/30 12:53:51 od 1.4.6.2: RESYNC: (1.4-1.5); FILE MERGED
2004/08/25 14:53:29 od 1.4.6.1: #i3317# class <SwAnchoredObject> - implementation for applying temporarly
        the straightforward positioning process.
2004-09-09 09:56:32 +00:00
Rüdiger Timm
0e3bf5f613 INTEGRATION: CWS swdrawobjapi (1.2.60); FILE MERGED
2004/08/12 07:08:26 od 1.2.60.2: RESYNC: (1.2-1.4); FILE MERGED
resolve merge conflicts.
2004/07/29 13:22:21 od 1.2.60.1: #i31698# - adjustments for changed drawing object API in Writer
2004-08-23 07:02:09 +00:00
Oliver Düsterhoff
a36111f17c #i28701# integration of cws swobjpos04 into master 2004-08-03 05:05:14 +00:00
Jens-Heiner Rechtien
eace190c6d INTEGRATION: CWS swqbugfixes04 (1.2.22); FILE MERGED
2004/07/15 08:37:19 od 1.2.22.2: #117380# <SwAnchoredObject::CheckCharRectAndTopOfLine(..)
	 - check for paragraph portion information, if requested.
2004/07/14 13:49:56 od 1.2.22.1: #117380# class <SwAnchoredObject>
	 - method <CheckCharRectAndTopOfLine()> - assure that text frame
	   containing the anchor character has paragraph portion info.
	 - methods <_CheckCharRect(..)> and <_CheckTopOfLine(..)> -
	   improved by second parameter <_rAnchorCharFrm>
2004-08-02 12:06:55 +00:00
Hans-Joachim Lankenau
ae306806c9 INTEGRATION: CWS swdrawpositioning (1.1.2); FILE ADDED
2004/06/01 12:06:49 od 1.1.2.3: #i26791# - methods to set/convert positioning attributes.
2004/04/23 09:12:53 od 1.1.2.2: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects
2004/04/07 09:00:39 od 1.1.2.1: #i26791# implementation of new class <SwAnchoredObject> for the unification
	 of the positioning of Writer fly frames and drawing objects.
2004-06-28 12:37:37 +00:00