Commit Graph

19 Commits

Author SHA1 Message Date
Rüdiger Timm
361ed1e28b INTEGRATION: CWS os94 (1.19.246); FILE MERGED
2007/03/12 08:10:43 os 1.19.246.1: #i75235# unused methods removed
2007-04-25 08:09:16 +00:00
Oliver Bolte
2e138e20f8 INTEGRATION: CWS pchfix02 (1.18.2); FILE MERGED
2006/09/01 17:51:55 kaib 1.18.2.1: #i68856# Added header markers and pch files
2006-09-16 20:26:24 +00:00
Jens-Heiner Rechtien
d4c16c3dc7 INTEGRATION: CWS writercorehandoff (1.13.140); FILE MERGED
2006/04/05 13:10:14 tra 1.13.140.6: RESYNC: (1.16-1.17); FILE MERGED
2005/10/25 08:34:52 tra 1.13.140.5: RESYNC: (1.15-1.16); FILE MERGED
2005/09/13 14:17:10 tra 1.13.140.4: RESYNC: (1.14-1.15); FILE MERGED
2005/07/11 06:12:47 tra 1.13.140.3: RESYNC: (1.13-1.14); FILE MERGED
2005/07/05 08:12:53 tra 1.13.140.2: #i50348#make SwDoc interface based
2005/06/24 11:43:33 fme 1.13.140.1: #i50348# Make SwDoc accessible via interfaces
2006-08-14 15:30:45 +00:00
Oliver Bolte
4215b595e9 INTEGRATION: CWS swdrawobjpos203 (1.16.230); FILE MERGED
2006/03/20 08:39:30 od 1.16.230.1: #i62875# method <SwToCntntAnchoredObjectPosition::CalcPosition()>
	 use new method <DoesObjFollowsTextFlow()>
2006-03-22 11:24:52 +00:00
Jens-Heiner Rechtien
6f7e9fe9a2 INTEGRATION: CWS swqbf35 (1.14.36); FILE MERGED
2005/09/22 16:22:56 fme 1.14.36.2: RESYNC: (1.14-1.15); FILE MERGED
2005/08/02 08:40:59 od 1.14.36.1: #i51474# <SwToCntntAnchoredObjectPosition::CalcPosition()>
         - do not set member <mpVertPosOrientFrm> to current known one.
2005-09-28 10:17:17 +00:00
Rüdiger Timm
5497d6207f INTEGRATION: CWS ooo19126 (1.14.94); FILE MERGED
2005/09/05 13:40:30 rt 1.14.94.1: #i54170# Change license header: remove SISSL
2005-09-09 03:36:49 +00:00
Oliver Bolte
acc295bcee INTEGRATION: CWS swqbf34 (1.13.186); FILE MERGED
2005/06/28 12:17:59 od 1.13.186.1: #i45085# <lcl_DoesVertPosFits(..)> - correct check for test grow
2005-07-08 10:05:00 +00:00
Vladimir Glazounov
d942a41d81 #100000# resolve merge inconsistency 2005-03-09 11:18:19 +00:00
Vladimir Glazounov
3b3d7afddc INTEGRATION: CWS swqbugfixes15 (1.10.34); FILE MERGED
2005/02/07 13:30:35 od 1.10.34.1: #i42124# <SwToCntntAnchoredObjectPosition::CalcPosition()>
	 - correction: capture object inside vertical layout environment
		       for all positions.
2005-03-08 12:45:00 +00:00
Vladimir Glazounov
a9aea43bb0 INTEGRATION: CWS os51 (1.9.108); FILE MERGED
2005/01/20 15:19:09 od 1.9.108.1: #118546# - environment of anchored object, which doesn't follows the text
	   flow is always the page frame
2005-02-16 16:02:01 +00:00
Kurt Zenker
ce01a5c003 INTEGRATION: CWS swqbugfixes12 (1.9.74); FILE MERGED
2005/01/12 14:32:48 od 1.9.74.1: #i40155# <SwToCntntAnchoredObjectPosition::CalcPosition()>
	 - get default for <mpVertPosOrientFrm> on return without positioning.
	 - correct check on anchor character rectangle.
2005-01-21 09:39:43 +00:00
Oliver Bolte
26c5f5514b INTEGRATION: CWS swqbugfixes09 (1.8.40); FILE MERGED
2004/11/02 11:57:07 od 1.8.40.2: #i23129# - correct follow text flow inside columned sections.
2004/10/18 07:13:57 od 1.8.40.1: #i26945# - adjustments to allow breaking of table rows containing
           floating screen objects
