Commit Graph

80 Commits

Author SHA1 Message Date
Jens-Heiner Rechtien
ddef078fea INTEGRATION: CWS swwarnings (1.76.100); FILE MERGED
2007/09/24 07:03:53 os 1.76.100.8: RESYNC: (1.78-1.79); FILE MERGED
2007/05/29 11:34:48 os 1.76.100.7: RESYNC: (1.77-1.78); FILE MERGED
2007/04/13 11:15:17 tl 1.76.100.6: #i69287# warning-free code
2007/04/11 10:40:08 os 1.76.100.5: RESYNC: (1.76-1.77); FILE MERGED
2007/04/03 13:00:01 tl 1.76.100.4: #i69287# warning-free code
2007/03/08 08:24:02 fme 1.76.100.3: #i69287# Warning free code
2007/03/05 12:45:31 tl 1.76.100.2: #i69287# warning-free code
2007/02/22 15:06:37 tl 1.76.100.1: #i69287# warning-free code
2007-09-27 08:07:36 +00:00
Vladimir Glazounov
648a41cbd4 INTEGRATION: CWS loopcontrol (1.78.178); FILE MERGED
2007/09/05 08:14:24 fme 1.78.178.1: #i81146# Implement various loop controls
2007-09-20 10:50:21 +00:00
Ivo Hinkelmann
92cb23317b INTEGRATION: CWS fwk64 (1.76.78); FILE MERGED
2007/03/25 16:25:28 mav 1.76.78.2: RESYNC: (1.76-1.77); FILE MERGED
2007/03/20 10:37:19 mav 1.76.78.1: #107330# use the calculated size for the embedded object visual area size
2007-04-19 08:14:46 +00:00
Vladimir Glazounov
6c48b6d569 INTEGRATION: CWS swnewtable (1.74.14); FILE MERGED
2007/01/09 10:48:11 fme 1.74.14.10: RESYNC: (1.75-1.76); FILE MERGED
2006/12/05 14:55:22 fme 1.74.14.9: #i4032 New table concept
2006/11/21 09:51:54 fme 1.74.14.8: RESYNC: (1.74-1.75); FILE MERGED
2006/11/03 15:15:58 fme 1.74.14.7: #i4032# New table concept
2006/11/02 16:04:07 fme 1.74.14.6: #i4032# New table concept
2006/10/27 13:16:22 fme 1.74.14.5: #i4032#: New table concept
2006/10/26 14:26:33 fme 1.74.14.4: #i4032#: New table concept
2006/10/17 10:10:38 fme 1.74.14.3: #i4032#: New table concept
2006/10/16 14:36:39 fme 1.74.14.2: #i4032#: New table concept
2006/10/13 11:28:07 fme 1.74.14.1: #i4032#: New table concept
2007-02-28 14:50:10 +00:00
Jens-Heiner Rechtien
7a698b2958 INTEGRATION: CWS smarttags (1.75.82); FILE MERGED
2006/12/21 10:43:05 jakob_lechner 1.75.82.1: #i72705#: support for smarttags
2007-01-02 15:49:39 +00:00
Oliver Bolte
36a2ed88f5 INTEGRATION: CWS swqbf87 (1.72.42); FILE MERGED
2006/10/05 11:04:55 od 1.72.42.2: RESYNC: (1.72-1.74); FILE MERGED
2006/09/25 14:29:27 od 1.72.42.1: #b6448963# method <SwCntntFrm::Cut()>
	   - prevent delete of <ColLocked> upper footnote frame.
2006-10-13 11:20:12 +00:00
Oliver Bolte
beec6100c8 INTEGRATION: CWS pchfix02 (1.72.2); FILE MERGED
2006/09/01 17:51:54 kaib 1.72.2.1: #i68856# Added header markers and pch files
2006-09-16 20:25:26 +00:00
Oliver Bolte
9adc73646d INTEGRATION: CWS swqbf81 (1.71.48); FILE MERGED
2006/08/21 11:10:53 od 1.71.48.2: RESYNC: (1.71-1.72); FILE MERGED
2006/08/21 07:35:44 od 1.71.48.1: #i68520# - performance provement:
	   - introduce cache for bounding rectangle in class <SwAnchoredObject>
