Commit Graph

601 Commits

Author SHA1 Message Date
Oliver Bolte
e79ddbc72a INTEGRATION: CWS fmebugs01 (1.28.48); FILE MERGED
2004/03/05 15:08:13 fme 1.28.48.2: RESYNC: (1.28-1.31); FILE MERGED
2004/02/18 12:52:21 fme 1.28.48.1: #115438# If a section has lost its follow during MoveBwd, we should call InvalidateSize instead of _InvalidateSize, otherwise the page may not be formatted correctly
2004-03-17 11:48:53 +00:00
Oliver Bolte
0500dce905 INTEGRATION: CWS fmebugs01 (1.19.46); FILE MERGED
2004/03/05 15:07:56 fme 1.19.46.2: RESYNC: (1.19-1.22); FILE MERGED
2004/03/05 10:01:56 fme 1.19.46.1: #114798# Some minor fixes to prevent loops with table frames
2004-03-17 11:48:39 +00:00
Oliver Bolte
5df8549800 INTEGRATION: CWS os26 (1.35.38); FILE MERGED
2004/02/20 12:29:13 os 1.35.38.3: RESYNC: (1.36-1.37); FILE MERGED
2004/01/12 11:23:09 os 1.35.38.2: RESYNC: (1.35-1.36); FILE MERGED
2004/01/08 15:02:38 os 1.35.38.1: #105372# code of InsertHeader/Footer of SW/Web removed
2004-03-17 11:15:31 +00:00
Oliver Bolte
9eb4fdb271 INTEGRATION: CWS os26 (1.14.50); FILE MERGED
2004/01/12 11:22:56 os 1.14.50.2: RESYNC: (1.14-1.15); FILE MERGED
2004/01/08 15:02:37 os 1.14.50.1: #105372# code of InsertHeader/Footer of SW/Web removed
2004-03-17 11:15:12 +00:00
Oliver Düsterhoff
3f94c01d05 #i26334# - add missing comma 2004-03-11 12:22:15 +00:00
Jens-Heiner Rechtien
529cb5fc52 INTEGRATION: CWS swmergeborders (1.55.36); FILE MERGED
2004/02/26 15:50:25 od 1.55.36.3: #i25029# - adjustments for invalidation due to option 'Merge borders/shadow
	   with next paragraph'
2004/02/19 10:24:14 od 1.55.36.2: RESYNC: (1.55-1.57); FILE MERGED
2004/02/13 10:50:47 od 1.55.36.1: #i25029# <merge borders/shadow> - skip hidden text frames on determining
	 previous/next frame.
2004-03-09 08:59:40 +00:00
Jens-Heiner Rechtien
f0f866427a INTEGRATION: CWS swmergeborders (1.47.38); FILE MERGED
2004/02/27 13:06:53 od 1.47.38.2: #i25029# - complete invalidation due to option 'Merge borders/shadow with
	   next paragraph'
2004/02/26 15:50:26 od 1.47.38.1: #i25029# - adjustments for invalidation due to option 'Merge borders/shadow
	   with next paragraph'
2004-03-09 08:31:17 +00:00
Jens-Heiner Rechtien
9e943b91c8 INTEGRATION: CWS swmergeborders (1.75.36); FILE MERGED
2004/02/26 15:50:26 od 1.75.36.1: #i25029# - adjustments for invalidation due to option 'Merge borders/shadow
	   with next paragraph'
2004-03-09 08:30:57 +00:00
Jens-Heiner Rechtien
a4284e68f3 INTEGRATION: CWS swmergeborders (1.29.8); FILE MERGED
2004/02/26 15:50:25 od 1.29.8.1: #i25029# - adjustments for invalidation due to option 'Merge borders/shadow
	   with next paragraph'
2004-03-09 08:30:35 +00:00
Jens-Heiner Rechtien
3a5c90c5d2 INTEGRATION: CWS swmergeborders (1.42.38); FILE MERGED
2004/02/26 15:50:24 od 1.42.38.1: #i25029# - adjustments for invalidation due to option 'Merge borders/shadow
	   with next paragraph'
