Commit Graph

71 Commits

Author SHA1 Message Date
Rüdiger Timm
7162dcf8db INTEGRATION: CWS notes2 (1.69.2); FILE MERGED
2008/01/31 11:47:46 mba 1.69.2.3: warning about copy ctor
2007/12/18 17:32:15 mba 1.69.2.2: some cleanups
2007/12/10 08:41:10 mba 1.69.2.1: #i6193#: notes in Web Layout
2008-02-19 12:44:17 +00:00
Jens-Heiner Rechtien
4b66eff79c INTEGRATION: CWS sw8u10bf02 (1.69.96); FILE MERGED
2007/11/28 16:01:30 od 1.69.96.1: #b6614158# - method <SwCntntFrm::_WouldFit(..)
	   -- handling of new parameter <bObjsInNewUpper>: no test move of
	      next frame, if object are present in new upper
	   - method <SwCntntFrm::ShouldBwdMoved(..)>
	   -- pass new parameter value to method <SwCntntFrm::_WouldFit(..)>
2008-01-04 12:21:28 +00:00
Jens-Heiner Rechtien
86a361d84d INTEGRATION: CWS swwarnings (1.65.128); FILE MERGED
2007/09/24 07:02:35 os 1.65.128.6: RESYNC: (1.67-1.68); FILE MERGED
2007/08/20 15:35:20 tl 1.65.128.5: RESYNC: (1.66-1.67); FILE MERGED
2007/04/11 10:37:40 os 1.65.128.4: RESYNC: (1.65-1.66); FILE MERGED
2007/03/08 08:23:44 fme 1.65.128.3: #i69287# Warning free code
2007/03/05 12:45:28 tl 1.65.128.2: #i69287# warning-free code
2007/02/22 15:06:34 tl 1.65.128.1: #i69287# warning-free code
2007-09-27 08:01:12 +00:00
Vladimir Glazounov
0bb79ee35f INTEGRATION: CWS loopcontrol (1.67.98); FILE MERGED
2007/09/05 08:10:51 fme 1.67.98.1: #i81146# Implement various loop controls
2007-09-20 10:48:30 +00:00
Jens-Heiner Rechtien
3693a16b7c INTEGRATION: CWS swqbf97 (1.66.70); FILE MERGED
2007/06/05 12:47:21 fme 1.66.70.1: #i77676# Line count check does not make sense if follow has a negative size
2007-06-26 09:42:04 +00:00
Vladimir Glazounov
bc6d78292a INTEGRATION: CWS swnewtable (1.63.14); FILE MERGED
2007/01/25 11:16:53 fme 1.63.14.8: #i4032# New tables
2007/01/09 10:46:40 fme 1.63.14.7: RESYNC: (1.64-1.65); FILE MERGED
2006/12/06 14:37:01 fme 1.63.14.6: #i4032# New table concept
2006/11/21 09:50:32 fme 1.63.14.5: RESYNC: (1.63-1.64); FILE MERGED
2006/11/03 15:15:56 fme 1.63.14.4: #i4032# New table concept
2006/10/31 14:34:17 fme 1.63.14.3: #i4032#: New table concept
2006/10/16 14:36:38 fme 1.63.14.2: #i4032#: New table concept
2006/10/13 11:28:05 fme 1.63.14.1: #i4032#: New table concept
2007-02-28 14:47:09 +00:00
Rüdiger Timm
0a1c771d9f INTEGRATION: CWS swautomatic01 (1.61.90); FILE MERGED
2006/11/16 14:45:13 fme 1.61.90.4: RESYNC: (1.63-1.64); FILE MERGED
2006/10/10 17:34:13 fme 1.61.90.3: RESYNC: (1.62-1.63); FILE MERGED
2006/09/01 12:34:13 fme 1.61.90.2: RESYNC: (1.61-1.62); FILE MERGED
2006/08/01 15:07:46 fme 1.61.90.1: #i64576# Automatic styles
2006-12-01 14:43:54 +00:00
Oliver Bolte
c5279ab81d INTEGRATION: CWS swqbf87 (1.62.42); FILE MERGED
2006/10/05 10:58:25 od 1.62.42.2: RESYNC: (1.62-1.63); FILE MERGED
2006/09/25 14:33:04 od 1.62.42.1: #b6448963# method <SwCntntFrm::MakeAll()>
	   - introduce loop control: no <SwCntntFrm::Format()> any more, if
	     <cnStopFormat> consequetive formattings are performed without
	     any change.
