summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/objectformattertxtfrm.hxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-21 09:38:48 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-21 09:38:48 +0000
commit777db499b60e40f121dde990d60d0a33dae006c7 (patch)
tree5e66d0de93d7eaf5e4c5c292c214ab851381b0e0 /sw/source/core/layout/objectformattertxtfrm.hxx
parentb283cefad94e7cb8b7471d842a84414ed7dac1e3 (diff)
INTEGRATION: CWS swqbugfixes12 (1.3.74); FILE MERGED
2005/01/11 12:36:30 od 1.3.74.1: #i40141# - new method <SwObjectFormatterTxtFrm::_FormatAnchorFrmForCheckMoveMwd()> #i40147# - introduce new parameter <_bCheckForMovedFwd> at method <DoFormatObj(..)>
Diffstat (limited to 'sw/source/core/layout/objectformattertxtfrm.hxx')
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.hxx18
1 files changed, 15 insertions, 3 deletions
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx
index c097029f9ab1..902f810319a1 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: objectformattertxtfrm.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: obo $ $Date: 2004-11-16 15:49:15 $
+ * last change: $Author: kz $ $Date: 2005-01-21 10:38:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -166,6 +166,15 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
*/
bool _CheckMovedFwdCondition( const sal_uInt32 _nIdxOfCollected,
sal_uInt32& _noToPageNum );
+
+ /** method to format the anchor frame for checking of the move forward condition
+
+ OD 2005-01-11 #i40141#
+
+ @author OD
+ */
+ void _FormatAnchorFrmForCheckMoveFwd();
+
protected:
virtual SwFrm& GetAnchorFrm();
@@ -173,7 +182,10 @@ class SwObjectFormatterTxtFrm : public SwObjectFormatter
public:
virtual ~SwObjectFormatterTxtFrm();
- virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj );
+ // --> OD 2005-01-10 #i40147# - add parameter <_bCheckForMovedFwd>.
+ virtual bool DoFormatObj( SwAnchoredObject& _rAnchoredObj,
+ const bool _bCheckForMovedFwd = false );
+ // <--
virtual bool DoFormatObjs();
/** method to create an instance of <SwObjectFormatterTxtFrm> is