2004-03-09 08:30:07 +00:00
Jens-Heiner Rechtien
4ab35e9fb1 #100000#: backout revision 1.27 2004-03-08 14:56:32 +00:00
Jens-Heiner Rechtien
83d336703e #100000#: backout revision 1.43 2004-03-08 14:46:48 +00:00
Jens-Heiner Rechtien
12373d2cfb INTEGRATION: CWS swobjpos03 (1.6.2); FILE MERGED
2003/11/10 13:11:06 od 1.6.2.2: #113049# - further improvements to the isolated object positioning algorithms
2003/10/27 13:03:57 od 1.6.2.1: merging changes from swobjpos02
2004-03-08 13:01:07 +00:00
Jens-Heiner Rechtien
08f0c8caa3 INTEGRATION: CWS swobjpos03 (1.23.56); FILE MERGED
2004/02/16 10:09:32 od 1.23.56.4: RESYNC: (1.23-1.25); FILE MERGED
resolve merge conflicts.
2003/11/21 09:36:30 od 1.23.56.3: #113049# - further adjustment for isolated positioning algorithms
2003/11/10 13:23:52 od 1.23.56.2: #113049# - further improvements to the isolated object positioning algorithms
#i22305# <CalcClipRect(..)> - consider 'Follow text flow' for to-frame
	 anchored Writer fly frames.
2003/10/27 13:03:54 od 1.23.56.1: merging changes from swobjpos02
2004-03-08 13:00:43 +00:00
Jens-Heiner Rechtien
73dbc6c72c INTEGRATION: CWS swobjpos03 (1.34.38); FILE MERGED
2004/02/16 10:09:23 od 1.34.38.4: RESYNC: (1.34-1.36); FILE MERGED
resolve merge conflicts.
2003/11/21 09:35:43 od 1.34.38.3: #i22341# - implementation of method <CheckCharRectAndTopOfLine> incl. its
	   helper methods.
2003/11/10 13:19:52 od 1.34.38.2: #113049# - further improvements to the isolated object positioning algorithms
2003/10/27 13:03:53 od 1.34.38.1: merging changes from swobjpos02
2004-03-08 13:00:27 +00:00
Jens-Heiner Rechtien
be384e7184 INTEGRATION: CWS swobjpos03 (1.49.36); FILE MERGED
2004/02/16 10:09:14 od 1.49.36.3: RESYNC: (1.49-1.55); FILE MERGED
resolve merge conflicts.
2003/11/10 13:16:30 od 1.49.36.2: #113049# - further improvements to the isolated object positioning algorithms
#i22305# <SwFlyFrm::Format(..) - consider only to frame anchored Writer fly
	 frames, which follow the text flow
2003/10/27 13:03:51 od 1.49.36.1: merging changes from swobjpos02
2004-03-08 13:00:10 +00:00
Jens-Heiner Rechtien
1006e5a854 INTEGRATION: CWS swobjpos03 (1.39.148); FILE MERGED
2004/02/16 10:08:15 od 1.39.148.2: RESYNC: (1.39-1.41); FILE MERGED
2003/11/21 09:33:20 od 1.39.148.1: #i22341# methods <lcl_RelToINT(..)> and <lcl_IntToRelation(..)> -
	 adjustment for new vertical relation/alignment at top of line
2004-03-08 12:59:41 +00:00
Kurt Zenker
ab7319cefd INTEGRATION: CWS os24 (1.23.82); FILE MERGED 2004-03-08 12:30:16 +00:00
Kurt Zenker
0df364ad73 INTEGRATION: CWS os24 (1.39.184); FILE MERGED 2004-03-08 12:29:17 +00:00
Kurt Zenker
29602a7673 INTEGRATION: CWS swlinespacing (1.54.10); FILE MERGED
2004/02/06 08:41:29 od 1.54.10.2: RESYNC: (1.54-1.55); FILE MERGED
2004/01/12 14:49:08 od 1.54.10.1: #i11859# class <SwCntntNotify> - add invalidation for changed height of
		last text line
