Commit Graph

649 Commits

Author SHA1 Message Date
Kurt Zenker
462a420691 INTEGRATION: CWS qwizards1 (1.57.2); FILE MERGED
2004/04/14 08:48:45 os 1.57.2.1: #116342# assure that SwXFrame::dispose() doesn't delete the Writer fly frame recursively
2004-05-19 12:35:20 +00:00
Kurt Zenker
87a93c0488 INTEGRATION: CWS swautowidth (1.53.6); FILE MERGED
2004/04/06 08:37:03 fme 1.53.6.2: #i9046# Feature - Automatic frame width
2004/04/05 13:09:09 fme 1.53.6.1: i27205# Feature - Automatic frame width
2004-05-18 14:52:05 +00:00
Kurt Zenker
9ebd74315f INTEGRATION: CWS swautowidth (1.49.4); FILE MERGED
2004/04/27 08:03:16 fme 1.49.4.2: RESYNC: (1.49-1.50); FILE MERGED
2004/04/05 13:09:10 fme 1.49.4.1: i27205# Feature - Automatic frame width
2004-05-18 13:52:00 +00:00
Kurt Zenker
d74c6b6455 INTEGRATION: CWS swautowidth (1.16.16); FILE MERGED
2004/04/05 13:09:09 fme 1.16.16.1: i27205# Feature - Automatic frame width
2004-05-18 13:51:38 +00:00
Kurt Zenker
e2aba93c42 INTEGRATION: CWS swautowidth (1.61.14); FILE MERGED
2004/04/27 08:02:55 fme 1.61.14.4: RESYNC: (1.61-1.62); FILE MERGED
2004/04/15 17:08:44 fme 1.61.14.3: #i27205# Feature - Automatic frame width
2004/04/07 14:03:35 fme 1.61.14.2: #i27205# Feature - Automatic frame width
2004/04/05 13:09:08 fme 1.61.14.1: i27205# Feature - Automatic frame width
2004-05-18 13:51:24 +00:00
Kurt Zenker
b87a57240a INTEGRATION: CWS swautowidth (1.30.16); FILE MERGED
2004/04/05 13:09:08 fme 1.30.16.1: i27205# Feature - Automatic frame width
2004-05-18 13:50:59 +00:00
Kurt Zenker
f1a6303acf INTEGRATION: CWS swautowidth (1.7.16); FILE MERGED
2004/04/05 13:09:07 fme 1.7.16.1: i27205# Feature - Automatic frame width
2004-05-18 13:50:46 +00:00
Kurt Zenker
9bea339504 INTEGRATION: CWS swautowidth (1.57.54); FILE MERGED
2004/04/27 08:02:46 fme 1.57.54.5: RESYNC: (1.57-1.58); FILE MERGED
2004/04/22 07:09:49 fme 1.57.54.4: #i9046# Feature - Automatic frame width
2004/04/07 14:03:32 fme 1.57.54.3: #i27205# Feature - Automatic frame width
2004/04/06 08:37:02 fme 1.57.54.2: #i9046# Feature - Automatic frame width
2004/04/05 13:09:07 fme 1.57.54.1: i27205# Feature - Automatic frame width
2004-05-18 13:50:33 +00:00
Kurt Zenker
6334977760 INTEGRATION: CWS swautowidth (1.45.54); FILE MERGED
2004/05/07 14:35:50 dvo 1.45.54.3: #i27203# make sure API accepts '0' for frame width/height (mapped to MINLAY internally)
2004/04/07 13:37:20 dvo 1.45.54.2: #i27203# implement WidthType property for frames
2004/04/05 13:09:07 fme 1.45.54.1: i27205# Feature - Automatic frame width
2004-05-18 13:50:18 +00:00
Kurt Zenker
e22d8c7215 INTEGRATION: CWS swundo01 (1.4.126); FILE MERGED
2004/02/13 15:45:34 hbrinkm 1.4.126.3: RESYNC: (1.5-1.6); FILE MERGED
2004/02/11 15:49:52 hbrinkm 1.4.126.2: RESYNC: (1.4-1.5); FILE MERGED
2003/11/11 13:49:03 hbrinkm 1.4.126.1: #i7983#
2004-05-18 13:04:20 +00:00
Kurt Zenker
41267e274f INTEGRATION: CWS swundo01 (1.39.38); FILE MERGED
2004/04/19 10:15:22 hbrinkm 1.39.38.4: RESYNC: (1.41-1.45); FILE MERGED
2004/02/11 15:47:47 hbrinkm 1.39.38.3: RESYNC: (1.40-1.41); FILE MERGED
2004/01/06 23:57:37 hbrinkm 1.39.38.2: RESYNC: (1.39-1.40); FILE MERGED
2003/11/18 13:47:16 hbrinkm 1.39.38.1: #i7983#
2004-05-18 13:04:03 +00:00
Rüdiger Timm
86ffeb0bb1 INTEGRATION: CWS hbqea101 (1.3.238); FILE MERGED
2004/04/26 13:38:28 hbrinkm 1.3.238.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:17:13 +00:00
Rüdiger Timm
64eb9cc094 INTEGRATION: CWS hbqea101 (1.33.88); FILE MERGED
2004/05/05 14:56:11 hbrinkm 1.33.88.2: RESYNC: (1.33-1.34); FILE MERGED
2004/04/26 13:38:28 hbrinkm 1.33.88.1: #i27615# allow cursor in front of numbering label and propagate char attrs to according numbering format
2004-05-17 15:16:56 +00:00
Jens-Heiner Rechtien
67021e7ff0 INTEGRATION: CWS swtextwrap (1.53.42); FILE MERGED
2004/04/23 07:25:38 fme 1.53.42.1: #108724# #i13832# #i24135# Compatibility flag - text wrapping around objects anchored in header and text wrapping of text in header/footer
2004-05-11 10:28:11 +00:00
Rüdiger Timm
2344bff30e INTEGRATION: CWS swqod01 (1.32.4); FILE MERGED
2004/04/28 14:32:41 od 1.32.4.1: #116561# <SwSectionFrm::MakeAll()> - in online layout join follows, if
	 section can grow.
	 <SwSectionFrm::_Grow(..)> - allow grow in online layout.