2006-09-15 10:42:56 +00:00
Jens-Heiner Rechtien
90574df80f INTEGRATION: CWS writercorehandoff (1.63.172); FILE MERGED
2006/07/27 14:46:59 fme 1.63.172.14: RESYNC: (1.69-1.71); FILE MERGED
2006/05/08 11:21:13 fme 1.63.172.13: #i50348# Make SwDoc accessible via interfaces
2006/04/28 13:33:52 fme 1.63.172.12: RESYNC: (1.68-1.69); FILE MERGED
2006/03/17 08:12:13 tra 1.63.172.11: RESYNC: (1.66-1.68); FILE MERGED
2005/12/20 15:14:02 tra 1.63.172.10: RESYNC: (1.65-1.66); FILE MERGED
2005/10/25 08:34:42 tra 1.63.172.9: RESYNC: (1.64-1.65); FILE MERGED
2005/09/13 14:15:48 tra 1.63.172.8: RESYNC: (1.63-1.64); FILE MERGED
2005/07/14 05:01:22 fme 1.63.172.7: #i50348# Make SwDoc accessible via interfaces
2005/07/12 11:21:36 tra 1.63.172.6: #i50348#make SwDoc interface based
2005/07/11 05:11:40 tra 1.63.172.5: #i50348#make SwDoc interface based
2005/07/05 08:12:52 tra 1.63.172.4: #i50348#make SwDoc interface based
2005/06/24 11:43:32 fme 1.63.172.3: #i50348# Make SwDoc accessible via interfaces
2005/06/07 14:14:09 fme 1.63.172.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:27:48 tra 1.63.172.1: Unnecessary includes removed #i50348#
2006-08-14 15:30:17 +00:00
Oliver Bolte
284dd368a4 INTEGRATION: CWS wordcountopt (1.68.122); FILE MERGED
2006/05/03 07:39:15 fme 1.68.122.2: RESYNC: (1.68-1.69); FILE MERGED
2006/05/02 08:33:20 fme 1.68.122.1: #i64985# Word count should be done during idle time
2006-07-10 14:30:27 +00:00
Vladimir Glazounov
75400111a5 INTEGRATION: CWS swqbf64 (1.69.16); FILE MERGED
2006/05/17 11:12:05 od 1.69.16.1: #i65250# <SwFrm::mnFrmId> now in general available
2006-06-02 11:12:52 +00:00
Kurt Zenker
d89daa3673 INTEGRATION: CWS swqbf58 (1.68.60); FILE MERGED
2006/03/30 06:48:44 fme 1.68.60.1: #b6402837# Check if SvxFrameDirectionItem is set for cell frame before using it
2006-04-26 13:13:24 +00:00
Rüdiger Timm
67f3388b74 INTEGRATION: CWS swqbf53 (1.67.4); FILE MERGED
2006/02/01 14:36:57 od 1.67.4.1: #130797# - correct fix for issue 126020
2006-02-06 15:31:50 +00:00
Jens-Heiner Rechtien
59120af8fe INTEGRATION: CWS swqbf50 (1.66.78); FILE MERGED
2006/01/04 15:55:31 od 1.66.78.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:37:36 +00:00
Rüdiger Timm
e95c9e7046 INTEGRATION: CWS swnumtree (1.63.182); FILE MERGED
2005/10/26 11:06:13 od 1.63.182.3: RESYNC: (1.64-1.65); FILE MERGED
2005/09/13 21:21:42 hbrinkm 1.63.182.2: RESYNC: (1.63-1.64); FILE MERGED
2005/08/19 12:39:52 fme 1.63.182.1: #i51089# SetCompletePaint if numrule is set to paragraph
2005-11-08 16:20:40 +00:00
Jens-Heiner Rechtien
c4af8b0f10 INTEGRATION: CWS swqbf35 (1.63.224); FILE MERGED
2005/09/22 16:20:35 fme 1.63.224.2: RESYNC: (1.63-1.64); FILE MERGED
2005/08/03 13:54:59 fme 1.63.224.1: #i52253# If a cell frame becomes empty in SwCntntFrm::Cut(), trigger the removing of the follow flow line
2005-09-28 10:16:50 +00:00
Rüdiger Timm
c736f6b14d INTEGRATION: CWS ooo19126 (1.63.306); FILE MERGED
2005/09/05 13:40:28 rt 1.63.306.1: #i54170# Change license header: remove SISSL
2005-09-09 03:33:24 +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
Oliver Bolte
d42567087a INTEGRATION: CWS swqbugfixes11 (1.61.40); FILE MERGED
2004/12/20 13:46:27 od 1.61.40.1: #i36991# <SwFrm::ReinitializeFrmSizeAttrFlags()> - be save
2005-01-05 13:30:39 +00:00
Oliver Bolte
da166d5436 INTEGRATION: CWS swqbugfixes09 (1.59.40); FILE MERGED
2004/11/15 14:08:42 od 1.59.40.3: RESYNC: (1.59-1.60); FILE MERGED
2004/11/05 11:58:03 od 1.59.40.2: #23129# <SwLayoutFrm::FormatWidthCols(..)> - decrease optimization
2004/11/02 11:54:14 od 1.59.40.1: #i23129# <SwLayoutFrm::FormatWidthCols(..)> - correct enlargement of section
2004-11-16 14:50:41 +00:00
Jens-Heiner Rechtien
ba623f7d10 INTEGRATION: CWS swqbugfixes08 (1.59.4); FILE MERGED
2004/09/27 13:32:13 od 1.59.4.2: #114344# <SwFrm::Remove()> - inform accessibility API (dispose table, the
         frame is in), before the frame is 'removed from the layout' and
         only for cell frames and row frames.