2004-02-26 16:00:18 +00:00
Kurt Zenker
5d0ab4a8ff INTEGRATION: CWS swlinespacing (1.26.60); FILE MERGED
2004/02/06 08:40:43 od 1.26.60.2: RESYNC: (1.26-1.28); FILE MERGED
2004/01/12 09:37:16 od 1.26.60.1: #i11859# <SwFlowFrm::CalcUpperSpace(..)> - adjustments for new line
		spacing consideration
2004-02-26 16:00:05 +00:00
Kurt Zenker
8eb6368f5a INTEGRATION: CWS swlinespacing (1.18.348); FILE MERGED
2004/02/06 08:40:30 od 1.18.348.3: RESYNC: (1.18-1.19); FILE MERGED
2004/01/12 14:32:15 od 1.18.348.2: #i11859# method <SwTxtFrm::InvalidateNextPrtArea()> - correct invalidation
		for section frames and its content
2004/01/12 09:34:41 od 1.18.348.1: #i11859# - implementation of method <SwTxtFrm::InvalidateNextPrtArea()>
2004-02-26 15:59:50 +00:00
Kurt Zenker
db654c613e INTEGRATION: CWS hiddentext (1.31.56); FILE MERGED
2004/02/12 12:26:44 fme 1.31.56.4: #i23660# Feature - hidden character attribute
2004/02/10 09:56:12 fme 1.31.56.3: RESYNC: (1.31-1.32); FILE MERGED
2004/01/19 10:09:16 od 1.31.56.2: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/16 07:28:07 fme 1.31.56.1: #i23660# Feature - hidden character attribute
2004-02-26 14:31:21 +00:00
Kurt Zenker
ae6e4599b5 INTEGRATION: CWS hiddentext (1.74.4); FILE MERGED
2004/02/12 13:34:54 od 1.74.4.5: #110582# - correction on hiding objects, which are anchored to hidden paragraphs
2004/02/10 09:55:26 fme 1.74.4.4: RESYNC: (1.74-1.75); FILE MERGED
2004/01/20 12:12:38 od 1.74.4.3: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/19 10:09:15 od 1.74.4.2: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/16 07:28:05 fme 1.74.4.1: #i23660# Feature - hidden character attribute
2004-02-26 14:31:08 +00:00
Kurt Zenker
69a9e9ef63 INTEGRATION: CWS hiddentext (1.30.56); FILE MERGED
2004/01/20 12:12:36 od 1.30.56.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:30:52 +00:00
Kurt Zenker
b07971fe44 INTEGRATION: CWS hiddentext (1.36.4); FILE MERGED
2004/02/12 12:26:43 fme 1.36.4.3: #i23660# Feature - hidden character attribute
2004/02/10 09:54:55 fme 1.36.4.2: RESYNC: (1.36-1.37); FILE MERGED
2004/01/19 10:09:15 od 1.36.4.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:30:39 +00:00
Kurt Zenker
155743c51f INTEGRATION: CWS hiddentext (1.24.18); FILE MERGED
2004/02/16 08:50:54 fme 1.24.18.2: RESYNC: (1.24-1.25); FILE MERGED
2004/01/19 10:09:14 od 1.24.18.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:30:25 +00:00
Kurt Zenker
f3a9aa10f4 INTEGRATION: CWS hiddentext (1.5.308); FILE MERGED
2004/01/19 10:09:14 od 1.5.308.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:30:13 +00:00
Kurt Zenker
1ce42e0ed4 INTEGRATION: CWS hiddentext (1.34.84); FILE MERGED
2004/02/16 08:50:45 fme 1.34.84.4: RESYNC: (1.35-1.36); FILE MERGED
2004/02/10 09:54:09 fme 1.34.84.3: RESYNC: (1.34-1.35); FILE MERGED
2004/01/20 12:12:34 od 1.34.84.2: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/19 10:09:13 od 1.34.84.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:29:59 +00:00
Kurt Zenker
0fdc4cfc28 INTEGRATION: CWS hiddentext (1.53.4); FILE MERGED
2004/02/16 08:50:12 fme 1.53.4.6: RESYNC: (1.54-1.55); FILE MERGED
2004/02/12 13:34:54 od 1.53.4.5: #110582# - correction on hiding objects, which are anchored to hidden paragraphs
2004/02/12 12:26:43 fme 1.53.4.4: #i23660# Feature - hidden character attribute
2004/02/10 09:53:55 fme 1.53.4.3: RESYNC: (1.53-1.54); FILE MERGED
2004/01/20 12:12:32 od 1.53.4.2: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/19 10:09:13 od 1.53.4.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:29:45 +00:00
Kurt Zenker
5b7f29fb3e INTEGRATION: CWS hiddentext (1.27.4); FILE MERGED
2004/02/10 09:53:41 fme 1.27.4.2: RESYNC: (1.27-1.28); FILE MERGED
2004/01/20 12:12:29 od 1.27.4.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:29:32 +00:00
Kurt Zenker
4b880a9684 INTEGRATION: CWS hiddentext (1.40.54); FILE MERGED
2004/02/10 09:52:38 fme 1.40.54.3: RESYNC: (1.40-1.41); FILE MERGED
2004/01/20 12:12:24 od 1.40.54.2: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/19 10:09:12 od 1.40.54.1: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004-02-26 14:29:18 +00:00
Kurt Zenker
63f7749f8e INTEGRATION: CWS os27 (1.48.36); FILE MERGED
2004/02/13 16:44:40 fme 1.48.36.2: RESYNC: (1.48-1.49); FILE MERGED
2004/02/09 10:54:43 fme 1.48.36.1: #i24134# Modify table rows with the ruler
2004-02-26 10:39:50 +00:00
Kurt Zenker
748a3c211a INTEGRATION: CWS os27 (1.18.360); FILE MERGED
2004/02/13 16:43:08 fme 1.18.360.3: RESYNC: (1.19-1.20); FILE MERGED
2004/02/05 15:32:42 fme 1.18.360.2: RESYNC: (1.18-1.19); FILE MERGED
2004/01/28 17:02:54 fme 1.18.360.1: #i24134# Feature - Modify table rows with the ruler
2004-02-26 10:39:36 +00:00
Kurt Zenker
1036af482d INTEGRATION: CWS layoutmanager (1.69.146); FILE MERGED
2004/01/29 17:56:04 cd 1.69.146.2: RESYNC: (1.69-1.75); FILE MERGED
2003/12/09 15:41:45 mba 1.69.146.1: #114320#: consider external Inplace mode
2004-02-25 14:54:39 +00:00
Oliver Bolte
2b9ae1a064 INTEGRATION: CWS swq03 (1.46.20); FILE MERGED
2004/02/02 09:18:25 fme 1.46.20.3: #i24831# SwTabFrm::Grow() should not forget to grow the upper
2004/01/29 11:20:46 fme 1.46.20.2: RESYNC: (1.46-1.48); FILE MERGED
2004/01/14 16:00:28 fme 1.46.20.1: #114442# Check page description for backward moving frames
2004-02-16 10:58:55 +00:00
Oliver Bolte
324abf2bd8 INTEGRATION: CWS swq03 (1.29.54); FILE MERGED
2004/01/29 11:20:28 fme 1.29.54.2: RESYNC: (1.29-1.30); FILE MERGED
2004/01/15 13:54:30 fme 1.29.54.1: #i20556# Correct handling of footnotes in sections is section is hidden
2004-02-16 10:58:40 +00:00
Oliver Bolte
9f9bc93c36 INTEGRATION: CWS swq03 (1.21.354); FILE MERGED
2004/01/29 11:18:33 fme 1.21.354.2: RESYNC: (1.21-1.22); FILE MERGED
2004/01/15 13:54:29 fme 1.21.354.1: #i20556# Correct handling of footnotes in sections is section is hidden
2004-02-16 10:58:28 +00:00
Oliver Bolte
9b28edbf45 INTEGRATION: CWS swq03 (1.55.22); FILE MERGED
2004/02/02 09:19:20 fme 1.55.22.1: #i24097# NotifyBackground if frame changes its printing area
2004-02-16 10:58:14 +00:00
Oliver Bolte
7ee860ed34 INTEGRATION: CWS swq03 (1.26.68); FILE MERGED
2004/01/29 11:17:10 fme 1.26.68.2: RESYNC: (1.26-1.28); FILE MERGED
2004/01/14 16:00:32 fme 1.26.68.1: #114442# Check page description for backward moving frames
2004-02-16 10:58:00 +00:00
Rüdiger Timm
96a165d548 INTEGRATION: CWS swq02 (1.4.314); FILE MERGED
2004/01/05 09:51:57 hbrinkm 1.4.314.1: #112217# copy frame direction when mirroring pagedescs
2004-02-10 13:55:13 +00:00
Jens-Heiner Rechtien
f46e3061a1 INTEGRATION: CWS ooo20031216 (1.29.14); FILE MERGED
2004/01/26 16:12:34 mh 1.29.14.2: RESYNC: (1.29-1.30); FILE MERGED
2003/12/13 13:45:17 waratah 1.29.14.1: #i1858# replace some NULL constants with 0 (zero),  used with non-pointers
2004-02-04 13:08:32 +00:00
Jens-Heiner Rechtien
6891edd6f2 INTEGRATION: CWS swobjpos02 (1.41.52); FILE MERGED
2004/01/21 08:49:26 od 1.41.52.5: RESYNC: (1.47-1.48); FILE MERGED
2004/01/13 13:34:48 od 1.41.52.4: RESYNC: (1.43-1.47); FILE MERGED
2003/11/18 16:11:53 od 1.41.52.3: RESYNC: (1.42-1.43); FILE MERGED
2003/10/15 12:50:13 od 1.41.52.2: RESYNC: (1.41-1.42); FILE MERGED
2003/10/02 10:44:26 od 1.41.52.1: #i18732# local method <CalcHeightWidthFlys(..)> - consider new option
	 'FollowTextFlow'.