2006-10-13 11:19:53 +00:00
Oliver Bolte
2919bd63bb INTEGRATION: CWS pchfix02 (1.62.2); FILE MERGED
2006/09/01 17:51:46 kaib 1.62.2.1: #i68856# Added header markers and pch files
2006-09-16 20:16:49 +00:00
Jens-Heiner Rechtien
d30bad0a91 INTEGRATION: CWS writercorehandoff (1.55.96); FILE MERGED
2006/05/08 11:21:13 fme 1.55.96.9: #i50348# Make SwDoc accessible via interfaces
2006/03/17 08:08:35 tra 1.55.96.8: RESYNC: (1.58-1.61); FILE MERGED
2005/12/20 15:12:50 tra 1.55.96.7: RESYNC: (1.57-1.58); FILE MERGED
2005/10/25 08:31:13 tra 1.55.96.6: RESYNC: (1.56-1.57); FILE MERGED
2005/09/13 14:05:25 tra 1.55.96.5: RESYNC: (1.55-1.56); FILE MERGED
2005/07/14 05:01:14 fme 1.55.96.4: #i50348# Make SwDoc accessible via interfaces
2005/07/12 11:21:30 tra 1.55.96.3: #i50348#make SwDoc interface based
2005/07/05 08:12:42 tra 1.55.96.2: #i50348#make SwDoc interface based
2005/06/24 11:43:21 fme 1.55.96.1: #i50348# Make SwDoc accessible via interfaces
2006-08-14 15:25:09 +00:00
Rüdiger Timm
60c97a7474 INTEGRATION: CWS rowkeep (1.60.2); FILE MERGED
2006/02/17 15:09:16 fme 1.60.2.1: #131283# Table rows can keep together
2006-03-09 13:06:28 +00:00
Kurt Zenker
02654d2c9f INTEGRATION: CWS swqbf52 (1.58.76); FILE MERGED
2006/01/31 08:28:49 od 1.58.76.3: RESYNC: (1.58-1.59); FILE MERGED
2006/01/27 08:52:31 od 1.58.76.2: #i58182# <SwCntntFrm::MakeAll()>
	 - Adjustment of conditions for moving forward a paragraph,
	   which is moved forward due to the positioning of its anchored objects.
2006/01/23 10:21:31 od 1.58.76.1: #i59341# <SwCntntFrm::MakeAll(..)>
	 - Workaround for inadequate layout algorithm:
	   suppress invalidation and calculation of paragraph inside
	   footnote, if it already formatted itself STOP_FLY_FORMAT times
	   and has anchored objects. Thus, the format of the anchored
	   object could take place and probably solve the layout loop.
2006-02-03 16:17:13 +00:00
Jens-Heiner Rechtien
35888c6165 INTEGRATION: CWS swqbf50 (1.58.54); FILE MERGED
2006/01/03 12:51:51 od 1.58.54.1: #125452# <SwCntntFrm::MakeAll()>
	 - invalidate printing area flag, changes frame area width
	   from 0 to something greater than zero and current printing
	   area width is also zero.
2006-01-27 13:35:32 +00:00
Oliver Bolte
284339169c INTEGRATION: CWS swqbf45 (1.57.76); FILE MERGED
2005/11/17 06:46:08 od 1.57.76.1: #i56850# <SwFrm::MakePos()>
	 change condition on formatting upper frame:
	 - no format of upper fly frame, which is anchored to-paragraph
	   or to-character
2005-11-17 15:33:30 +00:00
Jens-Heiner Rechtien
2b5fcf5903 INTEGRATION: CWS swqbf35 (1.55.152); FILE MERGED
2005/09/22 16:07:09 fme 1.55.152.2: RESYNC: (1.55-1.56); FILE MERGED
2005/07/01 13:17:42 fme 1.55.152.1: #i46181# Frames with upper spacing sometimes don't move backward
2005-09-28 10:10:56 +00:00
Rüdiger Timm
601b26ecec INTEGRATION: CWS ooo19126 (1.55.234); FILE MERGED
2005/09/05 13:40:13 rt 1.55.234.1: #i54170# Change license header: remove SISSL
2005-09-09 03:08:06 +00:00
Vladimir Glazounov
8934614638 INTEGRATION: CWS swqbugfixes17 (1.54.18); FILE MERGED
2005/03/08 14:17:46 od 1.54.18.1: #i44049# - <SwFrm::PrepareMake(..)> - no format of previous frames, if
	   the current one is a table frame and its previous frame wants
	   to keep with it.
	 - <SwCntntFrm::MakeAll(..)> - no invalidation of anchored objects
	   during format - now it's done in <SwCntntNotify::~SwCntntNotify()>