2004/09/23 09:23:58 od 1.59.4.1: #i33751# method <SwPageFrm& SwAnchoredObject::GetPageFrmOfAnchor()> is replaced
         by method <SwPageFrm* SwAnchoredObject::FindPageFrmOfAnchor()>
2004-11-09 12:48:15 +00:00
Oliver Bolte
dd8166d64f INTEGRATION: CWS swqbugfixes06 (1.58.6); FILE MERGED
2004/08/25 15:05:20 od 1.58.6.1: #i3317# <SwLayoutFrm::FormatWidthCols(..)> - reset temporary application of
        straightforward positioning process of objects inside the layout frame.
2004-09-09 09:58:53 +00:00
Kurt Zenker
0e1cb1cd73 INTEGRATION: CWS swobjpos04 (1.51.30); FILE MERGED
2004/07/13 01:37:10 od 1.51.30.6: RESYNC: (1.51-1.56); FILE MERGED
resolve merge conflicts.
2004/07/12 08:15:43 od 1.51.30.5: #i28701# - further adjustments for the new object positioning algorithm
2004/07/02 14:58:30 od 1.51.30.4: #i28701# - further adjustments for the new object positioning
2004/06/30 15:05:01 od 1.51.30.3: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/05/24 13:25:07 od 1.51.30.2: #i28701# - usage of new class <SwSortedObjs>
         - adjustments for the new positioning of floating screen objects
2004/05/07 15:31:44 od 1.51.30.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:13:55 +00:00
Jens-Heiner Rechtien
01543c9775 INTEGRATION: CWS swqbugfixes04 (1.56.20); FILE MERGED
2004/07/22 13:04:20 fme 1.56.20.3: #i10826# Keep - sections - footnotes - One of the most evil combinations
2004/07/19 08:26:21 fme 1.56.20.2: #i27399# Automatic width of columns - consider gutter calculation in FormatWidthCols
2004/07/16 12:23:07 od 1.56.20.1: #i26250# - Consider lower spacing of table in a table cell, if table is
	   the last content and corresponding document compatibility
	   option is ON
