Commit Graph

1068 Commits

Author SHA1 Message Date
Ivo Hinkelmann
acadc4eed8 INTEGRATION: CWS fwk43 (1.59.20); FILE MERGED
2006/08/03 12:34:14 fme 1.59.20.1: #137134# Check if pSh really is a cursor shell before casting and crashing
2006-08-04 13:26:43 +00:00
Rüdiger Timm
5f7519030e INTEGRATION: CWS swqbf75 (1.8.252); FILE MERGED
2006/07/24 11:50:11 od 1.8.252.1: #b6449874# - adjust consideration of anchored objects, whose wrapping
	     style influence is temporarly considered, for formatting
	     of anchor frame for checking move forward condition.
2006-07-26 07:17:36 +00:00
Rüdiger Timm
fbb43c3102 INTEGRATION: CWS swqbf75 (1.18.18); FILE MERGED
2006/07/24 11:50:11 od 1.18.18.1: #b6449874# - adjust consideration of anchored objects, whose wrapping
	     style influence is temporarly considered, for formatting
	     of anchor frame for checking move forward condition.
2006-07-26 07:17:23 +00:00
Rüdiger Timm
6a5a06f50c INTEGRATION: CWS swqbf75 (1.57.132); FILE MERGED
2006/07/24 11:47:54 od 1.57.132.1: #b6449874# method <SwFlyAtCntFrm::MakeAll()>
	   - on temporary consideration of wrapping style influence to
	     avoid loop situation in iterative positioning process
	     apply to all objects, anchored at the anchor frame, the
	     temporary consideration of wrapping style influence.
2006-07-26 07:17:09 +00:00
Rüdiger Timm
c8c082cf75 INTEGRATION: CWS swqbf75 (1.19.190); FILE MERGED
2006/07/24 11:45:33 od 1.19.190.1: #b6449874# class <SwAnchoredObject>
	   - implementation of new method <SetTmpConsiderWrapInfluenceOfOtherObjs(..)>
2006-07-26 07:16:52 +00:00
Kurt Zenker
3b0528f77f INTEGRATION: CWS swqbf74 (1.89.62); FILE MERGED
2006/07/17 07:31:04 fme 1.89.62.2: #134526# Make code robust - Table frame without lower
2006/07/06 10:48:01 fme 1.89.62.1: #b6445493# Unlock border attrs cache before calculating the keep frame to avoid cache overflow
2006-07-20 15:19:41 +00:00
Kurt Zenker
7b987fcab7 INTEGRATION: CWS swqbf74 (1.57.168); FILE MERGED
2006/07/17 10:36:39 fme 1.57.168.2: RESYNC: (1.57-1.58); FILE MERGED
2006/07/10 13:50:14 fme 1.57.168.1: #i65699# CheckFirstVisPage did not work for follows in split tables
2006-07-20 15:17:16 +00:00
Kurt Zenker
61ede98620 INTEGRATION: CWS swqbf73 (1.5.376); FILE MERGED
2006/07/10 12:05:33 od 1.5.376.1: #134369# - correction of <SwFmtAnchor>-compare operator
2006-07-19 08:30:21 +00:00
Oliver Bolte
b3731058de INTEGRATION: CWS swqbf67 (1.21.356); FILE MERGED
2006/05/24 11:14:30 od 1.21.356.1: #i64301# method <SwHeadFootFrm::FormatSize(..)>
	 - use footer frame printing area position to control invalidation
	   of first footer content.
2006-07-13 10:31:32 +00:00
Oliver Bolte
10140c6884 INTEGRATION: CWS swqbf67 (1.57.4); FILE MERGED
2006/07/06 07:27:28 od 1.57.4.3: #136538#  method <SwFlowFrm::MoveBwd(..)>
	  - further correction of fix for issue i53139
2006/06/08 07:46:48 od 1.57.4.2: #136538# method <SwFlowFrm::MoveBwd(..)>
	 - further correction of fix for issue i53139
2006/06/06 12:46:15 od 1.57.4.1: #i66051# method <SwFlowFrm::MoveBwd(..)>
	 - further correction of fix for issue i53139
2006-07-13 10:31:19 +00:00
Oliver Bolte
00de8127c0 INTEGRATION: CWS swqbf67 (1.15.116); FILE MERGED
2006/05/24 14:32:52 od 1.15.116.1: #b6418964# method <SwAnchoredDrawObject::MakeObjPos()>
	   - reset internal flag <mbNotYetPostioned> after all needed
	     actions are performed in order to avoid callbacks from drawing layer.
