Commit graph

19669 commits

Author SHA1 Message Date
Jens-Heiner Rechtien
54a2f72190 INTEGRATION: CWS warnings01 (1.14.342); FILE MERGED
2006/05/15 12:30:43 sb 1.14.342.1: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162.
2006-06-19 11:40:00 +00:00
Jens-Heiner Rechtien
b73239f5f2 INTEGRATION: CWS warnings01 (1.3.344); FILE MERGED
2006/05/12 16:42:52 sb 1.3.344.1: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162.
2006-06-19 11:39:45 +00:00
Jens-Heiner Rechtien
59e1651c5b INTEGRATION: CWS warnings01 (1.4.18); FILE MERGED
2006/05/23 16:54:37 sb 1.4.18.2: RESYNC: (1.4-1.5); FILE MERGED
2006/05/12 16:42:52 sb 1.4.18.1: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162.
2006-06-19 11:39:31 +00:00
Jens-Heiner Rechtien
a9b9ab44a6 INTEGRATION: CWS warnings01 (1.4.344); FILE MERGED
2006/05/15 12:30:43 sb 1.4.344.2: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162.
2006/05/12 16:42:52 sb 1.4.344.1: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162.
2006-06-19 11:39:18 +00:00
Vladimir Glazounov
7cf4802b54 INTEGRATION: CWS ause051 (1.12.352); FILE MERGED
2006/05/24 11:57:34 hjs 1.12.352.1: #i65393# fix makefile
2006-06-02 11:50:09 +00:00
Vladimir Glazounov
c17b7ab2ed INTEGRATION: CWS ause051 (1.26.16); FILE MERGED
2006/05/24 11:59:20 hjs 1.26.16.1: #i65393# fix makefile
2006-06-02 11:46:00 +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
Vladimir Glazounov
aeaed2dadc INTEGRATION: CWS swqbf64 (1.22.154); FILE MERGED
2006/05/17 11:10:21 od 1.22.154.1: #i65250# <SwFrm::mnLastFrmId> now in general available.
2006-06-02 11:12:26 +00:00
Vladimir Glazounov
2df6d7e28a INTEGRATION: CWS swqbf64 (1.11.290); FILE MERGED
2006/05/17 11:03:12 od 1.11.290.1: #i65250# class <SwLayouter>
	 - implementation of method <MoveBwdSuppressed(..)> and
	   <ClearMoveBwdLayoutInfo()>
2006-06-02 11:12:09 +00:00
Vladimir Glazounov
af41b7f91f INTEGRATION: CWS swqbf64 (1.54.102); FILE MERGED
2006/05/17 11:06:48 od 1.54.102.1: #i65250# method <SwFlowFrm::MoveBwd(..)>
	 - apply <Move Backward> layout loop control
2006-06-02 11:11:54 +00:00
Vladimir Glazounov
70bbb09596 INTEGRATION: CWS swqbf64 (1.6.336); FILE MERGED
2006/05/19 07:38:12 od 1.6.336.2: #i65250# - correct implementation because of a compiler error under gcc3.4.3
2006/05/17 10:37:46 od 1.6.336.1: #i65250# class <SwLayouter>
	 - extended by methods and data structures for <Move Backward>
	   layout loop control
2006-06-02 11:11:29 +00:00
Vladimir Glazounov
f758fd1f69 INTEGRATION: CWS swqbf64 (1.48.102); FILE MERGED
2006/05/17 10:36:09 od 1.48.102.1: #i65250# class <SwFrm>
	 - member <mnFrmId> now in general available.
2006-06-02 11:11:12 +00:00
Vladimir Glazounov
857f758c52 INTEGRATION: CWS swqbf64 (1.42.146); FILE MERGED
2006/05/17 10:40:07 od 1.42.146.1: #i65250# method <SwDoc::SetModified()>
	 - clear data for <Move Backward> layout actions.
2006-06-02 11:10:50 +00:00
Vladimir Glazounov
9b6711d1f2 INTEGRATION: CWS swqbf63 (1.45.100); FILE MERGED
2006/05/08 11:09:02 od 1.45.100.2: #i61435# method <SwSectionFrm::Format(..)>
	 - no formatting of content of columned section, if upper frame
	   has a height <= 0.
2006/05/08 10:22:52 od 1.45.100.1: #i59789# method <ExtraFormatToPositionObjs::FormatSectionToPositionObjs()
	 - no extra format to position anchored object for too narrow
	   section frame.