2004-08-02 12:08:20 +00:00
Kurt Zenker
d6cf40d696 INTEGRATION: CWS swqbugfixes02 (1.52.18); FILE MERGED
2004/06/16 19:18:59 fme 1.52.18.2: RESYNC: (1.52-1.53); FILE MERGED
2004/06/10 09:32:30 fme 1.52.18.1: #i30006# #i29771# Splitting table rows - fallback to old behaviour if something went wrong
2004-06-29 07:31:25 +00:00
Hans-Joachim Lankenau
9f80f46a3e INTEGRATION: CWS swdrawpositioning (1.48.6); FILE MERGED
2004/05/04 06:19:03 od 1.48.6.4: RESYNC: (1.50-1.51); FILE MERGED
2004/04/14 07:03:43 od 1.48.6.3: #i26791# - adjustments for the unification of the positioning of Writer
	   fly frames and drawing objects.
2004/04/08 09:21:51 od 1.48.6.2: RESYNC: (1.48-1.50); FILE MERGED
2004/04/07 12:07:15 od 1.48.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
2004-06-28 12:42:06 +00:00
Hans-Joachim Lankenau
8fd3b69e5b INTEGRATION: CWS swqbugfixes01 (1.51.44); FILE MERGED
2004/06/04 10:44:20 od 1.51.44.3: RESYNC: (1.51-1.52); FILE MERGED
2004/06/03 07:57:18 fme 1.51.44.2: #i29438# Table at end of section with columns - do not split table row if section does not have a reasonable height
2004/06/02 10:08:04 od 1.51.44.1: #i22922# <SwCntntFrm::Paste(..) - add assertion, which assures that the
	 sibling is a flow frame.
2004-06-28 12:10:50 +00:00
Oliver Bolte
9f22ba8d97 INTEGRATION: CWS fmebugs02 (1.50.8); FILE MERGED
2004/05/24 12:20:01 fme 1.50.8.4: #i29438# Incomplete fix. Undo
2004/05/24 12:03:39 fme 1.50.8.3: #i29438# Condition ContaintCntnt changed to ContainsAny on check for zombie section due to table frames without content
2004/05/24 07:46:59 fme 1.50.8.2: RESYNC: (1.50-1.51); FILE MERGED
2004/04/19 11:39:09 fme 1.50.8.1: #i27145# Invalidate printing area of frame behind section frame during PasteTree to get correct upper distance
2004-06-04 07:46:01 +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
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
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
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
Jens-Heiner Rechtien
f0f866427a INTEGRATION: CWS swmergeborders (1.47.38); FILE MERGED
2004/02/27 13:06:53 od 1.47.38.2: #i25029# - complete invalidation due to option 'Merge borders/shadow with
	   next paragraph'
2004/02/26 15:50:26 od 1.47.38.1: #i25029# - adjustments for invalidation due to option 'Merge borders/shadow
	   with next paragraph'
