Commit Graph

70 Commits

Author SHA1 Message Date
Kurt Zenker
9d7e0b57df INTEGRATION: CWS cjksp1_DEV300 (1.66.76); FILE MERGED
2007/10/23 06:04:48 pflin 1.66.76.3: RESYNC: (1.67-1.69); FILE MERGED
2007/09/27 04:30:17 pflin 1.66.76.2: RESYNC: (1.66-1.67); FILE MERGED
2007/04/23 08:01:33 pflin 1.66.76.1: Text grid enhancement: grid layout refactor
2008-03-07 15:26:19 +00:00
Vladimir Glazounov
5fec8b8a8a INTEGRATION: CWS swlayout01_SRC680 (1.66.234); FILE MERGED
2007/09/05 09:00:44 od 1.66.234.1: #i79774#,#b6596954# method <SwFlowFrm::MoveBwd(..)>
		    - on special check for follow frame neglect empty section frames.
2007-10-16 10:38:16 +00:00
Jens-Heiner Rechtien
f5df0c1779 INTEGRATION: CWS swwarnings (1.65.40); FILE MERGED
2007/09/24 07:02:42 os 1.65.40.6: RESYNC: (1.66-1.67); FILE MERGED
2007/04/11 10:37:58 os 1.65.40.5: RESYNC: (1.65-1.66); FILE MERGED
2007/04/03 12:59:57 tl 1.65.40.4: #i69287# warning-free code
2007/03/08 08:23:45 fme 1.65.40.3: #i69287# Warning free code
2007/03/05 12:45:28 tl 1.65.40.2: #i69287# warning-free code
2007/02/22 15:06:34 tl 1.65.40.1: #i69287# warning-free code
2007-09-27 08:01:58 +00:00
Vladimir Glazounov
2edd08e2c4 INTEGRATION: CWS loopcontrol (1.66.222); FILE MERGED
2007/09/05 08:12:07 fme 1.66.222.1: #i66968# Page breaks at nested tables should be ignored
2007-09-20 10:48:44 +00:00
Vladimir Glazounov
1c0eef3706 INTEGRATION: CWS swnewtable (1.62.14); FILE MERGED
2007/02/09 09:12:19 ama 1.62.14.6: RESYNC: (1.64-1.65); FILE MERGED
2007/01/25 11:22:45 fme 1.62.14.5: #i4032# New tables
2007/01/09 10:47:04 fme 1.62.14.4: RESYNC: (1.62-1.64); FILE MERGED
2006/12/12 15:27:20 fme 1.62.14.3: #i4032# New table concept
2006/11/03 15:15:56 fme 1.62.14.2: #i4032# New table concept
2006/10/31 14:34:18 fme 1.62.14.1: #i4032#: New table concept
2007-02-28 14:47:32 +00:00
Oliver Bolte
c2cfef539f INTEGRATION: CWS swqbf92 (1.64.8); FILE MERGED
2007/01/10 11:39:10 od 1.64.8.1: #i73194# method <SwFlowFrm::MoveBwd(..)>
	 - further correction of fix for issue i53139
2007-01-22 10:53:11 +00:00
Jens-Heiner Rechtien
158caee648 INTEGRATION: CWS smarttags (1.62.108); FILE MERGED
2006/12/21 10:43:04 jakob_lechner 1.62.108.1: #i72705#: support for smarttags
2007-01-02 15:48:46 +00:00
Rüdiger Timm
75506c62f3 INTEGRATION: CWS swqbf89 (1.62.52); FILE MERGED
2006/11/02 10:25:33 od 1.62.52.1: #i71065# method <SwFlowFrm::MoveBwd(..)>
	 - correction of fix for issue i53139:
	 -- consider flag <SwFlowFrm::bMoveBwdJump> on moving backward
	    of content in columned sections in spite of a column break.
2006-12-01 13:25:31 +00:00
Oliver Bolte
ebde1eb0d9 INTEGRATION: CWS pchfix02 (1.60.2); FILE MERGED
2006/09/01 17:51:47 kaib 1.60.2.1: #i68856# Added header markers and pch files
2006-09-16 20:17:47 +00:00
Oliver Bolte
7646464955 INTEGRATION: CWS sw20404_SRC680 (1.59.26); FILE MERGED
2006/09/11 11:08:23 od 1.59.26.1: #i69409# method <SwFlowFrm::MoveBwd(..)>
	 - check <pNewUpper>