2006-05-24 12:55:14 +00:00
Vladimir Glazounov
d0b324e956 INTEGRATION: CWS swqbf63 (1.89.90); FILE MERGED
2006/05/08 11:44:23 od 1.89.90.1: #i61999# method <SwFrmNotify::~SwFrmNotify()>
	 - no invalidation of columned text frame with automatic width.
2006-05-24 12:54:59 +00:00
Vladimir Glazounov
4a15f93417 INTEGRATION: CWS swqbf63 (1.54.100); FILE MERGED
2006/05/17 08:08:10 od 1.54.100.3: #136024# method <SwFlowFrm::MoveBwd(..)>
	 - correct fix of issue i53139
2006/05/09 09:28:47 od 1.54.100.2: #i53139# method <SWFlowFrm::MoveBwd(..)>
	 - Choose correct new upper frame on moving backward in spite of
	   a page/column break to fill-up empty pages/columns.
2006/05/08 12:16:33 od 1.54.100.1: #i58846# method <SwFlowFrm::CutTree(..)>
	 - <SwFrm::Prepare( PREP_QUOVADIS )> only for frames inside footnotes.
2006-05-24 12:54:43 +00:00
Vladimir Glazounov
4b403bd3f7 INTEGRATION: CWS vq32 (1.8.358); FILE MERGED
2006/05/20 21:57:22 vq 1.8.358.1: #i65415# Use SDI1xxxx instead of SDIxxxx.
2006-05-24 12:18:33 +00:00
Vladimir Glazounov
806b1e1ccf INTEGRATION: CWS vq32 (1.6.96); FILE MERGED
2006/05/20 21:54:01 vq 1.6.96.1: #i65415# Use SDI1xxxx instead of SDIxxxx.
2006-05-24 12:08:20 +00:00
Vladimir Glazounov
aacce9d645 INTEGRATION: CWS swqbf66 (1.88.22); FILE MERGED
2006/05/15 09:53:46 fme 1.88.22.1: #135914# Table row keep feature - Last row should not keep with frame in different section
2006-05-16 15:09:03 +00:00
Vladimir Glazounov
f1deb95713 INTEGRATION: CWS swqbf66 (1.54.120); FILE MERGED
2006/05/15 09:53:46 fme 1.54.120.1: #135914# Table row keep feature - Last row should not keep with frame in different section
2006-05-16 15:08:29 +00:00
Vladimir Glazounov
a6ed684844 INTEGRATION: CWS swqbf65 (1.5.12); FILE MERGED
2006/05/12 10:43:36 od 1.5.12.1: #i65284# method <SwNumberTreeNode::ValidateContinuous(..)>
	 - avoid unnecessary recursive and thus looping calls
