Commit Graph

58 Commits

Author SHA1 Message Date
Jens-Heiner Rechtien
ceaca0eaa2 INTEGRATION: CWS swwarnings (1.9.222); FILE MERGED
2007/05/29 11:36:10 os 1.9.222.2: RESYNC: (1.9-1.10); FILE MERGED
2007/04/03 13:00:04 tl 1.9.222.1: #i69287# warning-free code
2007-09-27 08:08:22 +00:00
Jens-Heiner Rechtien
488285a805 INTEGRATION: CWS swwarnings (1.19.222); FILE MERGED
2007/05/29 11:35:35 os 1.19.222.3: RESYNC: (1.19-1.20); FILE MERGED
2007/04/03 13:00:03 tl 1.19.222.2: #i69287# warning-free code
2007/03/12 08:19:48 fme 1.19.222.1: #i69287# Warning free code
2007-09-27 08:08:10 +00:00
Jens-Heiner Rechtien
79da33b4fb INTEGRATION: CWS swwarnings (1.6.222); FILE MERGED
2007/04/03 13:00:03 tl 1.6.222.1: #i69287# warning-free code
2007-09-27 08:07:59 +00:00
Jens-Heiner Rechtien
4a75c28efc INTEGRATION: CWS swwarnings (1.15.222); FILE MERGED
2007/05/16 10:17:31 tl 1.15.222.3: #i69287# warning-free code
2007/04/03 13:00:03 tl 1.15.222.2: #i69287# warning-free code
2007/03/12 08:19:48 fme 1.15.222.1: #i69287# Warning free code
2007-09-27 08:07:48 +00:00
Rüdiger Timm
aae12bf642 INTEGRATION: CWS os94 (1.9.246); FILE MERGED
2007/03/12 08:10:44 os 1.9.246.1: #i75235# unused methods removed
2007-04-25 08:09:28 +00:00
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
81f4481f4c INTEGRATION: CWS pchfix02 (1.8.2); FILE MERGED
2006/09/01 17:51:55 kaib 1.8.2.1: #i68856# Added header markers and pch files
2006-09-16 20:26:37 +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
Oliver Bolte
46aa925930 INTEGRATION: CWS pchfix02 (1.5.474); FILE MERGED
2006/09/01 17:51:55 kaib 1.5.474.1: #i68856# Added header markers and pch files
2006-09-16 20:26:09 +00:00
Oliver Bolte
f423a4d1d4 INTEGRATION: CWS pchfix02 (1.5.474); FILE MERGED
2006/09/01 17:51:54 kaib 1.5.474.1: #i68856# Added header markers and pch files
2006-09-16 20:25:53 +00:00
Oliver Bolte
4f6f0ad463 INTEGRATION: CWS pchfix02 (1.14.2); FILE MERGED
2006/09/01 17:51:54 kaib 1.14.2.1: #i68856# Added header markers and pch files
2006-09-16 20:25:40 +00:00
Jens-Heiner Rechtien
4d2d42f938 INTEGRATION: CWS writercorehandoff (1.6.326); FILE MERGED
2005/09/13 14:17:24 tra 1.6.326.4: RESYNC: (1.6-1.7); FILE MERGED
2005/07/05 08:12:54 tra 1.6.326.3: #i50348#make SwDoc interface based
2005/06/24 11:43:34 fme 1.6.326.2: #i50348# Make SwDoc accessible via interfaces
2005/06/07 14:14:10 fme 1.6.326.1: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2006-08-14 15:30:58 +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
Jens-Heiner Rechtien
66b38db290 INTEGRATION: CWS writercorehandoff (1.10.182); FILE MERGED
2006/04/11 09:59:15 tra 1.10.182.8: #i50348
2006/04/05 13:10:02 tra 1.10.182.7: RESYNC: (1.12-1.13); FILE MERGED
2006/03/17 08:12:22 tra 1.10.182.6: RESYNC: (1.11-1.12); FILE MERGED
2005/09/13 14:16:21 tra 1.10.182.5: RESYNC: (1.10-1.11); FILE MERGED
2005/07/13 13:24:26 fme 1.10.182.4: #i50348# Make SwDoc accessible via interfaces
2005/07/12 11:21:37 tra 1.10.182.3: #i50348#make SwDoc interface based
2005/06/07 14:14:10 fme 1.10.182.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:27:49 tra 1.10.182.1: Unnecessary includes removed #i50348#
2006-08-14 15:30:34 +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
Oliver Bolte
7961b14c4f INTEGRATION: CWS swdrawobjpos203 (1.12.54); FILE MERGED
2006/03/20 08:36:57 od 1.12.54.1: #i62875# class <SwAnchoredObjectPosition>
	 - set new members <mbFollowTextFlow> and <mbDoNotCaptureAnchoredObj>
	 - method <_ImplAdjustVertRelPos(..)> and <_ImplAdjustHoriRelPos(..)>
2006-03-22 11:24:38 +00:00
Kurt Zenker
f63ae9b7c3 INTEGRATION: CWS swqbf52 (1.11.178); FILE MERGED
2006/01/30 12:45:21 od 1.11.178.1: #129959# <SwAnchoredObjectPosition::_AdjustVertRelPos(..)>
	 - do mix usage of <top + height> and <bottom> of rectangles.
