diff options
author | Robert Roth <robert.roth.off@gmail.com> | 2010-11-01 03:48:31 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@novell.com> | 2010-11-01 21:04:41 +0000 |
commit | db8ad987be169af5b394cc0c8bbfed8745b3a330 (patch) | |
tree | 75f2092478238470cb7d5750cad9649cf64a01b3 /sw/inc/frmfmt.hxx | |
parent | 43a36b36986dd2112fc90340e7a8a11ea5369def (diff) |
Bogus comments, commented lines removed, some german comments translated.
Diffstat (limited to 'sw/inc/frmfmt.hxx')
-rw-r--r-- | sw/inc/frmfmt.hxx | 48 |
1 files changed, 10 insertions, 38 deletions
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 8427b69a25b3..4b928c5345ce 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -28,9 +28,7 @@ #ifndef _FRMFMT_HXX #define _FRMFMT_HXX -// --> OD 2004-08-06 #i28749# #include <com/sun/star/text/PositionLayoutDir.hpp> -// <-- #include <cppuhelper/weakref.hxx> @@ -118,7 +116,6 @@ public: BOOL IsLowerOf( const SwFrmFmt& rFmt ) const; - // --> OD 2004-07-27 #i31698# enum tLayoutDir { HORI_L2R, @@ -129,12 +126,9 @@ public: virtual SwFrmFmt::tLayoutDir GetLayoutDir() const; virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ); - // <-- - // --> OD 2004-08-06 #i28749# virtual sal_Int16 GetPositionLayoutDir() const; virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ); - // <-- virtual String GetDescription() const; @@ -185,18 +179,16 @@ public: virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; - // --> OD 2009-07-14 #i73249# const String GetObjTitle() const; void SetObjTitle( const String& rTitle, bool bBroadcast = false ); const String GetObjDescription() const; void SetObjDescription( const String& rDescription, bool bBroadcast = false ); - // <-- /** SwFlyFrmFmt::IsBackgroundTransparent - for #99657# - OD 22.08.2002 - overloading virtual method and its default implementation, + overloading virtual method and its default implementation, because format of fly frame provides transparent backgrounds. Method determines, if background of fly frame is transparent. @@ -209,7 +201,7 @@ public: /** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898# - OD 08.10.2002 - method to determine, if the brush for drawing the + method to determine, if the brush for drawing the background is "inherited" from its parent/grandparent. This is the case, if no background graphic is set and the background color is "no fill"/"auto fill" @@ -236,46 +228,34 @@ class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt SwDrawFrmFmt( const SwDrawFrmFmt &rCpy ); SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy ); - // --> OD 2004-07-27 #i31698# SwFrmFmt::tLayoutDir meLayoutDir; - // <-- - // --> 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 ) : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_DRAWFRMFMT ), pSdrObjCached(NULL), - // --> OD 2004-07-28 #i31698# + meLayoutDir( SwFrmFmt::HORI_L2R ), - // <-- - // --> OD 2004-08-06 #i28749# - // --> 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 ) - // <-- {} 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 ), - // <-- - // --> OD 2004-08-06 #i28749# - // --> 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 ) - // <-- {} public: @@ -292,27 +272,19 @@ public: virtual Graphic MakeGraphic( ImageMap* pMap = NULL ); - // --> OD 2004-07-27 #i31698# virtual SwFrmFmt::tLayoutDir GetLayoutDir() const; virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ); - // <-- - // --> OD 2004-08-06 #i28749# 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; } - // <-- - // --> OD 2005-08-16 #i53320# inline void ResetPosAttr() { mbPosAttrSet = false; } - // <-- virtual String GetDescription() const; |