2006-05-16 07:03:58 +00:00
Jens-Heiner Rechtien
bfff869f0c INTEGRATION: CWS soc (1.105.130); FILE MERGED
2006/04/25 11:53:35 rt 1.105.130.2: RESYNC: (1.105-1.108); FILE MERGED
2006/03/14 20:23:14 os 1.105.130.1: #133337# SfxViewShell::GetFirst/GetNext() have to provide hidden views, too
2006-05-08 14:32:40 +00:00
Jens-Heiner Rechtien
ce666606b1 INTEGRATION: CWS pb13 (1.20.32); FILE MERGED
2006/04/26 09:24:39 pb 1.20.32.1: fix: #i63803# use the new method RemoveEntry()
2006-05-08 13:54:50 +00:00
Jens-Heiner Rechtien
47abee57d1 INTEGRATION: CWS mbapp3 (1.55.270); FILE MERGED
2006/05/04 07:04:21 mba 1.55.270.2: #129055#: typo
2006/04/28 15:06:26 mba 1.55.270.1: #129055#: new datatransfer functions
2006-05-08 13:48:31 +00:00
Jens-Heiner Rechtien
3b21e67744 INTEGRATION: CWS mbapp3 (1.12.304); FILE MERGED
2006/04/28 15:06:26 mba 1.12.304.1: #129055#: new datatransfer functions
2006-05-08 13:48:15 +00:00
Jens-Heiner Rechtien
1406187dd1 INTEGRATION: CWS mbapp3 (1.15.304); FILE MERGED
2006/04/28 15:06:26 mba 1.15.304.1: #129055#: new datatransfer functions
2006-05-08 13:48:02 +00:00
Jens-Heiner Rechtien
68f2799aad INTEGRATION: CWS mbapp3 (1.100.46); FILE MERGED
2006/04/28 15:06:25 mba 1.100.46.1: #129055#: new datatransfer functions
2006-05-08 13:47:50 +00:00
Jens-Heiner Rechtien
86c7df4b51 INTEGRATION: CWS mbapp3 (1.27.88); FILE MERGED
2006/05/03 17:35:53 flr 1.27.88.1: shape hack cont. --- this time with text boxes
2006-05-08 13:47:33 +00:00
Jens-Heiner Rechtien
6fa71c504b INTEGRATION: CWS mbapp3 (1.58.52); FILE MERGED
2006/05/04 19:57:58 mba 1.58.52.4: shape hack cont - missing line width for lines
2006/05/04 11:34:12 mba 1.58.52.3: shape hack cont - wrong angle
2006/05/03 17:35:52 flr 1.58.52.2: shape hack cont. --- this time with text boxes
2006/05/03 11:16:09 flr 1.58.52.1: shape hack cont.
2006-05-08 13:47:20 +00:00
Jens-Heiner Rechtien
2d03374f53 INTEGRATION: CWS mbapp3 (1.28.86); FILE MERGED
2006/04/26 13:02:29 flr 1.28.86.1: #135163# table cell borders size exceeds cell size
2006-05-08 13:47:04 +00:00
Jens-Heiner Rechtien
5df6a29b6d INTEGRATION: CWS mbapp3 (1.24.88); FILE MERGED
2006/04/26 13:04:49 flr 1.24.88.1: #102781# transparent frames with more than two paragraphs were not imported corretly
2006-05-08 13:46:50 +00:00
Rüdiger Timm
b7102f47c2 #i10000# comma lost during conflict resolution. 2006-05-05 13:13:35 +00:00
Rüdiger Timm
8e7a5e507f INTEGRATION: CWS fwkc03fixes (1.19.304); FILE MERGED
2006/05/03 10:27:46 fme 1.19.304.1: #132504# Made code robust agains hyphenator blunders
2006-05-05 08:58:16 +00:00
Rüdiger Timm
d1140f0895 INTEGRATION: CWS swqbf62 (1.130.54); FILE MERGED
2006/04/21 10:09:50 od 1.130.54.1: #i63540# method <SwEditWin::KeyInput(..)>
	 - adjust <Backspace> key handling:
	   existing numbering deleted for empty paragraphs, if numbering
	   isn't the outline one.
2006-05-05 08:15:28 +00:00
Rüdiger Timm
bab9d47508 INTEGRATION: CWS swqbf62 (1.74.138); FILE MERGED
2006/04/18 15:20:58 hbrinkm 1.74.138.1: #i54959# applied cmc's patch
2006-05-05 08:15:00 +00:00
Rüdiger Timm
f6a8712ac5 INTEGRATION: CWS swqbf62 (1.61.48); FILE MERGED
2006/04/26 19:29:13 od 1.61.48.3: #i64010# method <SwTxtNode::SetCounted(..)>
	 - invalidate and notify complete numbering tree.
2006/04/26 08:22:56 od 1.61.48.2: #i64660# method <SwTxtNode::SplitNode(..)>
	 - remember numbering level before calling method
	   <SwTxtNode::_MakeNewTxtNode(..)>
2006/04/25 13:25:01 od 1.61.48.1: #i64311# class <SwTxtNode>
	 - remove method <IsContinuous()>
2006-05-05 08:14:36 +00:00
Rüdiger Timm
679a1f9b44 INTEGRATION: CWS swqbf62 (1.55.14); FILE MERGED
2006/04/27 11:53:53 od 1.55.14.1: #i64311# method <lcl_ChgNumRule(..)>
	 - invalidate numbering rule on change of <IsContinusNum()> state
2006-05-05 08:14:14 +00:00
Rüdiger Timm
1ebe04b751 INTEGRATION: CWS swqbf62 (1.4.48); FILE MERGED
2006/05/03 14:20:32 od 1.4.48.3: #135352# - correct fix for issue i64311
2006/04/26 19:27:48 od 1.4.48.2: #i64010# class <SwNumberTree> and <SwNodeNum>
	 - adjustments for correct handling of text node, which are
	   counted, but have no number/bullet
