diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 14:14:48 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 14:14:48 +0000 |
| commit | 875c28cf53b5bcfe0f42fdb9fb7ff66927850fb9 (patch) | |
| tree | c6c2721b6a7cf91693f17112e52fb8e9a450200e /sw/inc/frmfmt.hxx | |
| parent | 7f27b2d9dc21221f681290de4a39c549068095a1 (diff) | |
INTEGRATION: CWS swundo03 (1.3.710); FILE MERGED
2004/08/04 14:38:52 hbrinkm 1.3.710.1: #115575#,#115582#
Diffstat (limited to 'sw/inc/frmfmt.hxx')
| -rw-r--r-- | sw/inc/frmfmt.hxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 039dcd53b624..7f35f1d7ecac 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -2,9 +2,9 @@ * * $RCSfile: frmfmt.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2004-08-23 10:54:57 $ + * last change: $Author: hr $ $Date: 2004-09-08 15:14:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -172,6 +172,8 @@ public: virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ); // <-- + virtual String GetDescription() const; + DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrmFmt) }; @@ -244,6 +246,9 @@ class SwDrawFrmFmt: public SwFrmFmt { friend class SwDoc; + mutable const SdrObject * pSdrObjCached; + mutable String sSdrObjCachedComment; + //Beide nicht vorhanden. SwDrawFrmFmt( const SwDrawFrmFmt &rCpy ); SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy ); @@ -262,8 +267,9 @@ protected: meLayoutDir( SwFrmFmt::HORI_L2R ), // <-- // --> OD 2004-08-06 #i28749# - mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ) + mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), // <-- + pSdrObjCached(NULL) {} SwDrawFrmFmt( SwAttrPool& rPool, const String &rFmtNm, SwFrmFmt *pDrvdFrm ) @@ -272,8 +278,9 @@ protected: meLayoutDir( SwFrmFmt::HORI_L2R ), // <-- // --> OD 2004-08-06 #i28749# - mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ) + mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ), // <-- + pSdrObjCached(NULL) {} public: @@ -299,6 +306,7 @@ public: virtual sal_Int16 GetPositionLayoutDir() const; virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ); // <-- + virtual String GetDescription() const; DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt); }; |