2004-02-02 17:22:37 +00:00
Jens-Heiner Rechtien
b0f6b2697d INTEGRATION: CWS swobjpos02 (1.5.146); FILE MERGED
2003/11/18 16:11:45 od 1.5.146.2: RESYNC: (1.5-1.6); FILE MERGED
2003/10/02 10:40:25 od 1.5.146.1: #110978# - compile new class <SwAnchoredObjectPosition>
2004-02-02 17:22:14 +00:00
Jens-Heiner Rechtien
a42d99bf4a INTEGRATION: CWS swobjpos02 (1.51.4); FILE MERGED
2004/01/21 08:47:53 od 1.51.4.4: RESYNC: (1.54-1.55); FILE MERGED
2004/01/13 13:31:39 od 1.51.4.3: RESYNC: (1.52-1.54); FILE MERGED
2003/10/15 12:50:02 od 1.51.4.2: RESYNC: (1.51-1.52); FILE MERGED
2003/10/02 10:39:32 od 1.51.4.1: #110978# <SwPageFrm::PrtWithoutHeaderAndFooter()> - implementation of new method
2004-02-02 17:21:53 +00:00
Jens-Heiner Rechtien
7c7e5788da INTEGRATION: CWS swobjpos02 (1.22.52); FILE MERGED
2004/01/13 13:31:20 od 1.22.52.5: RESYNC: (1.23-1.24); FILE MERGED
2003/11/18 11:01:06 od 1.22.52.4: #110978# - further adjustments for isolated object positioning algorithms
2003/10/15 12:49:53 od 1.22.52.3: RESYNC: (1.22-1.23); FILE MERGED
resolved conflicts.
2003/10/09 15:06:54 od 1.22.52.2: #110978# - further adjustments for isolated positioning algorithm
2003/10/02 10:38:09 od 1.22.52.1: #i18732# method <CalcClipRect(..)> - adjustments for new option 'FollowTextFlow'
	 and alignment at page areas.