2006-02-03 16:18:37 +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
f86a346382 INTEGRATION: CWS ooo19126 (1.6.460); FILE MERGED
2005/09/05 13:40:30 rt 1.6.460.1: #i54170# Change license header: remove SISSL
2005-09-09 03:37:24 +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
Rüdiger Timm
75f8e42375 INTEGRATION: CWS ooo19126 (1.2.812); FILE MERGED
2005/09/05 13:40:29 rt 1.2.812.1: #i54170# Change license header: remove SISSL
2005-09-09 03:36:06 +00:00
Rüdiger Timm
ecb8cbafbb INTEGRATION: CWS ooo19126 (1.4.316); FILE MERGED
2005/09/05 13:40:29 rt 1.4.316.1: #i54170# Change license header: remove SISSL
2005-09-09 03:35:23 +00:00
Rüdiger Timm
b3a5fe1153 INTEGRATION: CWS ooo19126 (1.4.234); FILE MERGED
2005/09/05 13:40:29 rt 1.4.234.1: #i54170# Change license header: remove SISSL
2005-09-09 03:34:48 +00:00
Rüdiger Timm
b1b3ed0819 INTEGRATION: CWS ooo19126 (1.10.316); FILE MERGED
2005/09/05 13:40:29 rt 1.10.316.1: #i54170# Change license header: remove SISSL
2005-09-09 03:34:04 +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
f14f1c09ad INTEGRATION: CWS swqbugfixes17 (1.3.444); FILE MERGED
2005/03/09 09:36:32 od 1.3.444.1: #i44347# <SwAsCharAnchoredObjectPosition::CalcPosition()>
	 - keep last object rectangle at anchored object instance for
	   anchored drawing objects.
2005-03-23 12:01:13 +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
Vladimir Glazounov
524592b5bb INTEGRATION: CWS os51 (1.3.348); FILE MERGED
2005/01/20 15:17:48 od 1.3.348.1: #118546# - environment of anchored object, which doesn't follows the text
	   flow is always the page frame
2005-02-16 16:01:46 +00:00
Vladimir Glazounov
e31b8ee390 INTEGRATION: CWS os51 (1.9.108); FILE MERGED
2005/01/20 15:17:49 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:01:31 +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
74632b2c95 INTEGRATION: CWS swqbugfixes09 (1.5.68); FILE MERGED
2004/11/02 11:55:59 od 1.5.68.1: #i23129# - correct include
2004-11-16 14:51:40 +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
5f2c4e19ed INTEGRATION: CWS swqbugfixes09 (1.8.68); FILE MERGED
2004/10/18 07:12:26 od 1.8.68.1: #i26945# <SwAnchoredObjectPosition::_AdjustVertRelPos(..)
         - add parameter <_bFollowTextFlow>
2004-11-16 14:50:58 +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
69d3c7d140 INTEGRATION: CWS swdrawobjapi (1.4.60); 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:14 +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
Rüdiger Timm
fc94b50fe6 INTEGRATION: CWS swdrawobjapi (1.7.16); FILE MERGED
2004/08/13 13:06:08 od 1.7.16.1: #i32964# <SwAnchoredObjectPosition::_AdjustVertRelPos(..)> - correction
2004-08-23 07:02:50 +00:00
Jens-Heiner Rechtien
2391e52e06 #i10000# - correct syntax error 2004-08-05 10:42:32 +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
Kurt Zenker
daf17f8738 INTEGRATION: CWS swobjpos04 (1.3.56); FILE MERGED
2004/07/07 07:42:56 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:05 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:26:28 od 1.3.56.1: #i28701# - correction: no adjustment horizontal position in columns
2004-08-02 13:49:42 +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
Jens-Heiner Rechtien
b2c83dc3ef INTEGRATION: CWS swqbugfixes04 (1.4.20); FILE MERGED
2004/07/22 10:20:47 od 1.4.20.1: #i31805# <SwAnchoredObjectPosition::_AdjustVertRelPos>
	 - handle new parameter <_bCheckBottom>
2004-08-02 12:08:33 +00:00
Hans-Joachim Lankenau
d5a1cb0f8c 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/23 09:07:46 od 1.2.6.2: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects
2004/04/07 12:23:12 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:27 +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
Hans-Joachim Lankenau
58f991f513 INTEGRATION: CWS swdrawpositioning (1.2.6); FILE MERGED
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:42:54 +00:00
Hans-Joachim Lankenau
09e667f217 INTEGRATION: CWS swdrawpositioning (1.2.6); FILE MERGED
2004/06/01 11:59:19 od 1.2.6.3: #i26791# - use object geometry instead of its bounding rectangle
2004/04/23 09:07:45 od 1.2.6.2: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects
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:42:35 +00:00
Hans-Joachim Lankenau
3123091c04 INTEGRATION: CWS swdrawpositioning (1.2.6); FILE MERGED
2004/06/17 10:24:51 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:18 od 1.2.6.3: #i26791# - use object geometry instead of its bounding rectangle
2004/04/08 09:22:00 od 1.2.6.2: RESYNC: (1.2-1.3); FILE MERGED
resolve merge conflict.
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:42:20 +00:00
Kurt Zenker
ca04cfcd67 INTEGRATION: CWS qwizards1 (1.2.80); FILE MERGED
2004/04/14 13:54:35 tv 1.2.80.1: Correction - ::CalcPosition() - save new vertical relative position,
if vertical position is automatic (TOP, CENTER, BOTTOM)
Submitted by: OD
2004-05-19 12:35:35 +00:00