summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-07-24 11:23:55 +0200
committerNoel Grandin <noel@peralex.com>2015-07-24 12:36:53 +0200
commite8c3b599237b915cfdd5df2dedb1b4b4a46f0e47 (patch)
tree3a4fce156a9dcdfb4f09c18db18f418a53111a3a /sfx2
parent93774f29ec42e86b55e89e3f13c011673a55c3ce (diff)
in SfxFrameDescriptor, use normal bool
instead of hard to understand bitmasking Change-Id: I5f694285af87223b8ccaa50031cbb3c09924e1a8
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/frmdescr.cxx11
1 files changed, 4 insertions, 7 deletions
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 );