2006-09-13 10:31:47 +00:00
Jens-Heiner Rechtien
d63870552a INTEGRATION: CWS writercorehandoff (1.48.40); FILE MERGED
2006/07/27 14:44:11 fme 1.48.40.15: RESYNC: (1.56-1.59); FILE MERGED
2006/05/30 06:36:48 fme 1.48.40.14: RESYNC: (1.54-1.56); FILE MERGED
2006/05/08 11:21:13 fme 1.48.40.13: #i50348# Make SwDoc accessible via interfaces
2006/03/17 08:09:24 tra 1.48.40.12: RESYNC: (1.50-1.54); FILE MERGED
2005/10/26 07:37:47 tra 1.48.40.11: #i50348#
2005/10/25 08:31:22 tra 1.48.40.10: RESYNC: (1.49-1.50); FILE MERGED
2005/10/06 08:08:54 tra 1.48.40.9: #50348#
2005/09/13 14:06:20 tra 1.48.40.8: RESYNC: (1.48-1.49); FILE MERGED
2005/07/14 05:01:15 fme 1.48.40.7: #i50348# Make SwDoc accessible via interfaces
2005/07/12 11:21:31 tra 1.48.40.6: #i50348#make SwDoc interface based
2005/07/11 05:11:40 tra 1.48.40.5: #i50348#make SwDoc interface based
2005/07/05 08:12:43 tra 1.48.40.4: #i50348#make SwDoc interface based
2005/06/24 11:43:22 fme 1.48.40.3: #i50348# Make SwDoc accessible via interfaces
2005/06/07 14:14:03 fme 1.48.40.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:27:43 tra 1.48.40.1: Unnecessary includes removed #i50348#
2006-08-14 15:25:22 +00:00
Oliver Bolte
10140c6884 INTEGRATION: CWS swqbf67 (1.57.4); FILE MERGED
2006/07/06 07:27:28 od 1.57.4.3: #136538#  method <SwFlowFrm::MoveBwd(..)>
	  - further correction of fix for issue i53139
2006/06/08 07:46:48 od 1.57.4.2: #136538# method <SwFlowFrm::MoveBwd(..)>
	 - further correction of fix for issue i53139
2006/06/06 12:46:15 od 1.57.4.1: #i66051# method <SwFlowFrm::MoveBwd(..)>
	 - further correction of fix for issue i53139
2006-07-13 10:31:19 +00:00
Oliver Bolte
ac81b118e6 INTEGRATION: CWS wordcountopt (1.54.76); FILE MERGED
2006/06/04 16:42:35 fme 1.54.76.2: RESYNC: (1.54-1.56); FILE MERGED
2006/05/02 08:33:19 fme 1.54.76.1: #i64985# Word count should be done during idle time
2006-07-10 14:29:29 +00:00
Vladimir Glazounov
af41b7f91f INTEGRATION: CWS swqbf64 (1.54.102); FILE MERGED
2006/05/17 11:06:48 od 1.54.102.1: #i65250# method <SwFlowFrm::MoveBwd(..)>
	 - apply <Move Backward> layout loop control
2006-06-02 11:11:54 +00:00
Vladimir Glazounov
4a15f93417 INTEGRATION: CWS swqbf63 (1.54.100); FILE MERGED
2006/05/17 08:08:10 od 1.54.100.3: #136024# method <SwFlowFrm::MoveBwd(..)>
	 - correct fix of issue i53139
2006/05/09 09:28:47 od 1.54.100.2: #i53139# method <SWFlowFrm::MoveBwd(..)>
	 - Choose correct new upper frame on moving backward in spite of
	   a page/column break to fill-up empty pages/columns.
2006/05/08 12:16:33 od 1.54.100.1: #i58846# method <SwFlowFrm::CutTree(..)>
	 - <SwFrm::Prepare( PREP_QUOVADIS )> only for frames inside footnotes.
2006-05-24 12:54:43 +00:00
Vladimir Glazounov
f1deb95713 INTEGRATION: CWS swqbf66 (1.54.120); FILE MERGED
2006/05/15 09:53:46 fme 1.54.120.1: #135914# Table row keep feature - Last row should not keep with frame in different section
2006-05-16 15:08:29 +00:00
Rüdiger Timm
f50f98860a INTEGRATION: CWS rowkeep (1.53.2); FILE MERGED
2006/02/17 15:09:19 fme 1.53.2.1: #131283# Table rows can keep together
2006-03-09 13:07:10 +00:00
Rüdiger Timm
033ce05641 INTEGRATION: CWS swqbf53 (1.51.4); FILE MERGED
2006/02/01 14:36:55 od 1.51.4.1: #130797# - correct fix for issue 126020
2006-02-06 15:30:31 +00:00
Kurt Zenker
9db3b3e77e INTEGRATION: CWS swqbf52 (1.50.154); FILE MERGED
2006/01/31 08:29:09 od 1.50.154.2: RESYNC: (1.50-1.51); FILE MERGED
2006/01/27 12:31:20 od 1.50.154.1: #i57765# class <SwFlowFrm>
	 - implementation of new methods <HasAttrPageBreakBefore(..)>
	   and <HasAttrColBreakBefore(..)>
	 - use the new methods in methods <IsPageBreak(..)> and <IsColBreak(..)>
