diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 08:06:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 08:06:38 +0000 |
| commit | ab98ff9c4670a8a2965a351474fabfbbbdf7f6bc (patch) | |
| tree | 0e4c61907f6b50f156fe1b2baf9b4f66934b620f /sw/source/core/layout/ssfrm.cxx | |
| parent | bde0dc61363ba6f291055e14578f3d37850119a4 (diff) | |
INTEGRATION: CWS swwarnings (1.45.222); FILE MERGED
2007/05/29 11:33:50 os 1.45.222.5: RESYNC: (1.46-1.47); FILE MERGED
2007/04/11 10:39:25 os 1.45.222.4: RESYNC: (1.45-1.46); FILE MERGED
2007/03/08 08:23:58 fme 1.45.222.3: #i69287# Warning free code
2007/03/05 12:45:30 tl 1.45.222.2: #i69287# warning-free code
2007/02/22 15:06:36 tl 1.45.222.1: #i69287# warning-free code
Diffstat (limited to 'sw/source/core/layout/ssfrm.cxx')
| -rw-r--r-- | sw/source/core/layout/ssfrm.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 66a4adb742c0..6e9dd8ca05ba 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ssfrm.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.48 $ * - * last change: $Author: kz $ $Date: 2007-05-10 16:01:03 $ + * last change: $Author: hr $ $Date: 2007-09-27 09:06:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -110,9 +110,6 @@ #ifndef _VIEWIMP_HXX #include <viewimp.hxx> #endif -#ifndef _FRMSH_HXX -#include <frmsh.hxx> -#endif // OD 2004-05-24 #i28701# #ifndef _SORTEDOBJS_HXX @@ -315,7 +312,7 @@ void SwFrm::CheckDirChange() SwFrm* pFrm = ((SwLayoutFrm*)this)->Lower(); const SwFmtCol* pCol = NULL; - SwLayoutFrm* pBody; + SwLayoutFrm* pBody = 0; if( pFrm ) { if( IsPageFrm() ) @@ -657,7 +654,7 @@ const SwRect SwFrm::PaintArea() const // NEW TABLES // Cell frames may not leave their upper: SwRect aRect = IsRowFrm() ? GetUpper()->Frm() : Frm(); - const FASTBOOL bVert = IsVertical(); + const BOOL bVert = IsVertical(); SwRectFn fnRect = bVert ? fnRectVert : fnRectHori; long nRight = (aRect.*fnRect->fnGetRight)(); long nLeft = (aRect.*fnRect->fnGetLeft)(); |