diff options
| author | Andreas Martens <ama@openoffice.org> | 2001-03-29 10:17:36 +0000 |
|---|---|---|
| committer | Andreas Martens <ama@openoffice.org> | 2001-03-29 10:17:36 +0000 |
| commit | 7c76de1efa044352d0442c09e829f81f97e57192 (patch) | |
| tree | 00e1312465b91bed7b7c8064e3fbe88a9952e9a3 /sw/source/core/text/frmform.cxx | |
| parent | 3c6f28fad60d60af2bf6c9aac72ef8d1aa1e2592 (diff) | |
Fix: Using the right type instead of casting
Diffstat (limited to 'sw/source/core/text/frmform.cxx')
| -rw-r--r-- | sw/source/core/text/frmform.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index b5f9334eead8..6851c0c8dd71 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -2,9 +2,9 @@ * * $RCSfile: frmform.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: ama $ $Date: 2000-11-21 11:20:36 $ + * last change: $Author: ama $ $Date: 2001-03-29 11:17:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1066,7 +1066,7 @@ sal_Bool SwTxtFrm::FormatLine( SwTxtFormatter &rLine, const sal_Bool bPrev ) if ( bUnChg && !bPrev ) { // 6672: Toleranz von SLOPPY_TWIPS (5 Twips); vgl. 6922 - const KSHORT nWidthDiff = nOldWidth > pNew->Width() + const long nWidthDiff = nOldWidth > pNew->Width() ? nOldWidth - pNew->Width() : pNew->Width() - nOldWidth; bUnChg = nOldHeight == pNew->Height() && @@ -1771,9 +1771,9 @@ void SwTxtFrm::Format( const SwBorderAttrs * ) if ( 0 != (pObjs = pMaster->GetDrawObjs()) ) { MSHORT nAutoCnt = 0; - for ( int i = 0; i < int(pObjs->Count()); ++i ) + for( MSHORT i = 0; i < pObjs->Count(); ++i ) { - SdrObject *pO = (*pObjs)[MSHORT(i)]; + SdrObject *pO = (*pObjs)[i]; if ( pO->IsWriterFlyFrame() ) { SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pO)->GetFlyFrm(); |