diff options
| -rw-r--r-- | include/sfx2/frmdescr.hxx | 24 | ||||
| -rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 11 |
2 files changed, 13 insertions, 22 deletions
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index fbc14c71c40d..34db79209d4e 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -57,9 +57,6 @@ enum SizeSelector SIZE_REL }; -#define BORDER_SET 2 -#define BORDER_YES 1 -#define BORDER_NO 0 #define SPACING_NOT_SET -1L #define SIZE_NOT_SET -1L @@ -75,7 +72,8 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor long nWidth; ScrollingMode eScroll; SizeSelector eSizeSelector; - sal_uInt16 nHasBorder; + bool bHasBorder; + bool bHasBorderSet; sal_uInt16 nItemId; bool bResizeHorizontal; bool bResizeVertical; @@ -119,23 +117,19 @@ public: void SetScrollingMode( ScrollingMode eMode ) { eScroll = eMode; } - // FrameBorder void SetWallpaper( const Wallpaper& rWallpaper ); - bool HasFrameBorder() const; + // FrameBorder + bool HasFrameBorder() const + { return bHasBorder; } bool IsFrameBorderOn() const - { return ( nHasBorder & BORDER_YES ) != 0; } - + { return bHasBorder; } void SetFrameBorder( bool bBorder ) - { - nHasBorder = bBorder ? - BORDER_YES | BORDER_SET : - BORDER_NO | BORDER_SET; - } + { bHasBorder = bBorder; bHasBorderSet = true; } bool IsFrameBorderSet() const - { return (nHasBorder & BORDER_SET) != 0; } + { return bHasBorderSet; } void ResetBorder() - { nHasBorder = 0; } + { bHasBorder = false; bHasBorderSet = false; } // Copy for example for Views SfxFrameDescriptor* Clone( bool bWithIds = true ) const; diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index d3a2ba07534e..8ce26e51fdcb 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -45,7 +45,8 @@ SfxFrameDescriptor::SfxFrameDescriptor() : nWidth( 0L ), eScroll( ScrollingAuto ), eSizeSelector( SIZE_ABS ), - nHasBorder( BORDER_YES ), + bHasBorder( true ), + bHasBorderSet( false ), nItemId( 0 ), bResizeHorizontal( true ), bResizeVertical( true ), @@ -109,7 +110,8 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone( bool bWithIds ) const pFrame->eScroll = eScroll; pFrame->bResizeHorizontal = bResizeHorizontal; pFrame->bResizeVertical = bResizeVertical; - pFrame->nHasBorder = nHasBorder; + pFrame->bHasBorder = bHasBorder; + pFrame->bHasBorderSet = bHasBorderSet; pFrame->bHasUI = bHasUI; pFrame->SetReadOnly( IsReadOnly() ); pFrame->SetEditable( IsEditable() ); @@ -130,11 +132,6 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone( bool bWithIds ) const return pFrame; } -bool SfxFrameDescriptor::HasFrameBorder() const -{ - return (nHasBorder & BORDER_YES) != 0; -} - void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper ) { DELETEZ( pImp->pWallpaper ); |