2006-02-03 16:17:24 +00:00
Jens-Heiner Rechtien
91a9fda39e INTEGRATION: CWS swqbf50 (1.50.138); FILE MERGED
2006/01/04 15:55:27 od 1.50.138.1: #126020# adjust check for empty section from <SwLayoutFrm::ContainsCntnt()>
	 to <SwLayoutFrm::ContainsAny()> before deleting section as empty
	 by calling <SwSectionFrm::DelEmpty(..)>.
2006-01-27 13:35:52 +00:00
Jens-Heiner Rechtien
a6ed19026f INTEGRATION: CWS swqbf35 (1.48.96); FILE MERGED
2005/09/22 16:08:08 fme 1.48.96.3: RESYNC: (1.48-1.49); FILE MERGED
2005/08/16 12:14:37 od 1.48.96.2: #i53323# <SwFrm::GetLeaf( MakePageType, BOOL )>
	 - consider that a frame could be inside a table AND inside a section.
2005/07/04 08:24:30 fme 1.48.96.1: #i46683# No WrongPageDesc check in BroseMode
2005-09-28 10:11:17 +00:00
Rüdiger Timm
b896364a38 INTEGRATION: CWS ooo19126 (1.48.180); FILE MERGED
2005/09/05 13:40:14 rt 1.48.180.1: #i54170# Change license header: remove SISSL
2005-09-09 03:10:24 +00:00
Oliver Bolte
130f91a773 INTEGRATION: CWS swqbugfixes28 (1.47.50); FILE MERGED
2005/04/19 10:23:32 od 1.47.50.1: #i47697# <SwFlowFrm::MoveBwd(..)> - refine condition made for issue i44049:
	 - allow move backward of text frame, whose anchored object has restarted
           the layout process as long as the anchored object is positioned
	   considering its wrapping style influence only temporarily.
2005-04-20 11:22:40 +00:00
Vladimir Glazounov
afc7589e8f INTEGRATION: CWS swqbugfixes17 (1.45.148); FILE MERGED
2005/03/08 14:23:44 od 1.45.148.1: #i44049# <SwFlowFrm::MoveBwd(..)> - no move backward of text frame, if
	 one of its anchored objects has restarted the layout process.
2005-03-23 11:59:05 +00:00
Vladimir Glazounov
ea9ac6d7bd INTEGRATION: CWS swqbugfixes16 (1.45.122); FILE MERGED
2005/02/23 11:32:31 od 1.45.122.1: #b6229852# <SwFlowFrm::MoveBwd(..)> - Format new parent, if it's a section,
	   which lost its follow or got a follow.
2005-03-23 10:52:56 +00:00
Oliver Bolte
960ef1a29f INTEGRATION: CWS swqbugfixes11 (1.43.40); FILE MERGED
2004/12/08 14:02:27 od 1.43.40.1: #i38232# <SwFlowFrm::MoveBwd(..)> - do not check for locked next frame, if
	 keep attribute is set, if next frame is a table frame.
2005-01-05 13:30:18 +00:00
Vladimir Glazounov
b49458f517 INTEGRATION: CWS swqbugfixes10 (1.43.4); FILE MERGED
2004/12/03 15:35:30 od 1.43.4.2: #115759# - <SwFlowFrm::MoveSubTree(..)> - invalidate printing area of
           previous frame, if it's in a table
	 - <SwFlowFrm::CalcLowerSpace(..)> - no additional lower space
	   as last in table cell, if text frame has a follow.
	 - <SwFlowFrm::MoveBwd(..)> - text frames, which are directly
	   inside tables aren't allowed to move backward.
2004/11/29 11:14:44 fme 1.43.4.1: #i37084# SwFlowFrm::MoveBwd for footnotes should not rely on the result of FindLastCntnt, it may return 0 with nested sections
2004-12-23 09:07:01 +00:00
Oliver Bolte
8a9ded07bd INTEGRATION: CWS swqbugfixes09 (1.42.108); FILE MERGED
2004/10/27 09:38:08 od 1.42.108.2: #i26945# <SwFlowFrm::IsPrevObjMove()> - correction of re-factoring
2004/10/18 06:42:06 od 1.42.108.1: #i26945# <SwFlowFrm::IsPrevObjMove()> - improvement and correction
2004-11-16 14:44:46 +00:00
Kurt Zenker
ca59f3e441 INTEGRATION: CWS swobjpos04 (1.36.56); FILE MERGED
2004/07/13 01:34:44 od 1.36.56.6: RESYNC: (1.36-1.40); FILE MERGED
resolve merge conflicts.
2004/07/02 14:58:21 od 1.36.56.5: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:55 od 1.36.56.4: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 08:54:06 od 1.36.56.3: #i28701# - correct comment
2004/05/24 13:03:21 od 1.36.56.2: #i28701# - usage of new class <SwSortedObjs>
2004/05/07 15:31:34 od 1.36.56.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:08:38 +00:00
Jens-Heiner Rechtien
c12cec7c28 INTEGRATION: CWS swqbugfixes04 (1.40.20); FILE MERGED
2004/07/22 13:04:20 fme 1.40.20.3: #i10826# Keep - sections - footnotes - One of the most evil combinations
2004/07/16 12:23:07 od 1.40.20.2: #i26250# - Consider lower spacing of table in a table cell, if table is
	   the last content and corresponding document compatibility
	   option is ON