2004-05-03 13:23:44 +00:00
Rüdiger Timm
cb103d41bb INTEGRATION: CWS swqod01 (1.78.50); FILE MERGED
2004/04/28 07:48:52 od 1.78.50.2: RESYNC: (1.78-1.79); FILE MERGED
2004/04/23 14:44:44 od 1.78.50.1: #116347# - clear and restore also line color at window before a paint
2004-05-03 13:23:30 +00:00
Rüdiger Timm
7f44102e31 INTEGRATION: CWS swqod01 (1.39.14); FILE MERGED
2004/04/23 14:44:19 od 1.39.14.1: #116347# - clear and restore also line color at window before a paint
2004-05-03 13:23:16 +00:00
Rüdiger Timm
0163493fff INTEGRATION: CWS swqod01 (1.58.30); FILE MERGED
2004/04/28 14:29:19 od 1.58.30.1: #116560# <::CalcCntnt(..)> - no format of previous frame due to keep-attribute,
	 if current frame is a follow or locked.
	 <::CalcCntnt(..)> - no invalidation and format of Writer fly frame,
	 if it's locked.
2004-05-03 13:23:03 +00:00
Rüdiger Timm
3f82c808a1 INTEGRATION: CWS gt03 (1.32.18); FILE MERGED
2004/03/24 08:19:28 gt 1.32.18.2: RESYNC: (1.32-1.33); FILE MERGED
2004/03/11 14:55:08 fme 1.32.18.1: #26165# Feature - Multiple headline rows in tables
2004-05-03 12:47:58 +00:00
Rüdiger Timm
9dc41a26cc INTEGRATION: CWS gt03 (1.50.32); FILE MERGED
2004/04/28 14:54:01 fme 1.50.32.10: resolve merge conflicts
2004/04/28 08:11:17 fme 1.50.32.9: #26165# Feature - Multiple headline rows in tables
2004/04/21 09:52:35 gt 1.50.32.8: #i26167# misc merge corrections
2004/04/20 09:29:54 gt 1.50.32.7: RESYNC: (1.51-1.53); FILE MERGED
2004/04/16 08:12:51 fme 1.50.32.6: #26165# Feature - Multiple headline rows in tables
2004/04/07 09:30:47 fme 1.50.32.5: #i26165# Feature - Multiple headline rows in tables - do not trust the layout cache, if may not match the number of repeated headlines
2004/03/24 08:19:18 gt 1.50.32.4: RESYNC: (1.50-1.51); FILE MERGED
2004/03/12 08:50:20 fme 1.50.32.3: #26165# Feature - Multiple headline rows in tables
2004/03/12 08:22:25 fme 1.50.32.2: #26165# Feature - Multiple headline rows in tables
2004/03/11 14:55:07 fme 1.50.32.1: #26165# Feature - Multiple headline rows in tables
2004-05-03 12:47:42 +00:00
Rüdiger Timm
9bd387871c INTEGRATION: CWS gt03 (1.75.18); FILE MERGED
2004/03/24 08:19:06 gt 1.75.18.2: RESYNC: (1.75-1.78); FILE MERGED
2004/03/11 14:55:07 fme 1.75.18.1: #26165# Feature - Multiple headline rows in tables
2004-05-03 12:47:25 +00:00
Rüdiger Timm
37b23791de INTEGRATION: CWS gt03 (1.15.18); FILE MERGED
2004/04/16 08:12:51 fme 1.15.18.4: #26165# Feature - Multiple headline rows in tables
2004/04/07 09:30:47 fme 1.15.18.3: #i26165# Feature - Multiple headline rows in tables - do not trust the layout cache, if may not match the number of repeated headlines
2004/03/12 09:01:15 fme 1.15.18.2: #26165# Feature - Multiple headline rows in tables
2004/03/11 14:55:07 fme 1.15.18.1: #26165# Feature - Multiple headline rows in tables
2004-05-03 12:47:10 +00:00
Rüdiger Timm
77c243d8f7 INTEGRATION: CWS gt03 (1.23.34); FILE MERGED
2004/03/11 14:55:06 fme 1.23.34.1: #26165# Feature - Multiple headline rows in tables
2004-05-03 12:46:57 +00:00
Rüdiger Timm
1b13908a94 INTEGRATION: CWS gt03 (1.20.76); FILE MERGED
2004/04/21 08:28:36 gt 1.20.76.4: #i26167# missing type in declaration in SwCellFrm::GetPreviousCell() for bIsInFirstLine
2004/04/20 09:28:12 gt 1.20.76.3: RESYNC: (1.22-1.23); FILE MERGED
2004/03/24 08:17:16 gt 1.20.76.2: RESYNC: (1.20-1.22); FILE MERGED
2004/03/11 14:55:05 fme 1.20.76.1: #26165# Feature - Multiple headline rows in tables
2004-05-03 12:46:43 +00:00
Kurt Zenker
963df12073 #i10000# pCell -> _pCell 2004-04-23 08:17:48 +00:00
Sander Vesik
3f14a5c956 INTEGRATION: CWS vertcell (1.48.30); FILE MERGED
2004/03/10 09:58:00 fme 1.48.30.8: RESYNC: (1.48-1.51); FILE MERGED
2004/02/16 11:10:27 fme 1.48.30.7: #i16944# Vertical formatting for individual cell frames
2004/02/13 15:52:50 fme 1.48.30.6: #i16944# Vertical formatting for individual cell frames
2004/02/11 09:12:56 fme 1.48.30.5: #i16944# Vertical formatting for individual cell frames
2004/02/06 12:44:30 fme 1.48.30.4: #i16944# Vertical formatting for individual cell frames
2004/02/05 14:52:04 fme 1.48.30.3: #i16944# Vertical formatting for individual cell frames
2004/02/05 14:45:36 fme 1.48.30.2: #i16944# Vertical formatting for individual cell frames
2004/02/04 14:18:28 fme 1.48.30.1: #i16944# Vertical formatting for individual cell frames
2004-04-21 10:40:02 +00:00
Sander Vesik
da295e4b33 INTEGRATION: CWS vertcell (1.47.34); FILE MERGED
2004/02/05 14:52:06 fme 1.47.34.2: #i16944# Vertical formatting for individual cell frames
2004/02/04 14:18:29 fme 1.47.34.1: #i16944# Vertical formatting for individual cell frames
2004-04-21 08:57:11 +00:00
Sander Vesik
613347483c INTEGRATION: CWS vertcell (1.32.34); FILE MERGED
2004/03/10 09:58:09 fme 1.32.34.2: RESYNC: (1.32-1.33); FILE MERGED
2004/02/11 09:12:56 fme 1.32.34.1: #i16944# Vertical formatting for individual cell frames
2004-04-21 08:56:56 +00:00
Sander Vesik
a7509e3eee INTEGRATION: CWS vertcell (1.35.98); FILE MERGED
2004/02/11 09:12:56 fme 1.35.98.1: #i16944# Vertical formatting for individual cell frames
2004-04-21 08:56:32 +00:00
Sander Vesik
bce9c73fe7 INTEGRATION: CWS vertcell (1.75.32); FILE MERGED
2004/03/10 09:57:44 fme 1.75.32.4: RESYNC: (1.75-1.77); FILE MERGED
2004/02/13 15:52:49 fme 1.75.32.3: #i16944# Vertical formatting for individual cell frames
2004/02/05 14:52:02 fme 1.75.32.2: #i16944# Vertical formatting for individual cell frames
2004/02/04 14:18:27 fme 1.75.32.1: #i16944# Vertical formatting for individual cell frames
2004-04-21 08:56:15 +00:00
Sander Vesik
85c104e0b8 INTEGRATION: CWS vertcell (1.15.34); FILE MERGED
2004/02/04 14:18:27 fme 1.15.34.1: #i16944# Vertical formatting for individual cell frames
2004-04-21 08:55:59 +00:00
Sander Vesik
2ef809a875 INTEGRATION: CWS vertcell (1.42.34); FILE MERGED
2004/02/05 14:51:59 fme 1.42.34.2: #i16944# Vertical formatting for individual cell frames
2004/02/04 14:18:26 fme 1.42.34.1: #i16944# Vertical formatting for individual cell frames
2004-04-21 08:55:45 +00:00
Rüdiger Timm
a82a5e9c54 INTEGRATION: CWS swobjpos05 (1.48.14); FILE MERGED
2004/03/25 10:24:16 od 1.48.14.2: RESYNC: (1.48-1.49); FILE MERGED
2004/03/18 13:31:52 od 1.48.14.1: #i11860# method <SwRootFrm::InvalidateAllObjPos()> - implementation
	 method <SwCntntFrm::_UpdateAttr(..)> - invalidation of the
	 object positions of the next frame due to a change at the
	 paragraph spacing above/below.