2004-02-02 17:21:32 +00:00
Jens-Heiner Rechtien
837fd8b07d INTEGRATION: CWS swobjpos02 (1.33.52); FILE MERGED
2004/01/21 08:47:40 od 1.33.52.5: RESYNC: (1.34-1.35); FILE MERGED
2003/11/18 10:59:31 od 1.33.52.4: #110978# - further adjustments for isolated object positioning algorithms
2003/10/15 12:49:43 od 1.33.52.3: RESYNC: (1.33-1.34); FILE MERGED
2003/10/09 15:05:46 od 1.33.52.2: #110978# - further adjustments and corrections for isolated positioning algorithm
2003/10/02 10:33:09 od 1.33.52.1: #110978# <SwFlyAtCntFrm::MakeFlyPos()> - use new class <SwAnchoredObjectPosition>
	 remove several local method implementations
2004-02-02 17:21:12 +00:00
Jens-Heiner Rechtien
e996301749 INTEGRATION: CWS swobjpos02 (1.47.4); FILE MERGED
2004/01/21 08:47:26 od 1.47.4.5: RESYNC: (1.53-1.54); FILE MERGED
2004/01/13 13:31:01 od 1.47.4.4: RESYNC: (1.50-1.53); FILE MERGED
2003/11/18 16:11:37 od 1.47.4.3: RESYNC: (1.49-1.50); FILE MERGED
2003/10/15 12:49:35 od 1.47.4.2: RESYNC: (1.47-1.49); FILE MERGED
2003/10/02 10:27:16 od 1.47.4.1: #110978# <SwFlyFrm::MakeFlyPos> - use new class <SwAnchoredObjectPosition>
#110978# <SwFlyFrm::MakePrtArea> - consider vertical layout
#i18732# <SwFlyFrm::_UpdateAttr> - consider new option 'FollowTextFlow'
2004-02-02 17:20:49 +00:00
Jens-Heiner Rechtien
e3762b361f INTEGRATION: CWS swobjpos02 (1.18.146); FILE MERGED
2004/01/21 08:46:52 od 1.18.146.2: RESYNC: (1.18-1.19); FILE MERGED
resolve hidden merge conflict.
2003/10/02 10:23:44 od 1.18.146.1: #110978# class <SwFrm> - replace method <IsMoveable()>.
2004-02-02 17:20:31 +00:00
Oliver Bolte
90b73c7b66 INTEGRATION: CWS cellbreak (1.41.62); FILE MERGED
2004/01/12 13:23:46 fme 1.41.62.14: #i2109# Feature - Split table row - lcl_ArrangeLowers should not consider centered and bottom alignment during calculation of last line
2003/12/17 16:02:18 fme 1.41.62.13: #i2109# Loop prevention for row frames with fixed height
2003/12/16 09:23:40 fme 1.41.62.12: #114342# Oversized table heading caused loops
2003/12/02 08:24:33 fme 1.41.62.11: RESYNC: (1.43-1.44); FILE MERGED
2003/11/24 15:09:14 fme 1.41.62.10: #i2109# Feature table row split - lcl_ArrangeLowers should notify frames that do not fit into the cell anymore
2003/11/24 09:10:22 fme 1.41.62.9: #i2109# Split table rows - try to split if distance to bottom of upper equals 0
2003/11/20 13:29:51 fme 1.41.62.8: #i2109# Feature - Split table rows - rows containing sections are defined as too complex to split
2003/11/20 08:49:16 fme 1.41.62.7: #i2109# Feature - Table row split - new attribute
2003/11/18 14:01:45 fme 1.41.62.6: #i2109# Feature - Split table rows
2003/11/14 10:08:05 fme 1.41.62.5: #i2109# Split table rows
2003/11/07 10:11:55 fme 1.41.62.4: RESYNC: (1.41-1.43); FILE MERGED
2003/11/07 07:24:26 fme 1.41.62.3: #i2109# Feature - Split table rows
2003/10/06 12:53:27 fme 1.41.62.2: #i2109# Feature - Split table rows
2003/09/08 07:47:29 fme 1.41.62.1: #i2109# Feature - Split table rows
2004-01-13 12:14:23 +00:00