2006-07-13 10:30:58 +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
Oliver Bolte
2dd1768ded INTEGRATION: CWS wordcountopt (1.39.168); FILE MERGED
2006/05/02 08:33:20 fme 1.39.168.1: #i64985# Word count should be done during idle time
2006-07-10 14:30:13 +00:00
Oliver Bolte
5b46539793 INTEGRATION: CWS wordcountopt (1.57.76); FILE MERGED
2006/05/04 07:58:20 fme 1.57.76.2: #i64985# Word count should be done during idle time
2006/05/02 08:33:19 fme 1.57.76.1: #i64985# Word count should be done during idle time
2006-07-10 14:30:00 +00:00
Oliver Bolte
6b17088333 INTEGRATION: CWS wordcountopt (1.44.288); FILE MERGED
2006/05/03 07:36:59 fme 1.44.288.2: RESYNC: (1.44-1.45); FILE MERGED
2006/05/02 08:33:19 fme 1.44.288.1: #i64985# Word count should be done during idle time
2006-07-10 14:29:47 +00:00
Oliver Bolte
ac81b118e6 INTEGRATION: CWS wordcountopt (1.54.76); FILE MERGED
2006/06/04 16:42:35 fme 1.54.76.2: RESYNC: (1.54-1.56); FILE MERGED
2006/05/02 08:33:19 fme 1.54.76.1: #i64985# Word count should be done during idle time
2006-07-10 14:29:29 +00:00
Oliver Bolte
74adea0f48 INTEGRATION: CWS swqbf72 (1.17.210); FILE MERGED
2006/06/29 08:35:43 od 1.17.210.1: #b6443897# method <SwObjectFormatterTxtFrm::CheckMovedFwdCondition(..)>
	   - handle special case for moved forward anchor frames in
	     follow flow rows.
2006-07-10 14:16:52 +00:00
Oliver Bolte
e8102b036e INTEGRATION: CWS swqbf72 (1.37.166); FILE MERGED
2006/06/29 08:31:56 od 1.37.166.1: #b6443897# method <SwFrm::IsInSplitTableRow()>
	   - frames inside a headline row aren't in a splitted table row.
2006-07-10 14:16:22 +00:00
Jens-Heiner Rechtien
4e7258798d INTEGRATION: CWS os83 (1.23.14); FILE MERGED
2006/06/12 14:01:53 os 1.23.14.2: #b6433357# include added
2006/06/12 14:00:01 os 1.23.14.1: #b6433357# update page fields after page insertion
2006-06-20 11:02:40 +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
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
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
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
8689996a13 INTEGRATION: CWS swqbfconv_SRC680 (1.12.272); FILE MERGED
2006/04/19 13:58:21 od 1.12.272.1: #b6375613# file <laycache.cxx> now belongs to the exception files.
2006-05-04 12:57:33 +00:00
Rüdiger Timm
1687227736 INTEGRATION: CWS swqbfconv_SRC680 (1.23.72); FILE MERGED
2006/04/20 12:26:54 od 1.23.72.4: #b6375613# - improvement of previous made correction
2006/04/20 12:16:38 od 1.23.72.3: #b6375613# - correction for Linux compiler
2006/04/19 14:00:16 od 1.23.72.2: #b6375613# method <lcl_ApplyWorkaroundForB6375613(..)>
	   - set document info property <WorkaroundForB6375613Applied>, if
	     the workaround is applied.
2006/03/22 13:22:33 od 1.23.72.1: #b6375613# <SwLayHelper::CheckInsert(..)>
	   - introduce conversion code for documents using OOo 1.x layout
	     defect for document layout.
2006-05-04 12:57:21 +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
Kurt Zenker
11f1cc9b79 INTEGRATION: CWS swqbf58 (1.44.234); FILE MERGED
2006/04/18 08:26:25 od 1.44.234.1: #b6403541# method <SwFlyFreeFrm::MakeAll()> - minor correction.
2006-04-26 13:13:09 +00:00
Kurt Zenker
51d7d3b800 INTEGRATION: CWS swqbf58 (1.13.256); FILE MERGED
2006/04/18 08:14:58 od 1.13.256.1: #b6402800# method <SwFlyInCntFrm::MakeAll()>
	   - re-activate clipping depending on hidden compatibility flag
	     <SwDoc::mbClipAsCharacterAnchoredWriterFlyFrames>
2006-04-26 13:12:53 +00:00
Kurt Zenker
e99ed26324 INTEGRATION: CWS swqbf58 (1.56.42); FILE MERGED
2006/04/18 08:17:16 od 1.56.42.1: #b6403541# method <SwFlyAtCntFrm::MakeAll()>
	   - special loopp prevention for dedicated document.
2006-04-26 13:12:39 +00:00
Oliver Bolte
f39636ed1f INTEGRATION: CWS swdrawobjpos203 (1.18.88); FILE MERGED
2006/03/20 08:33:17 od 1.18.88.1: #i62875# method <SwAnchoredObject::ChgAnchor(..)>
	 - do not call <ObjectAttachedToAnchorFrame> is no new anchor frame.