2004-03-31 14:09:24 +00:00
Rüdiger Timm
a32fe646d2 INTEGRATION: CWS swobjpos05 (1.35.160); FILE MERGED
2004/03/18 13:29:38 od 1.35.160.1: #i11860# method <SwFrm::GetFrmAnchorPos(..)> - consider different upper
	 space amount on determination of the frame anchor position.
2004-03-31 14:09:09 +00:00
Rüdiger Timm
6aaebf4b6e INTEGRATION: CWS swobjpos05 (1.60.14); FILE MERGED
2004/03/25 10:23:20 od 1.60.14.2: RESYNC: (1.60-1.61); FILE MERGED
2004/03/18 13:28:18 od 1.60.14.1: #i11860# <SwFrmNotify::~SwFrmNotify()> - consider different upper space
	 amounts on positioning of drawing objects.
2004-03-31 14:08:56 +00:00
Rüdiger Timm
733fae1f4f INTEGRATION: CWS swobjpos05 (1.57.14); FILE MERGED
2004/03/18 13:25:05 od 1.57.14.1: #i11860# method <SwFrm::InvalidateObjPos()> - implementation
2004-03-31 14:08:41 +00:00
Rüdiger Timm
eb0a84a281 INTEGRATION: CWS swobjpos05 (1.32.14); FILE MERGED
2004/03/25 10:22:40 od 1.32.14.2: RESYNC: (1.32-1.35); FILE MERGED
resolve merge conflict.
2004/03/18 13:24:23 od 1.32.14.1: #i11860# class <SwFlowFrm> - implementation of new methods to determine
	 the different amounts for the upper space.
	 method <SwFlowFrm::CalcUpperSpace(..)> - refactoring.
