From e8c3b599237b915cfdd5df2dedb1b4b4a46f0e47 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 24 Jul 2015 11:23:55 +0200
Subject: in SfxFrameDescriptor, use normal bool

instead of hard to understand bitmasking

Change-Id: I5f694285af87223b8ccaa50031cbb3c09924e1a8
---
 sfx2/source/doc/frmdescr.cxx | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'sfx2')

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 );
-- 
cgit