2004-11-16 14:51:15 +00:00
Oliver Bolte
be5b9d4106 INTEGRATION: CWS swqbugfixes06 (1.6.6); FILE MERGED
2004/08/30 12:54:24 od 1.6.6.2: RESYNC: (1.6-1.7); FILE MERGED
2004/08/24 10:11:10 od 1.6.6.1: #110810# - correction in method <..::CalcPosition()>
2004-09-09 09:59:08 +00:00
Rüdiger Timm
1f708469ee INTEGRATION: CWS swdrawobjapi (1.4.60); FILE MERGED
2004/08/12 07:14:16 od 1.4.60.3: RESYNC: (1.4-1.6); FILE MERGED
2004/08/06 04:47:13 od 1.4.60.2: #i31698# - adjustments for changed drawing object API in Writer
2004/07/29 13:22:54 od 1.4.60.1: #i31698# - adjustments for changed drawing object API in Writer
2004-08-23 07:03:02 +00:00
Kurt Zenker
2b64794af7 INTEGRATION: CWS swobjpos04 (1.3.56); FILE MERGED
2004/07/07 07:42:57 od 1.3.56.5: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:59:08 od 1.3.56.4: #i28701# - further adjustments for the new object positioning
2004/06/30 15:06:06 od 1.3.56.3: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 08:59:12 od 1.3.56.2: #i28701# - correct type determination
Issue number:
Submitted by:
Reviewed by:
2004/05/24 13:28:26 od 1.3.56.1: #i28701# - adjustments and corrections for the new positioning of
	   floating screen objects
2004-08-02 13:53:05 +00:00
Jens-Heiner Rechtien
ef38232a65 INTEGRATION: CWS swqbugfixes04 (1.4.20); FILE MERGED
2004/07/22 10:24:27 od 1.4.20.4: #i31805# <SwToCntntAnchoredObjectPosition::CalcPosition>
	 - on negative vertical positions do not check, if bottom of
	   anchored object would fit in its environment, if it has to
	   follow the text flow.
2004/07/20 13:57:00 od 1.4.20.3: #i23512# typo error - wrong issue id
2004/07/20 13:52:23 od 1.4.20.2: #i23521# <SwToCntntAnchoredObjectPosition::CalcPosition()>
	 - correct consideration of section frames in online layout for growing
2004/07/15 08:43:37 od 1.4.20.1: #117380# <::CalcPosition()> - suppress check for paragraph portion information
	 on method call <CheckCharRectAndTopOfLine(..)>
2004-08-02 12:08:47 +00:00
Hans-Joachim Lankenau
3c00c07fd6 INTEGRATION: CWS swdrawpositioning (1.2.6); FILE MERGED
2004/06/17 10:24:52 od 1.2.6.4: #i26791# - further adjustments for the unification of the positioning
	   of Writer fly frames and drawing objects.
2004/06/01 11:59:19 od 1.2.6.3: #i26791# - use object geometry instead of its bounding rectangle
2004/04/08 09:22:11 od 1.2.6.2: RESYNC: (1.2-1.3); FILE MERGED
resolve merge conflicts.
2004/04/07 12:23:11 od 1.2.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
2004-06-28 12:43:10 +00:00
Rüdiger Timm
315ec57474 INTEGRATION: CWS swobjpos05 (1.2.14); FILE MERGED
2004/03/18 13:39:02 od 1.2.14.1: - remove unnecessary method implementations
- consider the different upper space amounts on the object positioning
Issue number: i11860
2004-03-31 14:09:52 +00:00
Jens-Heiner Rechtien
d83f4a553e INTEGRATION: CWS swobjpos03 (1.1.2); FILE ADDED
2004/02/17 14:02:13 od 1.1.2.7: adjustments due to changes in the drawing layer
2004/02/05 13:14:26 od 1.1.2.6: #113049# <SwToCntntAnchoredObjectPosition::CalcPosition()>
	 - initialize <mpVertPosOrientFrm>
2004/02/02 11:05:14 od 1.1.2.5: #i22341# - remove unnecessary code.
2004/01/05 15:32:56 od 1.1.2.4: #i22341# - correct positioning of vertical alignment at line of text
2003/11/21 11:59:17 od 1.1.2.3: #113049# - further adjustments for isolated positioning algorithms
2003/11/21 09:38:58 od 1.1.2.2: #113049# - further adjustments for isolated positioning algorithms
#i22341# - adjustement for new vertical alignment at top of line
2003/11/10 13:07:41 od 1.1.2.1: #113049# - further improvements to the isolated object positioning algorithms
2004-03-08 13:02:17 +00:00