2004-03-31 14:08:26 +00:00
Kurt Zenker
cb632e7373 #100000# correct function call 2004-03-24 11:27:17 +00:00
Kurt Zenker
8f9298ffb2 INTEGRATION: CWS swformatcells (1.42.72); FILE MERGED
2004/03/02 15:21:26 od 1.42.72.1: #106629# <SwCntntFrm::MakePrtArea(..)> - consider lower spacing due to
	 new option 'Add paragraph and table spacing at bottom of table cells
	 <SwCntntFrm::MakeAll> - invalidate of master, if follow is moved
	 forward.
	 <SwCntntFrm::ShouldBwdMoved(..)> and <SwCntntFrm::_WouldFit(..)>
	 - adjustments for consider lower spacing in table cells.:
2004-03-23 10:36:45 +00:00
Kurt Zenker
86b5f34352 INTEGRATION: CWS swformatcells (1.47.72); FILE MERGED
2004/03/02 15:26:34 od 1.47.72.1: #106629# - general improvements and correction of invalidation due to
	 a change of the upper/lower spacing
2004-03-23 10:25:38 +00:00
Kurt Zenker
a1ad833812 INTEGRATION: CWS swformatcells (1.49.20); FILE MERGED
2004/03/03 09:05:02 od 1.49.20.2: RESYNC: (1.49-1.51); FILE MERGED
2004/03/02 15:25:01 od 1.49.20.1: #106629# - improve local methods <lcl_CalcMinRowHeight(..)> and
	   <lcl_CalcMinCellHeight(..)>
