summaryrefslogtreecommitdiff
path: root/sw/source/core/text/txtfly.hxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-09-27 08:20:34 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-09-27 08:20:34 +0000
commitc3d2ab017fa52a7e09b539438a8821d6c06203cb (patch)
tree927bc4434d3b560c3a63b365ee28bc355e64b6a3 /sw/source/core/text/txtfly.hxx
parent96844b76f902696387eb7547c4b632a15322fac6 (diff)
INTEGRATION: CWS swwarnings (1.13.222); FILE MERGED
2007/04/03 13:00:16 tl 1.13.222.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/core/text/txtfly.hxx')
-rw-r--r--sw/source/core/text/txtfly.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index 4734bb99b485..cc1f390179ac 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: txtfly.hxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: obo $ $Date: 2006-09-15 11:43:26 $
+ * last change: $Author: hr $ $Date: 2007-09-27 09:20:34 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -191,13 +191,13 @@ public:
pMaster = 0;
}
inline SwTxtFly( const SwTxtFrm *pFrm )
- { CtorInit( pFrm ); }
+ { CtorInitTxtFly( pFrm ); }
SwTxtFly( const SwTxtFly& rTxtFly );
// --> OD 2006-08-15 #i68520#
inline ~SwTxtFly() { delete mpAnchoredObjList; }
// <--
- void CtorInit( const SwTxtFrm *pFrm );
+ void CtorInitTxtFly( const SwTxtFrm *pFrm );
void SetTopRule(){ bTopRule = sal_False; }
inline SwRect GetFrm( const SwRect &rPortion, sal_Bool bTop = sal_True ) const;