2005-03-23 11:58:48 +00:00
Vladimir Glazounov
c531d7e253 INTEGRATION: CWS swqbugfixes14 (1.53.4); FILE MERGED
2005/01/28 09:29:54 fme 1.53.4.1: #118572# #i33887# New: Looping Louie (Light) - Tries to solve a desperate situation before Looping Louie takes over
2005-02-22 07:19:36 +00:00
Kurt Zenker
8461c418c0 INTEGRATION: CWS swqbugfixes12 (1.52.8); FILE MERGED
2005/01/10 17:51:45 od 1.52.8.1: #i40150# <SwCntntFrm::MakeAll()> - no check of frame height change after
	 format of printing area, if frame is undersized.
2005-01-21 09:34:12 +00:00
Vladimir Glazounov
c12642af03 INTEGRATION: CWS swqbugfixes10 (1.51.4); FILE MERGED
2004/12/03 15:29:15 od 1.51.4.2: #115759# <SwCntntFrm::MakeAll()> - refine condition for perform PREP_ADJUST_FRM
         on changed frame height after formatting the printing area.
2004/11/29 12:57:22 od 1.51.4.1: #i35143# <SwPageFrm::MakeAll()> - assure correct page height in online view.
2004-12-23 09:06:35 +00:00
Oliver Bolte
6be178a07b INTEGRATION: CWS swqbugfixes09 (1.49.108); FILE MERGED
2004/11/09 13:10:14 od 1.49.108.3: #i26945# - merge fix of issue i34730
2004/11/02 11:46:56 od 1.49.108.2: #i23129#,#i36347# - no format of upper Writer fly frame
2004/11/01 08:39:06 od 1.49.108.1: #i36347# - no format of upper Writer fly frame, if its anchored
	   at-paragraph|at-character and one of its lowers is in its format
2004-11-16 14:44:27 +00:00
Jens-Heiner Rechtien
373da3a93f INTEGRATION: CWS swqbugfixes08 (1.49.84); FILE MERGED
2004/09/29 09:18:08 od 1.49.84.1: #i34730# <SwCntntFrm::MakeAll()> - force a format, if due to a 'MakePrtArea'
         the frame height changes.
2004-11-09 12:46:54 +00:00
Kurt Zenker
f4f1a47f5e INTEGRATION: CWS swobjpos04 (1.45.30); FILE MERGED
2004/07/13 01:34:24 od 1.45.30.6: RESYNC: (1.45-1.48); FILE MERGED
2004/07/02 14:58:21 od 1.45.30.5: #i28701# - further adjustments for the new object positioning
2004/06/30 15:04:54 od 1.45.30.4: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 08:54:04 od 1.45.30.3: #i28701# - correct comment
2004/05/24 13:04:22 od 1.45.30.2: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004/05/07 15:31:32 od 1.45.30.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:07:59 +00:00
Hans-Joachim Lankenau
26e47d37ba INTEGRATION: CWS swdrawpositioning (1.43.6); FILE MERGED
2004/05/04 06:18:20 od 1.43.6.3: RESYNC: (1.44-1.45); FILE MERGED
2004/04/08 09:19:36 od 1.43.6.2: RESYNC: (1.43-1.44); FILE MERGED
2004/04/07 12:07:02 od 1.43.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
2004-06-28 12:38:09 +00:00
Hans-Joachim Lankenau
e997b7f060 INTEGRATION: CWS swqbugfixes01 (1.45.44); FILE MERGED
2004/06/04 10:41:40 od 1.45.44.2: RESYNC: (1.45-1.46); FILE MERGED
2004/05/26 15:25:40 od 1.45.44.1: #i25904# <SwCntntFrm::ShouldBwdMoved(..)> - do *not* move backward frame,
	 if it has to wrap around objects and its *no* space left in the
	 proposed new upper frame.
