Commit Graph

567 Commits

Author SHA1 Message Date
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
Oliver Bolte
779d2c7e19 INTEGRATION: CWS cellbreak (1.24.22); FILE MERGED
2003/12/16 09:20:48 fme 1.24.22.7: #114343# No pagebreaks inside tables
2003/12/02 08:23:06 fme 1.24.22.6: RESYNC: (1.25-1.26); FILE MERGED
2003/11/14 10:08:01 fme 1.24.22.5: #i2109# Split table rows
2003/11/07 10:10:54 fme 1.24.22.4: RESYNC: (1.24-1.25); FILE MERGED
2003/11/07 07:24:08 fme 1.24.22.3: #i2109# Feature - Split table rows
2003/10/06 12:53:21 fme 1.24.22.2: #i2109# Feature - Split table rows
2003/09/08 07:47:27 fme 1.24.22.1: #i2109# Feature - Split table rows
2004-01-13 12:13:45 +00:00
Oliver Bolte
9541d087bb INTEGRATION: CWS cellbreak (1.45.96); FILE MERGED
2003/12/02 08:24:48 fme 1.45.96.5: RESYNC: (1.45-1.46); FILE MERGED
2003/11/24 09:11:08 fme 1.45.96.4: #i2109# Split table rows - Assertion could be triggered, if default for attribute is changed
2003/11/20 08:49:17 fme 1.45.96.3: #i2109# Feature - Table row split - new attribute
2003/11/17 14:46:00 fme 1.45.96.2: #i2109# Split table rows
2003/11/14 10:08:07 fme 1.45.96.1: #i2109# Split table rows
2004-01-13 10:19:49 +00:00
Oliver Bolte
0a93722771 INTEGRATION: CWS cellbreak (1.29.46); FILE MERGED
2003/12/02 08:24:41 fme 1.29.46.4: RESYNC: (1.29-1.30); FILE MERGED
2003/11/14 10:08:06 fme 1.29.46.3: #i2109# Split table rows
2003/10/06 12:53:30 fme 1.29.46.2: #i2109# Feature - Split table rows
2003/09/08 07:47:30 fme 1.29.46.1: #i2109# Feature - Split table rows
2004-01-13 10:19:26 +00:00
Oliver Bolte
3e23f1755e INTEGRATION: CWS cellbreak (1.28.86); FILE MERGED
2003/11/14 10:08:05 fme 1.28.86.4: #i2109# Split table rows
2003/11/07 07:24:17 fme 1.28.86.3: #i2109# Feature - Split table rows
2003/10/06 12:53:25 fme 1.28.86.2: #i2109# Feature - Split table rows
2003/09/08 07:47:29 fme 1.28.86.1: #i2109# Feature - Split table rows
2004-01-13 10:18:49 +00:00
Oliver Bolte
5757c1d5e6 INTEGRATION: CWS cellbreak (1.69.62); FILE MERGED
2003/12/02 08:24:14 fme 1.69.62.3: RESYNC: (1.69-1.71); FILE MERGED
2003/11/18 14:01:14 fme 1.69.62.2: #i2109# Feature - Split table rows
2003/11/14 10:08:04 fme 1.69.62.1: #i2109# Split table rows
2004-01-13 10:18:27 +00:00
Oliver Bolte
35df6a62f7 INTEGRATION: CWS cellbreak (1.13.154); FILE MERGED
2003/12/02 08:23:54 fme 1.13.154.2: RESYNC: (1.13-1.14); FILE MERGED
2003/11/14 10:08:03 fme 1.13.154.1: #i2109# Split table rows
2004-01-13 10:18:01 +00:00
Oliver Bolte
48059d53cb INTEGRATION: CWS cellbreak (1.32.46); FILE MERGED
2003/12/02 08:23:48 fme 1.32.46.2: RESYNC: (1.32-1.33); FILE MERGED
2003/09/08 07:47:28 fme 1.32.46.1: #i2109# Feature - Split table rows
2004-01-13 10:17:40 +00:00
Oliver Bolte
d04f2abb9b INTEGRATION: CWS cellbreak (1.21.154); FILE MERGED
2003/11/14 10:08:03 fme 1.21.154.1: #i2109# Split table rows
2004-01-13 10:17:18 +00:00
Oliver Bolte
821c7435a3 INTEGRATION: CWS cellbreak (1.50.62); FILE MERGED
2003/12/02 08:23:30 fme 1.50.62.7: RESYNC: (1.52-1.53); FILE MERGED
2003/11/14 10:08:02 fme 1.50.62.6: #i2109# Split table rows
2003/11/07 10:11:35 fme 1.50.62.5: RESYNC: (1.51-1.52); FILE MERGED
2003/11/07 07:23:55 fme 1.50.62.4: #i2109# Feature - Split table rows
2003/10/06 12:53:23 fme 1.50.62.3: #i2109# Feature - Split table rows
2003/09/08 09:34:39 fme 1.50.62.2: RESYNC: (1.50-1.51); FILE MERGED
2003/09/08 07:47:28 fme 1.50.62.1: #i2109# Feature - Split table rows
2004-01-13 10:16:52 +00:00
Oliver Bolte
0feb7d8b55 INTEGRATION: CWS cellbreak (1.34.52); FILE MERGED
2003/11/14 10:08:02 fme 1.34.52.1: #i2109# Split table rows
2004-01-13 10:16:27 +00:00
Oliver Bolte
3414143631 INTEGRATION: CWS cellbreak (1.46.44); FILE MERGED
2003/12/02 08:23:13 fme 1.46.44.5: RESYNC: (1.50-1.51); FILE MERGED
2003/11/14 10:08:01 fme 1.46.44.4: #i2109# Split table rows
2003/11/07 10:11:01 fme 1.46.44.3: RESYNC: (1.47-1.50); FILE MERGED
2003/09/08 09:34:31 fme 1.46.44.2: RESYNC: (1.46-1.47); FILE MERGED
2003/09/08 07:47:27 fme 1.46.44.1: #i2109# Feature - Split table rows
2004-01-13 10:16:02 +00:00
Oliver Bolte
6eb1bd1fa8 INTEGRATION: CWS cellbreak (1.18.154); FILE MERGED
2003/11/27 08:24:58 fme 1.18.154.5: #i2109# Tables in frames in tables should be considered in IsInSplitRowFrm
2003/11/14 10:08:00 fme 1.18.154.4: #i2109# Split table rows
2003/11/07 07:23:30 fme 1.18.154.3: #i2109# Feature - Split table rows
2003/10/06 12:53:19 fme 1.18.154.2: #i2109# Feature - Split table rows
2003/09/08 07:47:27 fme 1.18.154.1: #i2109# Feature - Split table rows
2004-01-13 10:15:19 +00:00
Oliver Bolte
43a309962f INTEGRATION: CWS cellbreak (1.11.154); FILE MERGED
2003/11/14 10:08:00 fme 1.11.154.2: #i2109# Split table rows
2003/09/08 07:47:26 fme 1.11.154.1: #i2109# Feature - Split table rows
2004-01-13 10:14:52 +00:00
Oliver Bolte
fc4f1b2223 INTEGRATION: CWS cellbreak (1.38.22); FILE MERGED
2003/12/02 08:22:48 fme 1.38.22.5: RESYNC: (1.40-1.41); FILE MERGED
2003/11/14 10:07:59 fme 1.38.22.4: #i2109# Split table rows
2003/11/07 10:10:46 fme 1.38.22.3: RESYNC: (1.38-1.40); FILE MERGED
2003/10/06 12:53:16 fme 1.38.22.2: #i2109# Feature - Split table rows
2003/09/08 07:47:26 fme 1.38.22.1: #i2109# Feature - Split table rows
2004-01-13 10:14:29 +00:00
Oliver Bolte
6577c01d2f INTEGRATION: CWS cellbreak (1.39.12); FILE MERGED
2003/11/20 08:49:15 fme 1.39.12.1: #i2109# Feature - Table row split - new attribute
2004-01-13 10:14:06 +00:00
Rüdiger Timm
3849ac6f43 INTEGRATION: CWS geordi2q12 (1.46.14); FILE MERGED
2004/01/07 12:14:49 hr 1.46.14.1: #111934#: merge CWS sw7pp2a -> SRC680
2004-01-07 15:33:49 +00:00
Rüdiger Timm
6d320ca1d9 INTEGRATION: CWS geordi2q12 (1.26.62); FILE MERGED
2004/01/07 12:14:48 hr 1.26.62.1: #111934#: merge CWS sw7pp2a -> SRC680
2004-01-07 15:33:16 +00:00
Vladimir Glazounov
f97efbe691 INTEGRATION: CWS vclcleanup02 (1.73.6); FILE MERGED
2003/12/11 09:09:53 mt 1.73.6.1: #i23061# VCL cleanup, removed headers, methods and types...
2004-01-06 17:17:54 +00:00
Vladimir Glazounov
fd692e9eec INTEGRATION: CWS vclcleanup02 (1.4.304); FILE MERGED
2003/12/11 09:09:52 mt 1.4.304.1: #i23061# VCL cleanup, removed headers, methods and types...
2004-01-06 17:17:34 +00:00
Vladimir Glazounov
cbfb2c0ea5 INTEGRATION: CWS vclcleanup02 (1.33.8); FILE MERGED
2003/12/05 15:43:30 mt 1.33.8.2: RESYNC: (1.33-1.35); FILE MERGED
2003/12/04 15:56:36 mt 1.33.8.1: #i23061# Removed/Changed old StarView stuff
2004-01-06 17:17:18 +00:00
Vladimir Glazounov
135b0bc76b INTEGRATION: CWS vclcleanup02 (1.52.6); FILE MERGED
2003/12/11 09:09:52 mt 1.52.6.1: #i23061# VCL cleanup, removed headers, methods and types...
2004-01-06 17:17:01 +00:00
Kurt Zenker
53637427e2 INTEGRATION: CWS swq01 (1.43.10); FILE MERGED
2003/12/02 09:00:50 fme 1.43.10.2: RESYNC: (1.43-1.44); FILE MERGED
2003/11/10 15:52:28 fme 1.43.10.1: #i12092# Overflow of long variable during calculation of cell width
2003-12-11 09:22:26 +00:00
Kurt Zenker
bda974cdc3 INTEGRATION: CWS swq01 (1.13.270); FILE MERGED
2003/12/02 08:59:36 fme 1.13.270.2: RESYNC: (1.13-1.14); FILE MERGED
2003/12/01 15:05:50 fme 1.13.270.1: #i22056# Calculation of nMaxEat gives 1 if Frm().Height() == Prt().Height()
2003-12-11 09:22:03 +00:00
Kurt Zenker
db2c4264c9 INTEGRATION: CWS swq01 (1.52.62); FILE MERGED
2003/12/02 08:59:29 fme 1.52.62.2: RESYNC: (1.52-1.53); FILE MERGED
2003/11/10 15:55:31 fme 1.52.62.1: #112243# Invalidate fly content when inserting content into a section which is located inside a fly frame
2003-12-11 09:21:43 +00:00
Rüdiger Timm
5b6ab56db2 INTEGRATION: CWS ooo20031110 (1.29.142); FILE MERGED
2003/11/13 10:56:48 waratah 1.29.142.1: #i22301# correct the for scope problems in the code
2003-12-01 16:19:20 +00:00
Rüdiger Timm
16de32d597 INTEGRATION: CWS ooo20031110 (1.69.148); FILE MERGED
2003/11/13 10:56:47 waratah 1.69.148.1: #i22301# correct the for scope problems in the code
2003-12-01 16:19:07 +00:00
Rüdiger Timm
312a4ceb23 INTEGRATION: CWS ooo20031110 (1.28.140); FILE MERGED
2003/11/13 10:56:47 waratah 1.28.140.1: #i22301# correct the for scope problems in the code
2003-12-01 16:18:55 +00:00
Rüdiger Timm
1950d49b35 INTEGRATION: CWS ooo20031110 (1.32.142); FILE MERGED
2003/11/13 10:56:46 waratah 1.32.142.2: #i22301# correct the for scope problems in the code
2003/11/07 12:08:31 waratah 1.32.142.1: #i21906# add implicit integer type to a few variables
2003-12-01 16:18:43 +00:00
Rüdiger Timm
248e5c40d7 INTEGRATION: CWS ooo20031110 (1.39.122); FILE MERGED
2003/11/13 10:56:46 waratah 1.39.122.1: #i22301# correct the for scope problems in the code
2003-12-01 16:18:32 +00:00
Rüdiger Timm
d0edabb904 INTEGRATION: CWS geordi2q10 (1.44.2); FILE MERGED
2003/11/27 09:27:52 rt 1.44.2.1: #111934#: join CWS sw7pp1c
2003-12-01 08:40:34 +00:00
Rüdiger Timm
c45db1c54e INTEGRATION: CWS geordi2q10 (1.28.232); FILE MERGED
2003/11/27 09:27:51 rt 1.28.232.1: #111934#: join CWS sw7pp1c
2003-12-01 08:40:23 +00:00
Rüdiger Timm
5523dfed17 INTEGRATION: CWS geordi2q10 (1.71.2); FILE MERGED
2003/11/27 08:56:44 rt 1.71.2.1: #111934#: join CWS sw7pp1b
2003-12-01 08:40:11 +00:00
Rüdiger Timm
ef286dcf2d INTEGRATION: CWS geordi2q10 (1.33.2); FILE MERGED
2003/11/27 08:56:44 rt 1.33.2.1: #111934#: join CWS sw7pp1b
2003-12-01 08:39:57 +00:00
Rüdiger Timm
e2c8ef5884 INTEGRATION: CWS geordi2q10 (1.51.2); FILE MERGED
2003/11/27 08:56:43 rt 1.51.2.1: #111934#: join CWS sw7pp1b
2003-12-01 08:39:46 +00:00