summaryrefslogtreecommitdiff
path: root/sw/source/core/layout/objectformattertxtfrm.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2007-09-27 08:05:20 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2007-09-27 08:05:20 +0000
commit453b49c2d9b99cca372ee892c516d34fab831ab5 (patch)
treee7f3962483a04805e99a6336f18c9517c71c462e /sw/source/core/layout/objectformattertxtfrm.cxx
parent60061bfd12690c415bafe2e8265bc1850a32ea60 (diff)
INTEGRATION: CWS swwarnings (1.20.222); FILE MERGED
2007/03/08 08:23:54 fme 1.20.222.1: #i69287# Warning free code
Diffstat (limited to 'sw/source/core/layout/objectformattertxtfrm.cxx')
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/layout/objectformattertxtfrm.cxx b/sw/source/core/layout/objectformattertxtfrm.cxx
index aa1eddcc8ea8..11180b027b6a 100644
--- a/sw/source/core/layout/objectformattertxtfrm.cxx
+++ b/sw/source/core/layout/objectformattertxtfrm.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: objectformattertxtfrm.cxx,v $
*
- * $Revision: 1.20 $
+ * $Revision: 1.21 $
*
- * last change: $Author: obo $ $Date: 2006-09-16 21:21:38 $
+ * last change: $Author: hr $ $Date: 2007-09-27 09:05:20 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -454,12 +454,12 @@ bool SwObjectFormatterTxtFrm::DoFormatObjs()
// <--
{
bool bInsert( true );
- sal_uInt32 nToPageNum( 0L );
+ sal_uInt32 nTmpToPageNum( 0L );
const SwDoc& rDoc = *(GetPageFrm().GetFmt()->GetDoc());
if ( SwLayouter::FrmMovedFwdByObjPos(
- rDoc, mrAnchorTxtFrm, nToPageNum ) )
+ rDoc, mrAnchorTxtFrm, nTmpToPageNum ) )
{
- if ( nToPageNum < pAnchorPageFrm->GetPhyPageNum() )
+ if ( nTmpToPageNum < pAnchorPageFrm->GetPhyPageNum() )
SwLayouter::RemoveMovedFwdFrm( rDoc, mrAnchorTxtFrm );
else
bInsert = false;