2004-03-23 10:25:23 +00:00
Kurt Zenker
d46972b171 INTEGRATION: CWS swformatcells (1.28.66); FILE MERGED
2004/03/03 09:02:58 od 1.28.66.2: RESYNC: (1.28-1.31); FILE MERGED
2004/03/02 15:22:46 od 1.28.66.1: #106629# <SwFlowFrm::CalcLowerSpace(..)> - implementation
	 <SwFlowFrm::CalcUpperSpace(..)> - corrections
2004-03-23 10:25:05 +00:00
Oliver Bolte
3473a83795 INTEGRATION: CWS fmebugs01 (1.48.48); FILE MERGED
2004/03/09 07:39:21 fme 1.48.48.5: #115863# Do not allow repeated header rows to split
2004/03/05 15:10:41 fme 1.48.48.4: RESYNC: (1.48-1.51); FILE MERGED
2004/03/05 10:01:55 fme 1.48.48.3: #114798# Some minor fixes to prevent loops with table frames
2004/02/20 12:04:33 fme 1.48.48.2: #115598# #115625# Loop prevention during cellbreak in weird tables
2004/02/18 12:30:24 fme 1.48.48.1: #i21774# Footnotes and centering the grid does not work together
2004-03-17 11:50:18 +00:00
Oliver Bolte
a1b8276784 INTEGRATION: CWS fmebugs01 (1.30.102); FILE MERGED
2004/03/05 15:09:55 fme 1.30.102.2: RESYNC: (1.30-1.31); FILE MERGED
2004/02/18 12:30:23 fme 1.30.102.1: #i21774# Footnotes and centering the grid does not work together
2004-03-17 11:50:04 +00:00
Oliver Bolte
4cdaadb1b1 INTEGRATION: CWS fmebugs01 (1.55.48); FILE MERGED
2004/03/05 15:09:06 fme 1.55.48.2: RESYNC: (1.55-1.58); FILE MERGED
2004/03/05 09:59:15 fme 1.55.48.1: #114798# Invalidation of previous frame for keep attribute should check if the previous frame has an indirect prev
2004-03-17 11:49:49 +00:00
Oliver Bolte
7e7bb07652 INTEGRATION: CWS fmebugs01 (1.24.112); FILE MERGED
2004/03/05 15:08:57 fme 1.24.112.2: RESYNC: (1.24-1.26); FILE MERGED
2004/03/05 09:55:24 fme 1.24.112.1: #111909# Objects anchored as character may exceed right margins
2004-03-17 11:49:35 +00:00
Oliver Bolte
757530f826 INTEGRATION: CWS fmebugs01 (1.5.398); FILE MERGED
2004/03/05 15:08:48 fme 1.5.398.2: RESYNC: (1.5-1.6); FILE MERGED
2004/03/05 09:54:53 fme 1.5.398.1: #111909# Objects anchored as character may exceed right margins
2004-03-17 11:49:22 +00:00
Oliver Bolte
2c377d24ea INTEGRATION: CWS fmebugs01 (1.35.50); FILE MERGED
2004/03/05 15:08:40 fme 1.35.50.2: RESYNC: (1.35-1.37); FILE MERGED
2004/03/05 09:57:52 fme 1.35.50.1: #114798# MakeAll of fly in section should not calculate the section, if the fly is inside a table inside the section
2004-03-17 11:49:07 +00:00
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