Commit Graph

899 Commits

Author SHA1 Message Date
Rüdiger Timm
7b050a906d INTEGRATION: CWS hr18 (1.89.38); FILE MERGED
2005/08/10 11:14:44 hr 1.89.38.1: #i53154#: SwTabFrmPainter::PaintLines(): prevent comparison of STL iterators over different containers
2005-09-05 07:53:08 +00:00
Kurt Zenker
dd5bb70437 INTEGRATION: CWS swqbf37 (1.88.202); FILE MERGED
2005/07/04 11:19:33 od 1.88.202.1: #123196# - add global variable <pSpecSubsLines> to the handling of
	   class <SwSavePaintStatics>
2005-07-12 10:42:22 +00:00
Oliver Bolte
d7b1ae0ee2 INTEGRATION: CWS swqbf34 (1.44.142); FILE MERGED
2005/06/28 12:09:41 od 1.44.142.1: #123110# <SwRootFrm::GetNextPrevCntntPos(..)>
         - disable creation of an action by a callback event.
2005-07-08 10:04:45 +00:00
Oliver Bolte
6e24dc6626 INTEGRATION: CWS swqbf34 (1.76.102); FILE MERGED
2005/06/28 12:13:22 od 1.76.102.2: #123274# <SwTabFrm::CalcFlyOffsets(..)> - tables doesn't wrap around
         Writer fly frames, which are anchored inside another frame.
         Exception: the table itself is a content of this frame.
2005/06/28 10:06:53 od 1.76.102.1: #i46941# - assure that anchor text frame is valid before formatting
           its anchored objects
2005-07-08 10:04:31 +00:00
Oliver Bolte
7adc699099 INTEGRATION: CWS swqbf34 (1.12.96); FILE MERGED
2005/06/28 12:21:35 od 1.12.96.2: #i49987# Object positioning algorithm
         - On marking anchor text frames to move forward on a certain page
           consider that the anchor text frame could already been marked.
2005/06/28 08:45:46 od 1.12.96.1: #i49605# <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()>
         - consider that parent section frame could move forward by the
           format of its previous frames.
2005-07-08 10:04:17 +00:00
Oliver Bolte
7d887b119e INTEGRATION: CWS swqbf34 (1.19.630); FILE MERGED
2005/06/27 13:27:22 fme 1.19.630.1: #123067# Handle case that there is only one (hidden) section in the document
2005-07-08 10:03:57 +00:00
Oliver Bolte
1c08d5d7d5 INTEGRATION: CWS swqbf34 (1.19.144); FILE MERGED
2005/06/28 10:05:02 od 1.19.144.1: #i46941# - assure that anchor text frame is valid before formatting
           its anchored objects
2005-07-08 10:03:40 +00:00
Oliver Bolte
645d80c00c INTEGRATION: CWS swqbf34 (1.80.86); FILE MERGED
2005/06/28 07:55:14 od 1.80.86.1: #121888# <SwFrmNotify::~SwFrmNotify()>
         - skip empty section for the invalidation of the next frame
2005-07-08 10:03:26 +00:00
Oliver Bolte
ddd55aff06 INTEGRATION: CWS swqbf34 (1.47.142); FILE MERGED
2005/06/28 12:31:50 od 1.47.142.1: #i50356# - on format of at-paragrapgh/at-character anchored object format
           the anchor frame, which contains the anchor position, instead
           of the master anchor frame.
2005-07-08 10:03:10 +00:00
Oliver Bolte
019bf5aa86 INTEGRATION: CWS swqbf34 (1.67.140); FILE MERGED
2005/06/28 08:36:57 od 1.67.140.1: #i43737# <CalcCntnt(..)> - no invalidation of anchored objects needed.
2005-07-08 10:02:56 +00:00
Oliver Bolte
5a24c2cd70 INTEGRATION: CWS swqbf34 (1.11.144); FILE MERGED
2005/06/28 12:30:22 od 1.11.144.2: #i50356# - on format of at-paragrapgh/at-character anchored object format
           the anchor frame, which contains the anchor position, instead
           of the master anchor frame.
2005/06/28 09:00:32 od 1.11.144.1: #i45952# <SwAnchoredDrawObject::_SetPositioningAttr()> - indicate at
         frame format that positioning attributes are set.
2005-07-08 10:02:43 +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
Oliver Bolte
5f6742c820 INTEGRATION: CWS swqbugfixes27 (1.78.28); FILE MERGED
2005/04/15 08:42:30 od 1.78.28.1: #i47458# - <SwLayNotify::~SwLayNotify()> - refine condition to force
           unlock of object positions, introduced by issue i44016