2006-03-22 11:24:22 +00:00
Oliver Bolte
c4d0e76d44 INTEGRATION: CWS swdrawobjpos203 (1.14.124); FILE MERGED
2006/03/20 08:31:48 od 1.14.124.1: #i62875# class <SwAnchoredDrawObject>
	 - initialize <mbCaptureAfterLayoutDirChange> in construtor.
	 - implementation of overloaded method <UpdateLayoutDir()> and
	   new method <IsOutsidePage()>.
	 - capturing of drawing object on page in method <MakeObjPos()>,
	   <mbCaptureAfterLayoutDirChange> is set.
2006-03-22 11:24:04 +00:00
Oliver Bolte
545e96970a INTEGRATION: CWS swqbf57 (1.85.32); FILE MERGED
2006/02/23 09:35:45 fme 1.85.32.1: #130744# Do not consider locked table frames in lcl_InnerCalcLayout
2006-03-21 14:37:21 +00:00
Oliver Bolte
05e3db9e4c INTEGRATION: CWS swqbf57 (1.54.32); FILE MERGED
2006/03/15 10:33:55 od 1.54.32.3: #133407# correction of fix for issue 125892:
	 <SwFlyAtCntFrm::Modify(..)> - consider that current anchor frame
	 is already the new anchor frame.
2006/03/06 10:03:15 od 1.54.32.2: #125892# - class <SwHandleAnchorNodeChg> has own header file
2006/02/28 13:24:07 od 1.54.32.1: #125892# - <SwFlyAtCntFrm::SetAbsPos(..)
	   - handle anchor node change via helper class <SwHandleAnchorNodeChg>
	 - <SwFlyAtCntFrm::Modify(..)>
	   - on anchor node change consider the case that at the found anchor
	     frame candidate already a fly frame of the given fly frame
	     format is registered.
2006-03-21 14:36:27 +00:00
Oliver Bolte
568e5e3e7e INTEGRATION: CWS swqbf57 (1.56.214); FILE MERGED
2006/03/06 10:03:14 od 1.56.214.2: #125892# - class <SwHandleAnchorNodeChg> has own header file
2006/02/28 13:21:36 od 1.56.214.1: #125892# implementation of new helper class <SwHandleAnchorNodeChg>
2006-03-21 14:35:39 +00:00
Vladimir Glazounov
ade1387415 INTEGRATION: CWS sixtyfour02 (1.48.28); FILE MERGED
2006/03/03 09:15:00 cmc 1.48.28.1: #i62466# consistently use ULONG and sal_uInt32
2006-03-16 11:28:47 +00:00
Vladimir Glazounov
38cf83ce34 INTEGRATION: CWS sixtyfour02 (1.23.234); FILE MERGED
2006/03/03 09:15:00 cmc 1.23.234.1: #i62466# consistently use ULONG and sal_uInt32
2006-03-16 11:28:20 +00:00
Vladimir Glazounov
0d084305e8 INTEGRATION: CWS sixtyfour02 (1.87.2); FILE MERGED
2006/03/03 09:15:00 cmc 1.87.2.1: #i62466# consistently use ULONG and sal_uInt32
2006-03-16 11:27:56 +00:00
Vladimir Glazounov
dd7a6261e8 INTEGRATION: CWS sixtyfour02 (1.54.28); FILE MERGED
2006/03/03 09:15:00 cmc 1.54.28.1: #i62466# consistently use ULONG and sal_uInt32
2006-03-16 11:27:39 +00:00
Rüdiger Timm
4751a00526 INTEGRATION: CWS rowkeep (1.85.2); FILE MERGED
2006/02/20 05:20:52 fme 1.85.2.2: #131283# Table rows can keep together - correction
2006/02/17 15:09:27 fme 1.85.2.1: #131283# Table rows can keep together
2006-03-09 13:09:00 +00:00
Rüdiger Timm
a8998df6bb INTEGRATION: CWS rowkeep (1.44.2); FILE MERGED
2006/02/17 15:09:26 fme 1.44.2.1: #131283# Table rows can keep together
2006-03-09 13:08:45 +00:00
Rüdiger Timm
dbd0ac971a INTEGRATION: CWS rowkeep (1.94.134); FILE MERGED
2006/02/17 15:09:24 fme 1.94.134.1: #131283# Table rows can keep together
2006-03-09 13:08:30 +00:00
Rüdiger Timm
622c97c009 INTEGRATION: CWS rowkeep (1.56.12); FILE MERGED
2006/02/17 15:09:23 fme 1.56.12.1: #131283# Table rows can keep together
2006-03-09 13:08:07 +00:00
Rüdiger Timm
b6a2332a74 INTEGRATION: CWS rowkeep (1.30.2); FILE MERGED
2006/02/17 15:09:22 fme 1.30.2.1: #131283# Table rows can keep together
2006-03-09 13:07:53 +00:00
Rüdiger Timm
fd25319b0a INTEGRATION: CWS rowkeep (1.86.12); FILE MERGED
2006/02/17 15:09:21 fme 1.86.12.1: #131283# Table rows can keep together
2006-03-09 13:07:40 +00:00