diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 08:01:23 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 08:01:23 +0000 |
| commit | d819bd5808537c4c5c3c5e56cd133130c6158d6c (patch) | |
| tree | b4aab73e54324951deec50adb73e8dac259c4a7d /sw/source/core/layout/colfrm.cxx | |
| parent | 86a361d84d222f4826a8bc4002c9592741aeb4c8 (diff) | |
INTEGRATION: CWS swwarnings (1.17.222); FILE MERGED
2007/03/08 08:23:44 fme 1.17.222.2: #i69287# Warning free code
2007/02/22 15:06:34 tl 1.17.222.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/core/layout/colfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/colfrm.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/layout/colfrm.cxx b/sw/source/core/layout/colfrm.cxx index a5688793d1ff..6912966a5a96 100644 --- a/sw/source/core/layout/colfrm.cxx +++ b/sw/source/core/layout/colfrm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: colfrm.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: obo $ $Date: 2006-09-16 21:17:03 $ + * last change: $Author: hr $ $Date: 2007-09-27 09:01:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -196,9 +196,9 @@ static BOOL lcl_AddColumns( SwLayoutFrm *pCont, USHORT nCount ) } for ( USHORT i = 0; i < nCount; ++i ) { - SwColumnFrm *pTmp = new SwColumnFrm( pNeighbourCol->GetFmt() ); - pTmp->SetMaxFtnHeight( nMax ); - pTmp->InsertBefore( pCont, NULL ); + SwColumnFrm *pTmpCol = new SwColumnFrm( pNeighbourCol->GetFmt() ); + pTmpCol->SetMaxFtnHeight( nMax ); + pTmpCol->InsertBefore( pCont, NULL ); pNeighbourCol = (SwLayoutFrm*)pNeighbourCol->GetNext(); } } @@ -348,7 +348,7 @@ void SwLayoutFrm::AdjustColumns( const SwFmtCol *pAttr, BOOL bAdjustAttributes ) return; } - const FASTBOOL bVert = IsVertical(); + const BOOL bVert = IsVertical(); SwRectFn fnRect = bVert ? fnRectVert : fnRectHori; //Ist ein Pointer da, oder sollen wir die Attribute einstellen, |