2004/07/15 11:34:58 fme 1.40.20.1: #i26831# The old problem: Table moves back and forward, invalidates surrounding section, which in turn invalidates the table etc. - Calling a SimpleFormat should help here
2004-08-02 12:07:25 +00:00
Hans-Joachim Lankenau
91610f6d5e INTEGRATION: CWS swdrawpositioning (1.32.6); FILE MERGED
2004/04/08 09:19:54 od 1.32.6.2: RESYNC: (1.32-1.36); FILE MERGED
2004/04/07 12:07:03 od 1.32.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
2004-06-28 12:38:43 +00:00
Hans-Joachim Lankenau
86282399af INTEGRATION: CWS swqbugfixes01 (1.36.70); FILE MERGED
2004/06/04 10:41:58 od 1.36.70.2: RESYNC: (1.36-1.37); FILE MERGED
2004/05/26 13:05:23 od 1.36.70.1: #i21478# <SwFlowFrm::MoveBwd(..)> - Do not move backward, if frame has
	 to keep with next frame and this frame is locked.
2004-06-28 12:08:52 +00:00
Oliver Bolte
54a5890beb INTEGRATION: CWS fmebugs02 (1.36.8); FILE MERGED
2004/04/19 11:41:06 fme 1.36.8.1: #i27145# Do a SimpleFormat on a section frame that has just lost some footnotes because some of its content had to move forward
2004-06-04 07:44:36 +00:00
Oliver Bolte
a5744cc0a2 INTEGRATION: CWS tableintable (1.28.62); FILE MERGED
2004/05/17 13:20:19 fme 1.28.62.3: RESYNC: (1.28-1.36); FILE MERGED
2004/02/26 15:55:57 fme 1.28.62.2: #i25679# Feature - Table in table
2004/02/20 13:29:34 fme 1.28.62.1: #i25679# Feature - Table in table
2004-06-01 06:44:04 +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
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
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
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
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
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
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
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
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
Rüdiger Timm
f661ca8842 INTEGRATION: CWS aw003 (1.22.6); FILE MERGED
2003/11/04 16:21:30 aw 1.22.6.4: RESYNC: (1.24-1.25); FILE MERGED
2003/10/23 14:39:28 aw 1.22.6.3: #111111#
Changed GetBoundRect() to GetCurrentBoundRect() and GetLastBoundRect()
2003/08/20 11:30:08 aw 1.22.6.2: RESYNC: (1.22-1.24); FILE MERGED
2003/06/30 13:38:28 aw 1.22.6.1: #110094#
2003-11-24 15:05:13 +00:00
Rüdiger Timm
3a1ba22758 INTEGRATION: CWS writerteamqbugs (1.24.52); FILE MERGED
2003/08/21 14:44:04 fme 1.24.52.1: #111704# PageDesc check does not make sense for frames in fly frames
2003-10-30 09:18:32 +00:00
Vladimir Glazounov
c5adfc335c INTEGRATION: CWS sw023 (1.23.28); FILE MERGED
2003/07/16 15:38:15 fme 1.23.28.2: #110889# Hack for i14206 prevented a frame to flow backwards although it should - Correction
2003/07/16 15:31:06 fme 1.23.28.1: #110889# Hack for i14206 prevented a frame to flow backwards although it should
2003-07-21 09:31:00 +00:00
Vladimir Glazounov
084daf8487 INTEGRATION: CWS sw019 (1.22.80); FILE MERGED
2003/07/01 07:40:58 fme 1.22.80.1: #i14206# MoveBwd in combination with empty page and pagebreak changed
2003-07-01 14:11:27 +00:00
Vladimir Glazounov
4bebbbc7cb INTEGRATION: CWS os8 (1.20.2.1.58); FILE MERGED
2003/04/03 07:10:55 os 1.20.2.1.58.1: #108583# precompiled headers removed
2003-04-17 13:11:29 +00:00
Jens-Heiner Rechtien
70de0c38fd MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 14:45:43 +00:00