2006/04/25 13:26:55 od 1.4.48.1: #i64311# - correct consecutive numbering
2006-05-05 08:13:54 +00:00
Rüdiger Timm
b81db0d774 INTEGRATION: CWS swqbf62 (1.5.50); FILE MERGED
2006/04/26 19:27:48 od 1.5.50.2: #i64010# class <SwNumberTree> and <SwNodeNum>
	 - adjustments for correct handling of text node, which are
	   counted, but have no number/bullet
2006/04/25 13:26:56 od 1.5.50.1: #i64311# - correct consecutive numbering
2006-05-05 08:13:34 +00:00
Rüdiger Timm
bd31812455 INTEGRATION: CWS swqbf62 (1.42.52); FILE MERGED
2006/04/25 13:23:30 od 1.42.52.1: #b64311# class <SwTxtNode>
	 - remove unneccesary method <IsContinuous()>
2006-05-05 08:13:21 +00:00
Rüdiger Timm
d682dde016 INTEGRATION: CWS swqbf62 (1.2.228); FILE MERGED
2006/05/03 14:16:47 od 1.2.228.2: #135352# - correct fix for issue i64311
2006/04/26 19:22:43 od 1.2.228.1: #i64010# class <SwNumberTree> and <SwNodeNum>
	 - adjustments for correct handling of text node, which are
	   counted, but have no number/bullet
2006-05-05 08:13:03 +00:00
Rüdiger Timm
7de6361e53 INTEGRATION: CWS swqbf62 (1.4.50); FILE MERGED
2006/04/26 19:22:42 od 1.4.50.1: #i64010# class <SwNumberTree> and <SwNodeNum>
	 - adjustments for correct handling of text node, which are
	   counted, but have no number/bullet
2006-05-05 08:12:46 +00:00
Rüdiger Timm
b490e82b24 INTEGRATION: CWS swqbf60 (1.17.134); FILE MERGED
2006/04/24 13:25:16 fme 1.17.134.2: RESYNC: (1.17-1.18); FILE MERGED
2006/04/13 13:41:28 ama 1.17.134.1: Fix #i63949#: Undo of table split
2006-05-05 07:41:30 +00:00
Rüdiger Timm
78f2ef9cc9 INTEGRATION: CWS swqbf60 (1.70.24); FILE MERGED
2006/04/12 13:00:02 ama 1.70.24.1: Fix #i63141#: Formatting during spelling caused by GetCharRect()
2006-05-05 07:41:09 +00:00
Rüdiger Timm
b91920ada5 INTEGRATION: CWS swqbf60 (1.87.16); FILE MERGED
2006/04/26 10:26:02 fme 1.87.16.2: #i63632# Unlock fix correction
2006/04/05 13:14:31 fme 1.87.16.1: #i63632# Do not unlock follow table if it was not locked before
2006-05-05 07:40:53 +00:00
Rüdiger Timm
4eaff60f29 INTEGRATION: CWS tl20 (1.30.60); FILE MERGED
2006/04/26 10:18:38 os 1.30.60.1: #132523# crash prevention if Outliner is not set
2006-05-05 07:31:17 +00:00
Rüdiger Timm
1808865ab0 INTEGRATION: CWS tl18 (1.7.48); FILE MERGED
2006/01/24 12:58:15 tl 1.7.48.1: #i60111# avoid use of SmGetActiveView(SfxViewShell::Current) as much as possible
2006-05-05 07:17:20 +00:00
Rüdiger Timm
5d49fa07c4 INTEGRATION: CWS tl18 (1.32.172); FILE MERGED
2006/03/02 08:53:38 tl 1.32.172.1: #i62054# SwXAutoTextContainer::insertNewByName and SwXAutoTextGroup::setName fixed
2006-05-05 07:09:46 +00:00
Rüdiger Timm
06c99f5fa8 INTEGRATION: CWS tl18 (1.32.174); FILE REMOVED
2006/03/07 11:22:27 mav 1.32.174.1: #i59205# move view.hxx and wrtsh.hxx from source\ui\inc\ to inc\
2006-05-05 07:09:30 +00:00
Rüdiger Timm
c48cf36bca INTEGRATION: CWS tl18 (1.39.40); FILE REMOVED
2006/03/07 11:22:02 mav 1.39.40.1: #i59205# move view.hxx and wrtsh.hxx from source\ui\inc\ to inc\
2006-05-05 07:09:19 +00:00