From f649cef13c172a211a10ba0d9e69711fbcba509c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 21 Jan 2014 21:43:02 +0100
Subject: bool improvements

Change-Id: I142196c59ff0dc5c26e0cc9a79293ddfb0ee94cf
---
 svx/source/dialog/checklbx.cxx | 4 ++--
 svx/source/form/fmshell.cxx    | 4 ++--
 svx/source/form/fmundo.cxx     | 2 +-
 svx/source/inc/fmundo.hxx      | 2 +-
 svx/source/svdraw/svdmodel.cxx | 2 +-
 svx/source/svdraw/svdoashp.cxx | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'svx')

diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 03869f7db50b..b47b53c2badb 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -214,7 +214,7 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt )
 
         if ( pEntry )
         {
-            sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+            bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
             SvLBoxItem* pItem = GetItem( pEntry, aPnt.X() );
 
             if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
@@ -255,7 +255,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
 
         if ( pEntry )
         {
-            sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+            bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
             ToggleCheckButton( pEntry );
             if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) )
                 CheckButtonHdl();
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index dcf8ce4bf0a0..17ae864d3837 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -672,7 +672,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
         case SID_FM_DESIGN_MODE:
         {
             SFX_REQUEST_ARG(rReq, pDesignItem, SfxBoolItem, nSlot, sal_False);
-            sal_Bool bDesignMode = pDesignItem ? pDesignItem->GetValue() : !m_bDesignMode;
+            bool bDesignMode = pDesignItem ? pDesignItem->GetValue() : !m_bDesignMode;
             SetDesignMode( bDesignMode );
             if ( m_bDesignMode == bDesignMode )
                 rReq.Done();
@@ -1229,7 +1229,7 @@ void FmFormShell::SetView( FmFormView* _pView )
 void FmFormShell::DetermineForms(sal_Bool bInvalidate)
 {
     // Existieren Formulare auf der aktuellen Page
-    sal_Bool bForms = GetImpl()->hasForms();
+    bool bForms = GetImpl()->hasForms();
     if (bForms != m_bHasForms)
     {
         m_bHasForms = bForms;
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index e0cbe0a1cb7b..0ef9fd22bded 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -179,7 +179,7 @@ FmXUndoEnvironment::FmXUndoEnvironment(FmFormModel& _rModel)
                    ,m_pPropertySetCache( NULL )
                    ,m_pScriptingEnv( ::svxform::createDefaultFormScriptingEnvironment( _rModel ) )
                    ,m_Locks( 0 )
-                   ,bReadOnly( sal_False )
+                   ,bReadOnly( false )
                    ,m_bDisposed( false )
 {
     DBG_CTOR(FmXUndoEnvironment,NULL);
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 3a3a36924a72..e2f0fe11d0d7 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -143,7 +143,7 @@ class SVX_DLLPRIVATE FmXUndoEnvironment
     ::svxform::PFormScriptingEnvironment    m_pScriptingEnv;
     oslInterlockedCount                     m_Locks;
     ::osl::Mutex                            m_aMutex;
-    sal_Bool                                bReadOnly;
+    bool                                    bReadOnly;
     bool                                    m_bDisposed;
 
 public:
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 8910ec8be8f9..e9add1a42e34 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1820,7 +1820,7 @@ void SdrModel::setLock( bool bLock )
         // #i120437# need to set first, else ImpReformatAllEdgeObjects will do nothing
         mbModelLocked = bLock;
 
-        if( sal_False == bLock )
+        if( !bLock )
         {
             ImpReformatAllEdgeObjects();
         }
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 7e213b7e91b4..8d615876dbe8 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -2234,7 +2234,7 @@ bool SdrObjCustomShape::IsAutoGrowHeight() const
     const SfxItemSet& rSet = GetMergedItemSet();
     bool bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
     if ( bIsAutoGrowHeight && IsVerticalWriting() )
-        bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
+        bIsAutoGrowHeight = !((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue();
     return bIsAutoGrowHeight;
 }
 bool SdrObjCustomShape::IsAutoGrowWidth() const
@@ -2242,7 +2242,7 @@ bool SdrObjCustomShape::IsAutoGrowWidth() const
     const SfxItemSet& rSet = GetMergedItemSet();
     bool bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
     if ( bIsAutoGrowWidth && !IsVerticalWriting() )
-        bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
+        bIsAutoGrowWidth = !((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue();
     return bIsAutoGrowWidth;
 }
 
-- 
cgit