2005-04-20 11:17:18 +00:00
Oliver Bolte
a0fe57f49c INTEGRATION: CWS swqbugfixes26 (1.10.20); FILE MERGED
2005/04/13 12:05:25 od 1.10.20.1: #i47014# <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()>
	 - no format of section and previous columns for follow
	   text frames.
2005-04-18 13:28:28 +00:00
Oliver Bolte
915184562a INTEGRATION: CWS swqbugfixes25 (1.10.14); FILE MERGED
2005/04/12 08:14:54 od 1.10.14.1: #i43255# <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()>
	 - forbid format of follow of anchor text frame, only if
	   anchor text frame is in a table.
2005-04-18 10:29:57 +00:00
Oliver Bolte
750e412167 INTEGRATION: CWS swqbugfixes25 (1.78.14); FILE MERGED
2005/04/12 08:13:28 od 1.78.14.1: #i43255# <SwCntntNotify::~SwCntntNotify()>
	 - insert code from <SwTxtFrm::Format(..)> to invalidate
	   at-character anchored objects due to a change of its
	   anchor character.
2005-04-18 10:29:43 +00:00
Oliver Bolte
b09fd9be03 INTEGRATION: CWS visibility03 (1.53.118); FILE MERGED
2005/04/01 16:59:04 mhu 1.53.118.1: #i45006# Replaced includes svtools/sbx*.hxx with basic/sbx*.hxx
2005-04-13 08:42:37 +00:00
Oliver Bolte
d0126eeaa6 INTEGRATION: CWS swqbugfixes21 (1.74.2); FILE MERGED
2005/04/06 13:40:05 od 1.74.2.1: #i46807# <SwTabFrm::CalcFlyOffsets(..)> - do not consider invalid
	 Writer fly frames.
2005-04-12 11:06:20 +00:00
Oliver Bolte
3f35b7a300 INTEGRATION: CWS swqbugfixes21 (1.50.24); FILE MERGED
2005/04/06 13:35:52 od 1.50.24.1: #i46708# <SwLayAction::InternalAction(..)> - interrupt formatting:
	 - adjustment to avoid layout loop.
2005-04-12 11:05:59 +00:00
Jens-Heiner Rechtien
60959d0d87 INTEGRATION: CWS swqbugfixes20 (1.73.10); FILE MERGED
2005/04/01 11:46:20 fme 1.73.10.1: #i46450# Do not ask for master frame if we are currently in a JoinFrm() situation
2005-04-06 08:38:36 +00:00
Rüdiger Timm
f4b570828d INTEGRATION: CWS swqod04 (1.73.4); FILE MERGED
2005/03/30 15:19:15 od 1.73.4.1: #i43913# - correct usage of method <lcl_InnerCalcLayout(..)>
	 - <SwTabFrm::MakeAll()> - lock follow table on format of its
	   content
2005-04-01 15:36:25 +00:00
Rüdiger Timm
8f55b26802 INTEGRATION: CWS swqod04 (1.4.160); FILE MERGED
2005/03/30 15:20:51 od 1.4.160.1: #i43913# - correction: mark anchor text frame to move forward under
	   all known conditions
2005-04-01 15:36:11 +00:00
Rüdiger Timm
ef735f0736 INTEGRATION: CWS swqod04 (1.9.4); FILE MERGED
2005/03/30 15:20:51 od 1.9.4.1: #i43913# - correction: mark anchor text frame to move forward under
	   all known conditions
2005-04-01 15:35:59 +00:00
Rüdiger Timm
6afbfa6b89 INTEGRATION: CWS swqod04 (1.76.4); FILE MERGED
2005/03/30 15:16:40 od 1.76.4.1: #i43913# - <SwLayNotify::~SwLayNotify()> - refine condition to force
	   unlock of object positions, introduced by issue i44016
	 - merge fix for i45180
2005-04-01 15:35:46 +00:00
Rüdiger Timm
4518bf1c9a INTEGRATION: CWS swqod04 (1.41.4); FILE MERGED
2005/03/30 15:13:09 od 1.41.4.1: #i43913# <CalcClipRect(..)> - consider, that table cell can exceed its
	 upper printing bottom
2005-04-01 15:35:32 +00:00
Rüdiger Timm
3024469420 INTEGRATION: CWS swqbugfixes18 (1.74.128); FILE MERGED
2005/03/21 16:03:34 od 1.74.128.1: #i45180# <SwFlyNotify::~SwFlyNotify()>
	 - no adjustment of layout process flags and further notifications/invalidations,
	   if format is called by grow/shrink
