Commit Graph

66 Commits

Author SHA1 Message Date
Jens-Heiner Rechtien
aa9ad7d2b4 INTEGRATION: CWS swwarnings (1.64.222); FILE MERGED
2007/09/07 13:34:21 os 1.64.222.8: DbgLoop only in debug-builds
2007/09/07 13:18:47 os 1.64.222.7: DbgLoop only in NonPro available
2007/08/27 12:26:13 tl 1.64.222.6: #i69287# warning-free code
2007/05/16 06:28:19 os 1.64.222.5: warnings in debug mode removed
2007/04/11 10:41:24 os 1.64.222.4: RESYNC: (1.64-1.65); FILE MERGED
2007/04/03 13:00:09 tl 1.64.222.3: #i69287# warning-free code
2007/03/08 09:51:54 fme 1.64.222.2: #i69287# Warning free code
2007/03/05 12:45:32 tl 1.64.222.1: #i69287# warning-free code
2007-09-27 08:12:24 +00:00
Vladimir Glazounov
11a038e162 INTEGRATION: CWS swnewtable (1.64.14); FILE MERGED
2006/11/03 15:15:58 fme 1.64.14.1: #i4032# New table concept
2007-02-28 14:51:23 +00:00
Oliver Bolte
acfd85b708 INTEGRATION: CWS pchfix02 (1.63.2); FILE MERGED
2006/09/01 17:52:01 kaib 1.63.2.1: #i68856# Added header markers and pch files
2006-09-16 20:33:54 +00:00
Jens-Heiner Rechtien
c34a0ab16a INTEGRATION: CWS writercorehandoff (1.58.48); FILE MERGED
2006/03/17 08:12:56 tra 1.58.48.6: RESYNC: (1.61-1.62); FILE MERGED
2005/12/20 15:14:41 tra 1.58.48.5: RESYNC: (1.60-1.61); FILE MERGED
2005/10/25 08:35:00 tra 1.58.48.4: RESYNC: (1.59-1.60); FILE MERGED
2005/09/13 14:26:47 tra 1.58.48.3: RESYNC: (1.58-1.59); FILE MERGED
2005/06/07 14:14:16 fme 1.58.48.2: #i50348# General cleanup - removed unused header files, functions, members, declarations etc.
2005/06/06 09:27:56 tra 1.58.48.1: Unnecessary includes removed #i50348#
2006-08-14 15:36:13 +00:00
Kurt Zenker
2746dac264 INTEGRATION: CWS swqbf49 (1.61.40); FILE MERGED
2005/12/05 10:44:19 od 1.61.40.1: #i27138# <SwTxtFrm::JoinFrm()> and <SwTxtFrm::SplitFrm(..)
	 - notify accessible paragraphs about changed relation.
2006-02-01 13:25:33 +00:00
Rüdiger Timm
5326bebc66 INTEGRATION: CWS swnumtree (1.58.58); FILE MERGED
2005/10/26 11:06:40 od 1.58.58.3: RESYNC: (1.59-1.60); FILE MERGED
2005/09/13 21:31:32 hbrinkm 1.58.58.2: RESYNC: (1.58-1.59); FILE MERGED
2005/06/22 10:24:58 hbrinkm 1.58.58.1: #i51089# new implementation of numbering
2005-11-08 16:21:36 +00:00
Jens-Heiner Rechtien
4e0dd0617f INTEGRATION: CWS swqbf35 (1.58.104); FILE MERGED
2005/09/22 16:36:41 fme 1.58.104.2: RESYNC: (1.58-1.59); FILE MERGED
2005/07/01 13:56:30 fme 1.58.104.1: #i46560# Start formatting at previous line if reformat position is <= end of first word + 1
2005-09-28 10:18:02 +00:00
Rüdiger Timm
2c158a74f8 INTEGRATION: CWS ooo19126 (1.58.186); FILE MERGED
2005/09/05 13:40:47 rt 1.58.186.1: #i54170# Change license header: remove SISSL
2005-09-09 03:52:01 +00:00
Oliver Bolte
e72e6e48a8 INTEGRATION: CWS thaiblocksatz (1.56.150); FILE MERGED
2005/04/06 06:30:24 fme 1.56.150.1: #i41860# Thai justified alignment needs some more precision to prevent rounding errors
2005-04-18 13:34:09 +00:00
Oliver Bolte
7f824c2868 INTEGRATION: CWS swqbugfixes25 (1.56.180); FILE MERGED
2005/04/12 08:08:17 od 1.56.180.1: #i43255# <SwTxtFrm::Format(..)> - remove code to invalidate at-character
	 anchored objects due to a change of its anchor character.
         This code is moved to <SwCntntNotify::~SwCntntNotify()>
