diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:03:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-09-27 07:03:48 +0000 |
| commit | 3d9ec7cadc535a56a19ca19085baa0db17db05ba (patch) | |
| tree | 49b86ac3e076b190a5eb46ca3d2f693627f42738 /sw/inc/frmfmt.hxx | |
| parent | 3546d05157fba792afc09b909807cecbbdd2e72c (diff) | |
INTEGRATION: CWS swwarnings (1.12.158); FILE MERGED
2007/05/29 10:43:18 os 1.12.158.2: RESYNC: (1.12-1.13); FILE MERGED
2007/02/26 16:15:31 os 1.12.158.1: #i69287# warnings removed
Diffstat (limited to 'sw/inc/frmfmt.hxx')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 126bdeb11b46..e3edd2fa6c40 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -4,9 +4,9 @@ * * $RCSfile: frmfmt.hxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: vg $ $Date: 2007-05-22 16:19:52 $ + * last change: $Author: hr $ $Date: 2007-09-27 08:03:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -243,6 +243,7 @@ protected: SwDrawFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_DRAWFRMFMT ), + pSdrObjCached(NULL), // --> OD 2004-07-28 #i31698# meLayoutDir( SwFrmFmt::HORI_L2R ), // <-- @@ -251,13 +252,14 @@ protected: mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), // <-- // --> OD 2005-03-11 #i44334#, #i44681# - mbPosAttrSet( false ), + mbPosAttrSet( false ) // <-- - pSdrObjCached(NULL) + {} SwDrawFrmFmt( SwAttrPool& rPool, const String &rFmtNm, SwFrmFmt *pDrvdFrm ) : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_DRAWFRMFMT ), + pSdrObjCached(NULL), // --> OD 2004-07-28 #i31698# meLayoutDir( SwFrmFmt::HORI_L2R ), // <-- @@ -266,9 +268,8 @@ protected: mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), // <-- // --> OD 2005-03-11 #i44334#, #i44681# - mbPosAttrSet( false ), + mbPosAttrSet( false ) // <-- - pSdrObjCached(NULL) {} public: |