2005-03-30 09:53:33 +00:00
Rüdiger Timm
6f79f9c9d7 INTEGRATION: CWS swqbugfixes18 (1.11.58); FILE MERGED
2005/03/15 11:51:48 fme 1.11.58.1: #i45019# Do not search for cell frame if object is anchored to page frame
2005-03-30 09:53:19 +00:00
Vladimir Glazounov
af22d26323 INTEGRATION: CWS swqbugfixes17 (1.72.2); FILE MERGED
2005/03/14 13:01:13 fme 1.72.2.1: #i44978# Crash due to 0 pointer access
2005-03-23 12:00:57 +00:00
Vladimir Glazounov
c6a8337075 INTEGRATION: CWS swqbugfixes17 (1.8.110); FILE MERGED
2005/03/08 14:31:42 od 1.8.110.1: #44049# methods <SwObjectFormatterTxtFrm::DoFormatObj(..)> and
	<SwObjectFormatterTxtFrm::DoFormatObj(..)>
	- if anchored objects has cleared environment, consider that
	  anchor frame is already marked to move forward.
	method <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveFwd()>
	- avoid format of anchor frame and following frames during format of
	  parent section and previous columns.
2005-03-23 12:00:38 +00:00
Vladimir Glazounov
afa0f82172 INTEGRATION: CWS swqbugfixes17 (1.18.380); FILE MERGED
2005/03/03 12:02:14 od 1.18.380.1: #i43771# <SwHeadFootFrm::FormatSize(..)> - format also objects anchored
	 at text frames.
2005-03-23 12:00:14 +00:00
Vladimir Glazounov
baf88ec5c3 INTEGRATION: CWS swqbugfixes17 (1.74.106); FILE MERGED
2005/03/11 14:38:08 od 1.74.106.3: #i44016# <SwLayNotify::~SwLayNotify()> - force unlock of position of
	 lower objects by method <NotifyLowerObjs(..)>
2005/03/08 14:25:59 od 1.74.106.2: #i44049# <SwCntntNotify::~SwCntntNotify()> - invalidate anchored objects, if
         position has changed - moved from <SwCntntFrm::MakeAll(..)> to this method.
2005/03/04 08:12:25 od 1.74.106.1: #b6234250# <GetFrmOfModify(..)> - format parent Writer fly frame. if
	   it isn't formatted yet and if a format of the frame is requested.
2005-03-23 11:59:57 +00:00
Vladimir Glazounov
c0f50e19ef INTEGRATION: CWS swqbugfixes17 (1.40.34); FILE MERGED
2005/03/03 12:00:46 od 1.40.34.1: #i43771# class <SwFlyFreeFrm> - implementation of overloaded method <IsFormatPossible()>
2005-03-23 11:59:40 +00:00
Vladimir Glazounov
f367ecf064 INTEGRATION: CWS swqbugfixes17 (1.66.154); FILE MERGED
2005/03/11 14:36:21 od 1.66.154.2: #i44016# <SwLayoutFrm::NotifyLowerObjs(..)> - consider new parameter <_bUnlockPosOfObjs>
2005/03/08 14:27:37 od 1.66.154.1: #i44049# <CalcCntnt(..)> - refine condition to restart with previous invalid frame.
2005-03-23 11:59:23 +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
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
28a1beeed7 INTEGRATION: CWS swqbugfixes17 (1.11.18); FILE MERGED
2005/03/08 09:19:33 od 1.11.18.1: #i44339# methods of classes <SwAnchoredObject> and <SwAnchoredDrawObject>
	 - include code to increase its savety.
2005-03-23 11:58:31 +00:00
Vladimir Glazounov
9a7897db90 INTEGRATION: CWS swqbugfixes17 (1.9.154); FILE MERGED
2005/03/11 11:50:12 od 1.9.154.3: #i44334#, #i44681# - set positioning attributes, if not already set.
		   - convert positioning attributes, if position is
		     in horizontal-left-to-right-layout
2005/03/09 15:14:44 od 1.9.154.2: #i44559# <SwAnchoredDrawObject::InvalidateObjPos()>
	 - on notify of anchor text frame for as-character drawing objects
	   assure, that text hint for the drawing object already exists
2005/03/08 09:19:33 od 1.9.154.1: #i44339# methods of classes <SwAnchoredObject> and <SwAnchoredDrawObject>
	 - include code to increase its savety.
2005-03-23 11:58:15 +00:00
Vladimir Glazounov
dc9248331d INTEGRATION: CWS swqbugfixes16 (1.43.56); FILE MERGED
2005/03/01 11:15:01 fme 1.43.56.1: #i43505# Selection around table should color table cells black
2005-03-23 10:53:58 +00:00
Vladimir Glazounov
8785d17459 INTEGRATION: CWS swqbugfixes16 (1.21.180); FILE MERGED
2005/02/22 15:37:34 od 1.21.180.1: #i43266# <SwLayHelper::CheckPageFlyCache(..)> - assure, that no empty
	 page is returned.
