Commit Graph

51 Commits

Author SHA1 Message Date
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
Frank Meies
8ea8493760 #104963# Keep attribute should not be applied if there is a table with pagebreak behind the keep attribute 2002-11-13 08:40:43 +00:00
Oliver Düsterhoff
eb167b5ed1 #104840# - use <SwLayoutFrm::IsBefore(..)> 2002-11-11 08:46:51 +00:00
Oliver Düsterhoff
e84a48fa2b #97265# SwFlowFrm::MoveFwd(..)/MoveBwd(..) - no <CheckPageDesc(..)> in online layout 2002-11-01 10:43:00 +00:00
Andreas Martens
0f07a05ef8 Fix #99066#: Autopos. frame in columned section 2002-09-13 11:13:06 +00:00
Frank Meies
748c608a31 #100926# FindMaster for SwTabFrm 2002-08-07 14:52:50 +00:00
Andreas Martens
b81ae6f0ca Fix #96678#: Asian layout grid 2002-02-08 13:49:20 +00:00
Andreas Martens
7cf9bba375 Fix #96678#: Asian grid 2002-02-05 14:00:23 +00:00
Andreas Martens
8c5ac2dbac New: Asian grid layout 2002-01-31 13:23:16 +00:00
Andreas Martens
488fdb804c New #96678#: Vertical layout 2002-01-24 15:39:06 +00:00
Andreas Martens
5f8bc8f1c3 New #96678#: Vertical layout 2002-01-24 15:21:17 +00:00
Andreas Martens
953d6c62d7 Fix: Vertical sections 2001-11-14 15:08:34 +00:00
Andreas Martens
7f8d96deaa Fix: Vertical sections 2001-11-13 14:21:55 +00:00
Andreas Martens
636f314073 Chg: Vertical layout grow/shrink 2001-10-19 09:25:19 +00:00
Andreas Martens
ec8c539c29 Chg: More help functions for vertical layout 2001-10-05 11:36:10 +00:00
Andreas Martens
0195dac7d5 Fix #90885#: Working on a deleted pointer 2001-08-17 11:22:48 +00:00
Andreas Martens
44d27bbcfa Fix #1224#: Backward into nirwana 2001-07-16 12:03:07 +00:00
Andreas Martens
cc27309f98 Fix #84125#: Flyframes inside section frames 2001-03-14 13:16:02 +00:00
Andreas Martens
03a3677c1a Fix #65244#: Right and left pages, virtual page numbering 2001-03-02 09:47:13 +00:00
Andreas Martens
84ddfad38e Fix #79751#: The shell-pointer may be empty 2000-10-30 15:22:11 +00:00