2005-04-18 10:30:17 +00:00
Kurt Zenker
1933a44bc1 INTEGRATION: CWS swqbugfixes12 (1.55.8); FILE MERGED
2005/01/12 09:32:25 od 1.55.8.2: #i40140# <SwTxtFrm::Format(..)> - locking of text frame in updating
	 anchor character for at-character anchored objects no longer
	 needed, because invalidation of at-character anchored objects
	 doesn't invalidate its anchor frame or clears the paragraph
	 portion information of its anchor frame.
2005/01/04 13:57:35 od 1.55.8.1: #118895# <SwTxtFrm::Format(..)> - no check of paragraph portion information
	 for empty paragraph for method call <SwAnchoredObject::CheckCharRectAndTopOfLine(..)>
2005-01-21 09:40:38 +00:00
Vladimir Glazounov
2fabb43574 INTEGRATION: CWS swqbugfixes10 (1.54.4); FILE MERGED
2004/12/03 15:50:42 od 1.54.4.1: #115759# <SwTxtFrm::AdjustFrm(..)> - check for valid lower in table
2004-12-23 09:09:19 +00:00
Oliver Bolte
6db9653096 INTEGRATION: CWS swqbugfixes09 (1.53.72); FILE MERGED
2004/10/29 11:17:18 fme 1.53.72.2: #i29062# Prefer FormatQuick over Format during painting
2004/10/22 09:39:54 fme 1.53.72.1: #i29062# Manually resetting the bInvalidLayout flag results in footnote frames with invalid position
2004-11-16 14:52:09 +00:00
Oliver Bolte
94d3ce3586 INTEGRATION: CWS tune05 (1.49.38); FILE MERGED
2004/07/23 18:21:56 mhu 1.49.38.3: RESYNC: (1.49-1.50); FILE MERGED
2004/06/24 08:44:33 cmc 1.49.38.2: #i30554# IsInProgress not referenced from frmform.cxx anymore
2004/06/23 12:45:51 cmc 1.49.38.1: #i30554# remove unused code inside #ifdef USED guards
2004-08-12 11:34:33 +00:00
Kurt Zenker
1526c0e514 INTEGRATION: CWS swobjpos04 (1.47.54); FILE MERGED
2004/07/13 01:39:11 od 1.47.54.7: RESYNC: (1.48-1.50); FILE MERGED
resolve merge conflicts.
2004/07/02 14:57:48 od 1.47.54.6: #i28701# - further adjustments for the new object positioning
2004/06/30 14:49:20 od 1.47.54.5: #i28701# - merge changes of cws swdrawpositioning
	 - further adjustments for the new object positioning
2004/06/14 09:00:10 od 1.47.54.4: #i28701# - correct comment and type determination
2004/05/24 15:34:30 od 1.47.54.3: RESYNC: (1.47-1.48); FILE MERGED
2004/05/24 12:56:02 od 1.47.54.2: #i28701# - usage of new class <SwSortedObjs>
         - Adjustment for new positioning of floating screen objects
2004/05/07 15:23:46 od 1.47.54.1: #i28701# - usage of new class <SwSortedObjs>
2004-08-02 13:15:06 +00:00
Jens-Heiner Rechtien
ddbdeda348 INTEGRATION: CWS swqbugfixes04 (1.50.20); FILE MERGED
2004/07/22 13:04:21 fme 1.50.20.1: #i10826# Keep - sections - footnotes - One of the most evil combinations
2004-08-02 12:09:01 +00:00
Hans-Joachim Lankenau
31645d70b1 INTEGRATION: CWS swdrawpositioning (1.46.6); FILE MERGED
2004/04/08 09:22:49 od 1.46.6.2: RESYNC: (1.46-1.47); FILE MERGED
2004/04/07 10:49:09 od 1.46.6.1: #i26791# - adjustments for the unification of the positioning of
	   Writer fly frames and drawing objects
2004-06-28 12:43:43 +00:00
Oliver Bolte
9e3c2485c3 INTEGRATION: CWS fmebugs02 (1.47.8); FILE MERGED
2004/05/24 07:48:12 fme 1.47.8.2: RESYNC: (1.47-1.48); FILE MERGED
2004/05/12 05:43:24 fme 1.47.8.1: #116772# Consider master and follow field situation within non-consecutive lines
2004-06-04 07:46:19 +00:00
Rüdiger Timm
5a49210365 INTEGRATION: CWS swqod01 (1.44.42); FILE MERGED
2004/04/28 07:50:15 od 1.44.42.4: RESYNC: (1.46-1.47); FILE MERGED
2004/03/26 11:33:42 od 1.44.42.3: RESYNC: (1.45-1.46); FILE MERGED
2004/03/03 12:35:42 od 1.44.42.2: RESYNC: (1.44-1.45); FILE MERGED
2004/03/03 09:54:37 od 1.44.42.1: #i16128# <SwTxtFrm::FormatAdjust(..)> - call base class method
	 <SwTxtFrmBreak::IsBreakNow(..)> instead of method
	 <WidowsAndOrphans::IsBreakNow(..)> to get a break, even if due
	 to widow rule no enough lines exists.