2005-03-23 10:53:43 +00:00
Vladimir Glazounov
b9b607c7ef INTEGRATION: CWS swqbugfixes16 (1.74.68); FILE MERGED
2005/03/03 07:38:55 od 1.74.68.1: #i43913# - <lcl_RemoveObjsFromPage(..)> - reset layout process booleans
	   at anchored object.
2005-03-23 10:53:28 +00:00
Vladimir Glazounov
ceca4688b1 INTEGRATION: CWS swqbugfixes16 (1.46.68); FILE MERGED
2005/02/22 13:35:05 od 1.46.68.1: #i43255# positioning of anchored objects
	 - refine condition, if anchor frame has to be formatted.
2005-03-23 10:53:12 +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
Vladimir Glazounov
b8e2de5e8c INTEGRATION: CWS swqbugfixes16 (1.10.76); FILE MERGED
2005/03/03 08:42:33 od 1.10.76.3: RESYNC: (1.10-1.11); FILE MERGED
2005/03/03 07:45:16 od 1.10.76.2: #i43913# <SwAnchoredObject::HasClearedEnvironment()> - layout frame,
	 the vertical position is oriented at, has to be set.
2005/02/22 13:32:19 od 1.10.76.1: #i43255# class <SwAnchoredObject> - implementation of
	 new method <ConsiderObjWrapInfluenceOfOtherObjs()>
2005-03-23 10:52:41 +00:00
Vladimir Glazounov
d3d1b81e84 INTEGRATION: CWS swqbugfixes16 (1.9.128); FILE MERGED
2005/03/01 11:18:44 od 1.9.128.2: #i43255# <SwPosNotify::~SwPosNotify()> - refine condition to notify
	 anchor text frame to avoid unneeded invalidations.
2005/02/22 13:35:05 od 1.9.128.1: #i43255# positioning of anchored objects
	 - refine condition, if anchor frame has to be formatted.
2005-03-23 10:52:27 +00:00
Kurt Zenker
3d1b0e2ee4 INTEGRATION: CWS dbwizard4 (1.48.54); FILE MERGED
2005/03/12 17:59:52 bc 1.48.54.2: RESYNC: (1.48-1.49); FILE MERGED
2005/02/21 15:34:10 od 1.48.54.1: #i37877# method <lcl_FindFirstInvaFly(..)> doesn't consider drawing objects.
	 Thus, method renamed to <lcl_FindFirstInvaObj(..)> and let it
	 consider drawing objects.
2005-03-18 15:12:02 +00:00
Vladimir Glazounov
0bbf92a48b INTEGRATION: CWS swqbugfixes15 (1.71.12); FILE MERGED
2005/02/10 10:27:32 fme 1.71.12.2: #119477# Make sure that after trying to split a table there are not 'empty' follow tables hanging around
2005/02/10 09:20:30 fme 1.71.12.1: #119477# Make sure that after trying to split a table there are not 'empty' follow tables hanging around
2005-03-08 12:44:41 +00:00
Vladimir Glazounov
60e88e79bf INTEGRATION: CWS swqbugfixes15 (1.87.146); FILE MERGED
2005/02/15 08:43:13 od 1.87.146.1: #i42643# - apply optimization to method call <GraphicObject::DrawTiled(..)>
2005-03-08 12:44:15 +00:00
Vladimir Glazounov
aa355eeec8 INTEGRATION: CWS swqbugfixes15 (1.48.34); FILE MERGED
2005/02/15 15:21:46 od 1.48.34.1: #i42586# <SwLayAction::InternalAction(..)> - finish format of current
	 page on interrupt.
2005-03-08 12:43:55 +00:00
Vladimir Glazounov
1d8cab2433 INTEGRATION: CWS swqbugfixes14 (1.62.64); FILE MERGED
2005/01/31 12:54:48 od 1.62.64.1: #i41694# <SwLayoutFrm::ChgLowersProp(..)> - follow-up of issue #i10826#:
	 consider, that special case is also performed for section frames.
2005-02-22 07:20:54 +00:00
Vladimir Glazounov
e0c5596ad5 INTEGRATION: CWS swqbugfixes14 (1.38.4); FILE MERGED
2005/01/28 09:29:56 fme 1.38.4.1: #118572# #i33887# New: Looping Louie (Light) - Tries to solve a desperate situation before Looping Louie takes over
2005-02-22 07:20:38 +00:00