2004-03-09 08:31:17 +00:00
Oliver Bolte
9541d087bb INTEGRATION: CWS cellbreak (1.45.96); FILE MERGED
2003/12/02 08:24:48 fme 1.45.96.5: RESYNC: (1.45-1.46); FILE MERGED
2003/11/24 09:11:08 fme 1.45.96.4: #i2109# Split table rows - Assertion could be triggered, if default for attribute is changed
2003/11/20 08:49:17 fme 1.45.96.3: #i2109# Feature - Table row split - new attribute
2003/11/17 14:46:00 fme 1.45.96.2: #i2109# Split table rows
2003/11/14 10:08:07 fme 1.45.96.1: #i2109# Split table rows
2004-01-13 10:19:49 +00:00
Rüdiger Timm
d6808336cb INTEGRATION: CWS aw003 (1.43.6); FILE MERGED
2003/07/02 10:48:25 aw 1.43.6.3: #110094#
Replaced IsWritreFlyFrame with RTTI version
2003/06/30 18:12:36 aw 1.43.6.2: RESYNC: (1.43-1.45); FILE MERGED
2003/06/30 13:38:34 aw 1.43.6.1: #110094#
2003-11-24 15:08:16 +00:00
Rüdiger Timm
51ec928f18 INTEGRATION: CWS sw016 (1.43.50); FILE MERGED
2003/06/10 11:14:36 dvo 1.43.50.2: #109326# code review: strengthened fix against crashes
2003/06/10 09:47:02 dvo 1.43.50.1: #109326# dispose table when rows/cells are being removed
2003-06-12 06:38:53 +00:00
Vladimir Glazounov
151c95548c INTEGRATION: CWS sw015 (1.43.34); FILE MERGED
2003/05/22 11:10:44 fme 1.43.34.2: #109722# Sorry, wrong bug id
2003/05/22 11:08:35 fme 1.43.34.1: #109772# Footer invalidation should take place if content frame shrinks, unless it overlaps with fly frames
2003-06-10 12:18:50 +00:00
Vladimir Glazounov
ebadf0b8ec INTEGRATION: CWS sw011 (1.38.2.2.26); FILE MERGED
2003/04/11 13:23:05 od 1.38.2.2.26.3: #108824# <SwLayoutFrm::FormatWidthCols(..)> - allow text frame follow formatting
2003/04/11 07:06:46 fme 1.38.2.2.26.2: #108619# #108745# Fly frames and footer loops
2003/04/07 10:50:52 od 1.38.2.2.26.1: #108446# <SwLayoutFrm::FormatWidthCols(..) - improvement/correction ; include changes from 108339
2003-04-17 15:34:39 +00:00
Vladimir Glazounov
ad82756171 INTEGRATION: CWS os8 (1.38.2.2.20); FILE MERGED
2003/04/03 07:11:06 os 1.38.2.2.20.1: #108583# precompiled headers removed
2003-04-17 13:16:40 +00:00
Vladimir Glazounov
c3f6999c11 INTEGRATION: CWS sw009 (1.38.2.1.44); FILE MERGED
2003/04/03 10:39:12 hbrinkm 1.38.2.1.44.2: RESYNC: (1.38.2.1-1.38.2.2); FILE MERGED
2003/03/17 12:26:20 od 1.38.2.1.44.1: #i11760# <SwLayoutFrm::FormatWidthCols(..)> - adjust method call <CalcCntnt(..)> to avoid follow format of text frames
2003-04-17 09:12:48 +00:00
Vladimir Glazounov
9d96175620 INTEGRATION: CWS dbgmacros1 (1.38.2.2.28); FILE MERGED
2003/04/10 09:01:18 kso 1.38.2.2.28.1: #108413# - debug macro unification.
2003-04-15 15:52:29 +00:00
Jens-Heiner Rechtien
70de0c38fd MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 14:45:43 +00:00
Frank Meies
5eccff1684 #105909# Page margins in RTL layout 2002-12-09 09:37:57 +00:00
Andreas Martens
90c715fb74 Fix #104737#: Right to left for header and footer 2002-11-15 15:07:05 +00:00
Frank Meies
f7a3aa846f #104611# ChgSize should invalidate frame if Grow or Shrink did not succeed 2002-11-11 12:13:28 +00:00
Frank Meies
bce16ba91d #104611# SwFrm::ChgSize should not invalidate upper frame if called from AdjustColumns 2002-11-06 12:04:30 +00:00
Oliver Düsterhoff
8ac02430df #97265# SwLayoutFrm::ChgLowersProp - differentiate assertion 2002-11-05 14:39:56 +00:00
Oliver Düsterhoff
990fbbff9b #97265# SwFrm::ChgSize(..) - no grow/shrink of cell/column frame; SwLayoutFrm::ChgLowersProp - several corrections 2002-11-01 10:34:29 +00:00
Oliver Düsterhoff
e2b47ca3b7 #103517# - correct SwLayoutFrm::Paste(..) 2002-10-24 08:42:37 +00:00
Oliver Düsterhoff
9fe0f2e2ae #102211# - SwLayoutFrm::ChgLowersProp(..) don't adjust height of header/footer; delete unused code for not supporting vertical layout 2002-10-10 06:57:29 +00:00