2004-05-03 13:24:01 +00:00
Rüdiger Timm
6bb99fb160 INTEGRATION: CWS swobjpos05 (1.46.14); FILE MERGED
2004/03/18 13:45:35 od 1.46.14.1: #i11860# method <SwTxtFrm::Format(..)> - call method <_CalcHeightOfLastLine()>
	 at the end of the formatting to calculate and keep the value of
	 the height of the last line.
2004-03-31 14:10:19 +00:00
Jens-Heiner Rechtien
fc8ccfc3a2 INTEGRATION: CWS swobjpos03 (1.41.152); FILE MERGED
2004/02/16 10:00:35 od 1.41.152.3: RESYNC: (1.41-1.44); FILE MERGED
resolve merge conflicts.
2003/11/21 09:43:13 od 1.41.152.2: #113949# <SwTxtFrm::Format(..)> - adjustment for isolated positioning algorithms
#i22341# <SwTxtFrm::Format(..)> - use new method
		<SwFlyAtCntFrm::CheckCharRectAndTopOfLine()>
2003/10/27 13:04:02 od 1.41.152.1: merging changes from swobjpos02
2004-03-08 13:02:57 +00:00
Kurt Zenker
48acc692dc INTEGRATION: CWS hiddentext (1.42.16); FILE MERGED
2004/02/16 08:48:09 fme 1.42.16.6: RESYNC: (1.43-1.44); FILE MERGED
2004/02/10 09:51:23 fme 1.42.16.5: RESYNC: (1.42-1.43); FILE MERGED
2004/01/20 12:13:37 od 1.42.16.4: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/19 10:11:17 od 1.42.16.3: #110582# - adjustments for hiding objects in hidden paragraphs/text
2004/01/16 07:28:25 fme 1.42.16.2: #i23660# Feature - hidden character attribute
2004/01/05 14:35:05 fme 1.42.16.1: #i23660# Feature - Hidden character attribute
2004-02-26 14:31:50 +00:00
Jens-Heiner Rechtien
a0f0c9eb2f INTEGRATION: CWS swobjpos02 (1.41.12); FILE MERGED
2004/01/21 08:45:12 od 1.41.12.4: RESYNC: (1.42-1.43); FILE MERGED
2004/01/13 13:14:36 od 1.41.12.3: RESYNC: (1.41-1.42); FILE MERGED
2003/11/18 11:02:55 od 1.41.12.2: #110978# <SwTxtFrm::Format(..)> - always check Writer fly frame, that
	 are anchored to character.