2004-06-28 11:59:21 +00:00
Oliver Bolte
62065921ca INTEGRATION: CWS tableintable (1.42.68); FILE MERGED
2004/05/17 13:20:01 fme 1.42.68.4: RESYNC: (1.42-1.45); FILE MERGED
2004/03/02 08:10:23 fme 1.42.68.3: #i25679# Feature - Table in table
2004/02/26 15:55:56 fme 1.42.68.2: #i25679# Feature - Table in table
2004/02/20 13:29:33 fme 1.42.68.1: #i25679# Feature - Table in table
2004-06-01 06:43:32 +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
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
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
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
Rüdiger Timm
b15f4257a6 INTEGRATION: CWS aw003 (1.36.6); FILE MERGED
2003/11/04 16:21:23 aw 1.36.6.6: RESYNC: (1.39-1.40); FILE MERGED
2003/10/23 14:39:27 aw 1.36.6.5: #111111#
Changed GetBoundRect() to GetCurrentBoundRect() and GetLastBoundRect()
2003/10/07 15:01:53 aw 1.36.6.4: RESYNC: (1.38-1.39); FILE MERGED
2003/08/20 11:30:03 aw 1.36.6.3: RESYNC: (1.37-1.38); FILE MERGED
2003/06/30 18:11:09 aw 1.36.6.2: RESYNC: (1.36-1.37); FILE MERGED
2003/06/30 13:38:27 aw 1.36.6.1: #110094#
2003-11-24 15:04:43 +00:00
Rüdiger Timm
b535264c74 INTEGRATION: CWS writerteamqbugs (1.38.52); FILE MERGED
2003/08/22 12:46:18 fme 1.38.52.1: #110448# Calculate correct printing area in online layout
2003-10-30 09:18:24 +00:00
Hans-Joachim Lankenau
75b3f49d2d INTEGRATION: CWS os20 (1.38.96); FILE MERGED
2003/09/12 14:05:47 fme 1.38.96.2: #111937# Keep attribute, widows and orphans in balanced sections - made fix safer
2003/09/12 12:27:15 fme 1.38.96.1: #111937# Keep attribute, widows and orphans in balanced sections
2003-09-25 09:49:15 +00:00
Vladimir Glazounov
e6c391feac INTEGRATION: CWS sw023 (1.37.40); FILE MERGED
2003/07/16 12:53:48 fme 1.37.40.1: #i16930# Set frame height to zero and move it to next page did not wirk correctly
2003-07-21 09:30:47 +00:00
Vladimir Glazounov
76263bb71e INTEGRATION: CWS dvo002 (1.36.68); FILE MERGED
2003/06/23 07:43:02 fme 1.36.68.1: #110369# _WouldFit should use IsKeep instead of checking the keep attribute directly
2003-06-25 09:49:15 +00:00
Vladimir Glazounov
9ed4cc4545 INTEGRATION: CWS sw011 (1.33.2.2.66); FILE MERGED
2003/04/11 13:17:56 od 1.33.2.2.66.2: #108824# <SwCntntFrm::_WouldFit(..)> - warning and return TRUE, if last follow of <this> isn't valid on checking next for keep attribute
2003/04/07 10:35:15 od 1.33.2.2.66.1: #108446# <SwCntntFrm::MakeAll()> - direct move forward after text formatting, if text formatting detects the necessity of the move forward
2003-04-17 15:06:21 +00:00
Vladimir Glazounov
6e4f267bcc INTEGRATION: CWS os8 (1.33.2.2.58); FILE MERGED
2003/04/03 07:10:54 os 1.33.2.2.58.1: #108583# precompiled headers removed
2003-04-17 13:10:41 +00:00
Jens-Heiner Rechtien
70de0c38fd MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 14:45:43 +00:00
Oliver Düsterhoff
388fb4dd9f #104840# SwCntntFrm::MakeAll() - special <MoveFwd(..)> for footnote content 2002-11-11 08:40:33 +00:00
Oliver Düsterhoff
865649b442 #97265# SwPageFrm::MakeAll() - consider invalid body frame properties 2002-11-01 10:36:31 +00:00
Oliver Düsterhoff
7c071cd740 #103517#: adjust SwSrn::MakePos() 2002-10-17 13:10:00 +00:00
Frank Meies
f6a93b135b #103463# Wrong call of grow for undersized frames 2002-09-24 07:09:13 +00:00
Frank Meies
aee75822f8 #100699# JoinFrm has to be called before hiding a master frame 2002-09-20 06:00:56 +00:00
Andreas Martens
0f07a05ef8 Fix #99066#: Autopos. frame in columned section 2002-09-13 11:13:06 +00:00
Frank Meies
9ae8cd7f0b #98399# Wrong calculation of first line indent in RTL environment 2002-08-26 06:54:52 +00:00
Andreas Martens
5b9f7a26a5 Fix #100979#: Fly frames in footer 2002-08-19 10:10:10 +00:00
Andreas Martens
55e46da169 Fix #102271#: Keep in fly frames 2002-08-19 08:57:30 +00:00
Andreas Martens
8a44fa70e5 Fix #99268#: Fly in footer 2002-05-24 08:23:07 +00:00
Andreas Martens
63f0603302 Fix #98953#i3691#: Keep attribute during initial formatting 2002-04-25 07:39:08 +00:00
Andreas Martens
d28730c892 Fix #96678#: Tables with CTL text directions 2002-02-15 08:33:58 +00:00