diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:56:05 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 11:56:05 +0000 |
| commit | d2edfb7020c4f567228d25052282304c30f45830 (patch) | |
| tree | 31290c0fd6527c15433697d624d5319fdc6b81c2 /sw/inc/frmfmt.hxx | |
| parent | fa697210ee18f373015de38153dd5767e7abaaf8 (diff) | |
INTEGRATION: CWS swqbugfixes17 (1.7.260); FILE MERGED
2005/03/14 08:08:10 fme 1.7.260.2: #i44334#, #i44681# PosAttrSet return value set to void
2005/03/11 11:39:54 od 1.7.260.1: #i44334#, #i44681# class <SwDrawFrmFmt>
- adjust default value of <mnPositionLayoutDir>
- introduce new member <mbPosAttrSet>
Diffstat (limited to 'sw/inc/frmfmt.hxx')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index e864994f3c5a..94ea77f31a9c 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frmfmt.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: pjunck $ $Date: 2004-10-27 12:30:04 $ + * last change: $Author: vg $ $Date: 2005-03-23 12:56:05 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -259,6 +259,9 @@ class SwDrawFrmFmt: public SwFrmFmt // --> OD 2004-08-06 #i28749# sal_Int16 mnPositionLayoutDir; // <-- + // --> OD 2005-03-11 #i44334#, #i44681# + bool mbPosAttrSet; + // <-- protected: SwDrawFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, SwFrmFmt *pDrvdFrm ) @@ -267,10 +270,11 @@ protected: meLayoutDir( SwFrmFmt::HORI_L2R ), // <-- // --> OD 2004-08-06 #i28749# - // --> OD 2004-10-25 #i36010# - change default value of <mnPositionLayoutDir> - // in order to force an setting of the positioning attributes at the - // first time the drawing object is positioned. - mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInHoriL2R ), + // --> OD 2005-03-10 #i44344#, #i44681# - undo change of issue #i36010# + mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), + // <-- + // --> OD 2005-03-11 #i44334#, #i44681# + mbPosAttrSet( false ), // <-- pSdrObjCached(NULL) {} @@ -281,10 +285,11 @@ protected: meLayoutDir( SwFrmFmt::HORI_L2R ), // <-- // --> OD 2004-08-06 #i28749# - // --> OD 2004-10-25 #i36010# - change default value of <mnPositionLayoutDir> - // in order to force an setting of the positioning attributes at the - // first time the drawing object is positioned. - mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInHoriL2R ), + // --> OD 2005-03-10 #i44344#, #i44681# - undo change of issue #i36010# + mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), + // <-- + // --> OD 2005-03-11 #i44334#, #i44681# + mbPosAttrSet( false ), // <-- pSdrObjCached(NULL) {} @@ -312,6 +317,16 @@ public: virtual sal_Int16 GetPositionLayoutDir() const; virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ); // <-- + // --> OD 2005-03-11 #i44334#, #i44681# + inline bool IsPosAttrSet() const + { + return mbPosAttrSet; + } + inline void PosAttrSet() + { + mbPosAttrSet = true; + } + // <-- virtual String GetDescription() const; DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt); |