2003/10/09 15:10:30 od 1.41.12.1: #110978# <SwTxtFrm::Format(..)> - no format of fly frames, but allow invalidation
2004-02-02 17:23:38 +00:00
Oliver Bolte
115f3b4728 INTEGRATION: CWS cellbreak (1.41.22); FILE MERGED
2003/12/02 08:20:29 fme 1.41.22.4: RESYNC: (1.41-1.42); FILE MERGED
2003/11/07 07:24:47 fme 1.41.22.3: #i2109# Feature - Split table rows
2003/10/06 12:53:55 fme 1.41.22.2: #i2109# Feature - Split table rows
2003/09/08 07:47:54 fme 1.41.22.1: #i2109# Feature - Split table rows
2004-01-13 10:20:35 +00:00
Rüdiger Timm
f03b97182a INTEGRATION: CWS aw003 (1.38.6); FILE MERGED
2003/08/20 11:27:26 aw 1.38.6.3: RESYNC: (1.40-1.41); FILE MERGED
2003/06/30 18:09:11 aw 1.38.6.2: RESYNC: (1.38-1.40); FILE MERGED
2003/06/30 13:38:42 aw 1.38.6.1: #110094#
2003-11-24 15:08:43 +00:00
Vladimir Glazounov
6c104a331e INTEGRATION: CWS sw023 (1.40.64); FILE MERGED
2003/07/16 12:54:22 fme 1.40.64.1: #i16930# Set frame height to zero and move it to next page did not wirk correctly
2003-07-21 09:31:12 +00:00
Rüdiger Timm
659f6aeeb3 INTEGRATION: CWS sw016 (1.39.8); FILE MERGED
2003/06/06 09:57:30 fme 1.39.8.1: #109993# Additional reference device needed for prospekt printing
2003-06-12 06:39:03 +00:00
Vladimir Glazounov
fe307b1eb2 INTEGRATION: CWS aig01 (1.38.26); FILE MERGED
2003/05/16 15:02:34 fme 1.38.26.2: #108778# Fly frame and drawing positioning - changes
2003/05/15 15:24:44 fme 1.38.26.1: #108778# Fly frame and drawing positioning
2003-05-22 08:49:09 +00:00
Vladimir Glazounov
5e62462a3a INTEGRATION: CWS sw011 (1.33.2.1.66); FILE MERGED
2003/04/07 10:55:36 od 1.33.2.1.66.1: #108446# <SwTxtFrm::FormatAdjust(..)> - set frame to zero, if it has to move forward, because it has no content and just created a follow; include changes from 108339
2003-04-17 15:40:51 +00:00
Vladimir Glazounov
6bfaa99fd1 INTEGRATION: CWS os8 (1.33.2.1.58); FILE MERGED
2003/04/03 07:11:32 os 1.33.2.1.58.1: #108583# precompiled headers removed
2003-04-17 13:25:52 +00:00
Vladimir Glazounov
d8a2ce4422 INTEGRATION: CWS sw009 (1.33.2.1.44); FILE MERGED
2003/03/27 08:17:12 od 1.33.2.1.44.3: #108181# <SwTxtFrm::FormatAdjust(..)> and <SwTxtFrm::_AdjustFollow(..)> - improve code on join/split frame
2003/03/21 14:15:21 od 1.33.2.1.44.2: #108121# <SwTxtFrm::FormatAdjust(..)> and <SwTxtFrm::_AdjustFollow(..)> - on join/split frame consider, if text frame contains content or has a numbering.
2003/03/17 12:39:06 od 1.33.2.1.44.1: #i11760# <SwTxtFrm::CalcFollow(..)> - intrinsic follow format controlled by new flag <bFollowFormatAllowed> and avoid nested follow format by <SwTxtFrm::CalcFollow(..)>, if follow is contained in column frame
2003-04-17 09:13:01 +00:00
Vladimir Glazounov
fa9616e31d INTEGRATION: CWS dbgmacros1 (1.33.2.1.46); FILE MERGED
2003/04/10 09:01:22 kso 1.33.2.1.46.1: #108413# - debug macro unification.
2003-04-15 15:52:54 +00:00
Jens-Heiner Rechtien
70de0c38fd MWS_SRX644: migrate branch mws_srx644 -> HEAD 2003-03-27 14:45:43 +00:00
Frank Meies
9dc4c1e26d #105315# DropCap selection in RTL environment 2002-11-22 14:58:40 +00:00
Andreas Martens
0f07a05ef8 Fix #99066#: Autopos. frame in columned section 2002-09-13 11:13:06 +00:00
Andreas Martens
b641c5ce5f Fix #98838#: No formatting of cell/tables during the formatting of the content 2002-09-02 14:38:44 +00:00
Oliver Düsterhoff
5102e2b21b #101216# - Don't lock section frame on Frm::Calc of fly frame belonging to text frame. Note: comment changes of revision 1.26 2002-08-22 08:31:20 +00:00
Vladimir Glazounov
0a2ebfe984 #65293# enabled include for product also 2002-05-31 13:27:48 +00:00
Frank Meies
3c2ecdcdaa Fix #99401#: Oops, >= instead of > for offset comparision 2002-05-27 08:27:05 +00:00
Frank Meies
e8d7540e63 Fix #99401#: Follow should not be allowed to calculate fly frames which are anchored at character of the master 2002-05-27 08:12:52 +00:00
Andreas Martens
0a91ef339d Fix #99066#: Don't destroy yourself 2002-05-02 09:27:28 +00:00
Frank Meies
849882c665 #96678# Vertical Formatting - Orbit assertion did not make sense for vertical layout 2002-02-01 07:09:19 +00:00
Andreas Martens
96865ed922 Chg: Helpfunctions for vertical layout 2001-12-13 15:02:36 +00:00
Frank Meies
cfa3f30001 Chg: Vertical Formatting - SplitFrm with unswapped frame 2001-12-05 08:02:00 +00:00
Frank Meies
077b83a0ae Fix #95165#: Do not scroll to end of text 2001-11-23 15:22:09 +00:00
Andreas Martens
4f5b030f17 Fix: Follow cuts footnotes 2001-11-22 15:14:13 +00:00
Frank Meies
6c3ae34e32 Chg: Vertical Formatting - Growing frames 2001-11-20 15:24:54 +00:00
Frank Meies
ed17109b2a Chg: Vertical Formatting - FormatQuick for vertical frames 2001-11-14 10:38:26 +00:00
Frank Meies
cf8e5e46a1 Chg: Vertical Formatting - Adjust repaint rectangle for growing or shrinking frames 2001-10-30 12:47:02 +00:00
Frank Meies
51bf5df2be Chg: Vertical Formatting - Swap macros changed 2001-10-29 10:20:02 +00:00