sfx2: sal_Bool->bool

Change-Id: I48ae51781f64e60deb0c03352087100729c8c3cd

12 files changed, 119 insertions, 119 deletions

diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 73be886eb76a..d42be952f725 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -132,15 +132,15 @@ public:
     sal_uInt16              nCachedFunc2;   // index for the second last called
     sal_uInt16              nMsgPos;        // Message-Position relative the one to be updated
     SfxPopupAction          ePopupAction;   // Checked in DeleteFloatinWindow()
-    sal_Bool                bContextChanged;
-    sal_Bool                bMsgDirty;      // Has a MessageServer been invalidated?
-    sal_Bool                bAllMsgDirty;   //  Has a MessageServer been invalidated?
-    sal_Bool                bAllDirty;      // After InvalidateAll
-    sal_Bool                bCtrlReleased;  // while EnterRegistrations
+    bool                bContextChanged;
+    bool                bMsgDirty;      // Has a MessageServer been invalidated?
+    bool                bAllMsgDirty;   //  Has a MessageServer been invalidated?
+    bool                bAllDirty;      // After InvalidateAll
+    bool                bCtrlReleased;  // while EnterRegistrations
     AutoTimer               aTimer;         // for volatile Slots
-    sal_Bool                bInUpdate;      // for Assertions
-    sal_Bool                bInNextJob;     // for Assertions
-    sal_Bool                bFirstRound;    // First round in Update
+    bool                bInUpdate;      // for Assertions
+    bool                bInNextJob;     // for Assertions
+    bool                bFirstRound;    // First round in Update
     sal_uInt16              nFirstShell;    // Shell, the first round is preferred
     sal_uInt16              nOwnRegLevel;   // Counts the real Locks, exept those of the Super Bindings
     InvalidateSlotMap       m_aInvalidateSlots; // store slots which are invalidated while in update
@@ -203,17 +203,17 @@ SfxBindings::SfxBindings()
     nRegLevel(1)    // first becomes 0, when the Dispatcher is set
 {
     pImp->nMsgPos = 0;
-    pImp->bAllMsgDirty = sal_True;
-    pImp->bContextChanged = sal_False;
-    pImp->bMsgDirty = sal_True;
-    pImp->bAllDirty = sal_True;
+    pImp->bAllMsgDirty = true;
+    pImp->bContextChanged = false;
+    pImp->bMsgDirty = true;
+    pImp->bAllDirty = true;
     pImp->ePopupAction = SFX_POPUP_DELETE;
     pImp->nCachedFunc1 = 0;
     pImp->nCachedFunc2 = 0;
-    pImp->bCtrlReleased = sal_False;
-    pImp->bFirstRound = sal_False;
-    pImp->bInNextJob = sal_False;
-    pImp->bInUpdate = sal_False;
+    pImp->bCtrlReleased = false;
+    pImp->bFirstRound = false;
+    pImp->bInNextJob = false;
+    pImp->bInUpdate = false;
     pImp->pSubBindings = NULL;
     pImp->pSuperBindings = NULL;
     pImp->pWorkWin = NULL;
@@ -343,7 +343,7 @@ void SfxBindings::HidePopups( bool bHide )
     // Hide SfxChildWindows
     DBG_ASSERT( pDispatcher, "HidePopups not allowed without dispatcher" );
     if ( pImp->pWorkWin )
-        pImp->pWorkWin->HidePopups_Impl( bHide, sal_True );
+        pImp->pWorkWin->HidePopups_Impl( bHide, true );
 }
 
 void SfxBindings::HidePopupCtrls_Impl( bool bHide )
@@ -373,7 +373,7 @@ void SfxBindings::Update_Impl
 {
     if( pCache->GetDispatch().is() && pCache->GetItemLink() )
     {
-        pCache->SetCachedState(sal_True);
+        pCache->SetCachedState(true);
         if ( !pCache->GetInternalController() )
             return;
     }
@@ -387,7 +387,7 @@ void SfxBindings::Update_Impl
     const SfxSlotServer* pMsgServer = 0;
     SfxFoundCacheArr_Impl aFound;
     SfxItemSet *pSet = CreateSet_Impl( pCache, pRealSlot, &pMsgServer, aFound );
-    sal_Bool bUpdated = sal_False;
+    bool bUpdated = false;
     if ( pSet )
     {
         // Query Status
@@ -406,7 +406,7 @@ void SfxBindings::Update_Impl
                     pItem = &pSet->Get(nWhich);
                 UpdateControllers_Impl( pInterface, aFound[nPos], pItem, eState );
             }
-            bUpdated = sal_True;
+            bUpdated = true;
         }
 
         delete pSet;
@@ -462,7 +462,7 @@ void SfxBindings::Update
     SfxStateCache* pCache = GetStateCache( nId );
     if ( pCache )
     {
-        pImp->bInUpdate = sal_True;
+        pImp->bInUpdate = true;
         if ( pImp->bMsgDirty )
         {
             UpdateSlotServer_Impl();
@@ -471,10 +471,10 @@ void SfxBindings::Update
 
         if (pCache)
         {
-            sal_Bool bInternalUpdate = sal_True;
+            bool bInternalUpdate = true;
             if( pCache->GetDispatch().is() && pCache->GetItemLink() )
             {
-                pCache->SetCachedState(sal_True);
+                pCache->SetCachedState(true);
                 bInternalUpdate = ( pCache->GetInternalController() != 0 );
             }
 
@@ -486,14 +486,14 @@ void SfxBindings::Update
                     ( !pMsgServer ||
                     !pMsgServer->GetSlot()->IsMode(SFX_SLOT_VOLATILE) ) )
                 {
-                    pImp->bInUpdate = sal_False;
+                    pImp->bInUpdate = false;
                     InvalidateSlotsInMap_Impl();
                     return;
                 }
                 if (!pMsgServer)
                 {
                     pCache->SetState(SFX_ITEM_DISABLED, 0);
-                    pImp->bInUpdate = sal_False;
+                    pImp->bInUpdate = false;
                     InvalidateSlotsInMap_Impl();
                     return;
                 }
@@ -501,10 +501,10 @@ void SfxBindings::Update
                 Update_Impl(pCache);
             }
 
-            pImp->bAllDirty = sal_False;
+            pImp->bAllDirty = false;
         }
 
-        pImp->bInUpdate = sal_False;
+        pImp->bInUpdate = false;
         InvalidateSlotsInMap_Impl();
     }
 }
@@ -523,12 +523,12 @@ void SfxBindings::Update()
         if ( nRegLevel )
             return;
 
-        pImp->bInUpdate = sal_True;
+        pImp->bInUpdate = true;
         pDispatcher->Flush();
         pDispatcher->Update_Impl();
         while ( !NextJob_Impl(0) )
             ; // loop
-        pImp->bInUpdate = sal_False;
+        pImp->bInUpdate = false;
         InvalidateSlotsInMap_Impl();
     }
 }
@@ -568,7 +568,7 @@ void SfxBindings::SetState
             {
                 // Update status
                 if ( !pCache->IsControllerDirty() )
-                    pCache->Invalidate(sal_False);
+                    pCache->Invalidate(false);
                 pCache->SetState( SFX_ITEM_AVAILABLE, pItem );
 
                 //! Not implemented: Updates from EnumSlots via master slots
@@ -602,7 +602,7 @@ void SfxBindings::SetState
         {
             // Update Status
             if ( !pCache->IsControllerDirty() )
-                pCache->Invalidate(sal_False);
+                pCache->Invalidate(false);
             pCache->SetState( SFX_ITEM_AVAILABLE, &rItem );
 
             //! Not implemented: Updates from EnumSlots via master slots
@@ -676,7 +676,7 @@ void SfxBindings::InvalidateAll
 
     pImp->bAllMsgDirty = pImp->bAllMsgDirty || bWithMsg;
     pImp->bMsgDirty = pImp->bMsgDirty || pImp->bAllMsgDirty || bWithMsg;
-    pImp->bAllDirty = sal_True;
+    pImp->bAllDirty = true;
 
     for ( sal_uInt16 n = 0; n < pImp->pCaches->size(); ++n )
         (*pImp->pCaches)[n]->Invalidate(bWithMsg);
@@ -724,7 +724,7 @@ void SfxBindings::Invalidate
         // If SID is ever bound, then invalidate the cache
         SfxStateCache *pCache = (*pImp->pCaches)[n];
         if ( pCache->GetId() == *pIds )
-            pCache->Invalidate(sal_False);
+            pCache->Invalidate(false);
 
         // Next SID
         if ( !*++pIds )
@@ -787,7 +787,7 @@ void SfxBindings::InvalidateShell
             const SfxSlotServer *pMsgServer =
                 pCache->GetSlotServer(*pDispatcher, pImp->xProv);
             if ( pMsgServer && pMsgServer->GetShellLevel() == nLevel )
-                pCache->Invalidate(sal_False);
+                pCache->Invalidate(false);
         }
         pImp->nMsgPos = 0;
         if ( !nRegLevel )
@@ -795,7 +795,7 @@ void SfxBindings::InvalidateShell
             pImp->aTimer.Stop();
             pImp->aTimer.SetTimeout(TIMEOUT_FIRST);
             pImp->aTimer.Start();
-            pImp->bFirstRound = sal_True;
+            pImp->bFirstRound = true;
             pImp->nFirstShell = nLevel;
         }
     }
@@ -825,7 +825,7 @@ void SfxBindings::Invalidate
     SfxStateCache* pCache = GetStateCache(nId);
     if ( pCache )
     {
-        pCache->Invalidate(sal_False);
+        pCache->Invalidate(false);
         pImp->nMsgPos = std::min(GetSlotPos(nId), pImp->nMsgPos);
         if ( !nRegLevel )
         {
@@ -915,7 +915,7 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
     sal_uInt16 nLow = nStartSearchAt;
     sal_uInt16 nMid = 0;
     sal_uInt16 nHigh = 0;
-    sal_Bool bFound = sal_False;
+    bool bFound = false;
     nHigh = pImp->pCaches->size() - 1;
     while ( !bFound && nLow <= nHigh )
     {
@@ -933,7 +933,7 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
                 break;
         }
         else
-            bFound = sal_True;
+            bFound = true;
     }
     sal_uInt16 nPos = bFound ? nMid : nLow;
     DBG_ASSERT( nPos <= pImp->pCaches->size(), "" );
@@ -978,7 +978,7 @@ void SfxBindings::Register_Impl( SfxControllerItem& rItem, bool bInternal )
         DBG_ASSERT( (nPos == pImp->pCaches->size()-1) ||
                     (*pImp->pCaches)[nPos]->GetId() <
                         (*pImp->pCaches)[nPos+1]->GetId(), "" );
-        pImp->bMsgDirty = sal_True;
+        pImp->bMsgDirty = true;
     }
 
     // enqueue the new binding
@@ -1032,7 +1032,7 @@ void SfxBindings::Release( SfxControllerItem& rItem )
         // was this the last controller?
         if ( pCache->GetItemLink() == 0 && !pCache->GetInternalController() )
         {
-            pImp->bCtrlReleased = sal_True;
+            pImp->bCtrlReleased = true;
         }
     }
 
@@ -1202,7 +1202,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
                 if ( pOldItem->ISA(SfxBoolItem) )
                 {
                     // we can toggle Bools
-                    sal_Bool bOldValue = ((const SfxBoolItem *)pOldItem)->GetValue();
+                    bool bOldValue = ((const SfxBoolItem *)pOldItem)->GetValue();
                     SfxBoolItem *pNewItem = (SfxBoolItem*) (pOldItem->Clone());
                     pNewItem->SetValue( !bOldValue );
                     aReq.AppendItem( *pNewItem );
@@ -1273,10 +1273,10 @@ void SfxBindings::UpdateSlotServer_Impl()
         {
             ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame
                 ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
-            pImp->bContextChanged = sal_False;
+            pImp->bContextChanged = false;
         }
         else
-            pImp->bContextChanged = sal_True;
+            pImp->bContextChanged = true;
     }
 
     for (size_t i = 0, nCount = pImp->pCaches->size(); i < nCount; ++i)
@@ -1285,7 +1285,7 @@ void SfxBindings::UpdateSlotServer_Impl()
         //GetSlotServer can modify pImp->pCaches
         pCache->GetSlotServer(*pDispatcher, pImp->xProv);
     }
-    pImp->bMsgDirty = pImp->bAllMsgDirty = sal_False;
+    pImp->bMsgDirty = pImp->bAllMsgDirty = false;
 
     Broadcast( SfxSimpleHint(SFX_HINT_DOCCHANGED) );
 }
@@ -1495,7 +1495,7 @@ void SfxBindings::UpdateControllers_Impl
             SfxStateCache *pEnumCache = GetStateCache( pSlave->GetSlotId() );
             if ( pEnumCache )
             {
-                pEnumCache->Invalidate(sal_False);
+                pEnumCache->Invalidate(false);
 
                 // HACK(CONTROL/SELECT Kram) ???
                 if ( eState == SFX_ITEM_DONTCARE && pFound->nWhichId == 10144 )
@@ -1578,23 +1578,23 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
         return sal_False;
     }
 
-    pImp->bAllDirty = sal_False;
+    pImp->bAllDirty = false;
     pImp->aTimer.SetTimeout(TIMEOUT_UPDATING);
 
     // at least 10 loops and further if more jobs are available but no input
     bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
     sal_uInt16 nLoops = 10;
-    pImp->bInNextJob = sal_True;
+    pImp->bInNextJob = true;
     const sal_uInt16 nCount = pImp->pCaches->size();
     while ( pImp->nMsgPos < nCount )
     {
         // iterate through the bound functions
-        sal_Bool bJobDone = sal_False;
+        bool bJobDone = false;
         while ( !bJobDone )
         {
             SfxStateCache* pCache = (*pImp->pCaches)[pImp->nMsgPos];
             DBG_ASSERT( pCache, "invalid SfxStateCache-position in job queue" );
-            sal_Bool bWasDirty = pCache->IsControllerDirty();
+            bool bWasDirty = pCache->IsControllerDirty();
             if ( bWasDirty )
             {
                     Update_Impl( pCache );
@@ -1612,14 +1612,14 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
 
                 // Update of the  preferred shell has been done, now may
                 // also the others shells be updated
-                bJobDone = sal_False;
-                pImp->bFirstRound = sal_False;
+                bJobDone = false;
+                pImp->bFirstRound = false;
                 pImp->nMsgPos = 0;
             }
 
             if ( bWasDirty && !bJobDone && bPreEmptive && (--nLoops == 0) )
             {
-                pImp->bInNextJob = sal_False;
+                pImp->bInNextJob = false;
                 return sal_False;
             }
         }
@@ -1635,7 +1635,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
         const SfxSlotServer *pSlotServer = pCache->GetSlotServer(*pDispatcher, pImp->xProv);
         if ( pSlotServer && pSlotServer->GetSlot()->IsMode(SFX_SLOT_VOLATILE) )
         {
-            pCache->Invalidate(sal_False);
+            pCache->Invalidate(false);
             bVolatileSlotsPresent = true;
         }
     }
@@ -1646,7 +1646,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
         pImp->aTimer.Stop();
 
     // Update round is finished
-    pImp->bInNextJob = sal_False;
+    pImp->bInNextJob = false;
     Broadcast(SfxSimpleHint(SFX_HINT_UPDATEDONE));
     return sal_True;
 #ifdef DBG_UTIL
@@ -1654,7 +1654,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
     catch (...)
     {
         OSL_FAIL("C++ exception caught!");
-        pImp->bInNextJob = sal_False;
+        pImp->bInNextJob = false;
     }
 
     return sal_False;
@@ -1697,7 +1697,7 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine)
         pImp->nCachedFunc2 = 0;
 
         // Mark if the all of the Caches have dissapered.
-        pImp->bCtrlReleased = sal_False;
+        pImp->bCtrlReleased = false;
     }
 
     return nRegLevel;
@@ -1729,7 +1729,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int
     {
         if ( pImp->bContextChanged )
         {
-            pImp->bContextChanged = sal_False;
+            pImp->bContextChanged = false;
         }
 
         SfxViewFrame* pFrame = pDispatcher->GetFrame();
@@ -1900,12 +1900,12 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState )
 
             if ( !pDisp )
             {
-                sal_Bool bDeleteCache = sal_False;
+                bool bDeleteCache = false;
                 if ( !pCache )
                 {
                     pCache = new SfxStateCache( nSlot );
                     pCache->GetSlotServer( *GetDispatcher_Impl(), pImp->xProv );
-                    bDeleteCache = sal_True;
+                    bDeleteCache = true;
                 }
 
                 SfxItemState eState = SFX_ITEM_SET;
@@ -1924,7 +1924,7 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState )
 
                     if ( pType == ::getBooleanCppuType() )
                     {
-                        sal_Bool bTemp = false;
+                        bool bTemp = false;
                         aAny >>= bTemp ;
                         pItem = new SfxBoolItem( nSlot, bTemp );
                     }
@@ -2062,7 +2062,7 @@ void SfxBindings::InvalidateUnoControllers_Impl()
 
 bool SfxBindings::IsInUpdate() const
 {
-    sal_Bool bInUpdate = pImp->bInUpdate;
+    bool bInUpdate = pImp->bInUpdate;
     if ( !bInUpdate && pImp->pSubBindings )
         bInUpdate = pImp->pSubBindings->IsInUpdate();
     return bInUpdate;
@@ -2096,7 +2096,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxBin
 
 void SfxBindings::SetDispatchProvider_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & rProv )
 {
-    sal_Bool bInvalidate = ( rProv != pImp->xProv );
+    bool bInvalidate = ( rProv != pImp->xProv );
     if ( bInvalidate )
     {
         pImp->xProv = rProv;
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx
index 53167f61502b..067c938259bf 100644
--- a/sfx2/source/control/ctrlitem.cxx
+++ b/sfx2/source/control/ctrlitem.cxx
@@ -366,7 +366,7 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const
 
             // invalidate slot and its message|slot server as 'global' information
             // about the validated message|slot server is not made available
-            pCache->Invalidate( sal_True );
+            pCache->Invalidate( true );
 
             return rPool.GetMetric( nWhich );
         }
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 796444644a2f..fc02c3bac4d5 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -764,7 +764,7 @@ void SfxDispatcher::DoActivate_Impl( bool bMDI, SfxViewFrame* /* pOld */ )
             pBind = pBind->GetSubBindings_Impl();
         }
 
-        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( sal_False, sal_False, 1 );
+        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( false, false, 1 );
     }
 
     if(!pImp->aToDoStack.empty())
@@ -858,7 +858,7 @@ void SfxDispatcher::DoDeactivate_Impl( bool bMDI, SfxViewFrame* pNew )
             pBind = pBind->GetSubBindings_Impl();
         }
 
-        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( sal_True, sal_False, 1 );
+        pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( true, false, 1 );
     }
 
     Flush();
@@ -1541,7 +1541,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne
             }
 
             if ( bUIActive || bIsActive )
-                pWorkWin->SetChildWindowVisible_Impl( nId, sal_True, nMode );
+                pWorkWin->SetChildWindowVisible_Impl( nId, true, nMode );
             if ( bUIActive || bIsActive || !pWorkWin->IsFloating( (sal_uInt16) ( nId & 0xFFFF ) ) )
                 pImp->aChildWins.push_back( nId );
         }
@@ -1832,7 +1832,7 @@ sal_Bool SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const
         return sal_True;
 
     // search
-    sal_Bool bFound = 0 != bsearch( &nSID, pImp->pFilterSIDs, pImp->nFilterCount,
+    bool bFound = 0 != bsearch( &nSID, pImp->pFilterSIDs, pImp->nFilterCount,
                                 sizeof(sal_uInt16), SfxCompareSIDs_Impl );
 
     // even if ReadOnlyDoc
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 21a6c4401584..b8a83b3ba734 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -63,7 +63,7 @@ class SfxQueryStatus_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusL
         SfxQueryStatus_Impl();
         SfxQueryStatus_Impl& operator=( const SfxQueryStatus& );
 
-        sal_Bool                                                                   m_bQueryInProgress;
+        bool                                                                   m_bQueryInProgress;
         SfxItemState                                                               m_eState;
         SfxPoolItem*                                                               m_pItem;
         sal_uInt16                                                                     m_nSlotID;
@@ -73,7 +73,7 @@ class SfxQueryStatus_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusL
 };
 
 SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) :
-    m_bQueryInProgress( sal_False ),
+    m_bQueryInProgress( false ),
     m_eState( SFX_ITEM_DISABLED ),
     m_pItem( 0 ),
     m_nSlotID( nSlotId )
@@ -112,7 +112,7 @@ throw( RuntimeException, std::exception )
 
         if ( pType == ::getBooleanCppuType() )
         {
-            sal_Bool bTemp = false;
+            bool bTemp = false;
             rEvent.State >>= bTemp ;
             m_pItem = new SfxBoolItem( m_nSlotID, bTemp );
         }
@@ -182,7 +182,7 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem )
             try
             {
                 m_aCondition.reset();
-                m_bQueryInProgress = sal_True;
+                m_bQueryInProgress = true;
                 m_xDispatch->addStatusListener( Reference< XStatusListener >( static_cast< cppu::OWeakObject* >( this ), UNO_QUERY ),
                                                 m_aCommand );
             }
@@ -197,7 +197,7 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem )
 
     m_aCondition.wait();
 
-    m_bQueryInProgress = sal_False;
+    m_bQueryInProgress = false;
     rpPoolItem = m_pItem;
     return m_eState;
 }
diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx
index e68332383c81..51e44b24248c 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -268,7 +268,7 @@ void RecentDocsView::OpenItem( const ThumbnailViewItem *pItem )
 
     // documents will never be opened as templates
     aArgsList[1].Name = "AsTemplate";
-    aArgsList[1].Value = makeAny( (sal_Bool) sal_False );
+    aArgsList[1].Value = makeAny( false );
 
     xDispatch = xDispatchProvider->queryDispatch( aTargetURL, "_default", 0 );
 
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index eab1359a23d3..1fa50a604733 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -177,7 +177,7 @@ throw( RuntimeException, std::exception )
         }
         else if ( pType == ::getBooleanCppuType() )
         {
-            sal_Bool bTemp = false;
+            bool bTemp = false;
             rEvent.State >>= bTemp ;
             pItem = new SfxBoolItem( m_nSlotID, bTemp );
         }
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index d2add75bbd38..badc24fd33bf 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -348,8 +348,8 @@ void SfxShell::PutItem
             SfxStateCache* pCache = pBindings->GetStateCache( nSlotId );
             if ( pCache )
             {
-                pCache->SetState( SFX_ITEM_AVAILABLE, pItem->Clone(), sal_True );
-                pCache->SetCachedState( sal_True );
+                pCache->SetState( SFX_ITEM_AVAILABLE, pItem->Clone(), true );
+                pCache->SetCachedState( true );
             }
         }
         return;
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index e48175ac7840..0a4b83efd90d 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -90,7 +90,7 @@ bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uIn
 bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
 {
     OUString aValue;
-    sal_Bool bRet = false;
+    bool bRet = false;
     nMemberId &= ~CONVERT_TWIPS;
     switch ( nMemberId )
     {
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index b7efaed04c36..fcc7e7f65d92 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -80,7 +80,7 @@ void SAL_CALL  BindDispatch_Impl::statusChanged( const ::com::sun::star::frame::
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >  xRef( (::cppu::OWeakObject*)this, ::com::sun::star::uno::UNO_QUERY );
     if ( aStatus.Requery )
-        pCache->Invalidate( sal_True );
+        pCache->Invalidate( true );
     else
     {
         SfxPoolItem *pItem=NULL;
@@ -98,7 +98,7 @@ void SAL_CALL  BindDispatch_Impl::statusChanged( const ::com::sun::star::frame::
             ::com::sun::star::uno::Type pType = aAny.getValueType();
             if ( pType == ::getBooleanCppuType() )
             {
-                sal_Bool bTemp = false;
+                bool bTemp = false;
                 aAny >>= bTemp ;
                 pItem = new SfxBoolItem( nId, bTemp );
             }
@@ -166,7 +166,7 @@ const ::com::sun::star::frame::FeatureStateEvent& BindDispatch_Impl::GetStatus()
     return aStatus;
 }
 
-void BindDispatch_Impl::Dispatch( uno::Sequence < beans::PropertyValue > aProps, sal_Bool bForceSynchron )
+void BindDispatch_Impl::Dispatch( uno::Sequence < beans::PropertyValue > aProps, bool bForceSynchron )
 {
     if ( xDisp.is() && aStatus.IsEnabled )
     {
@@ -188,11 +188,11 @@ SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ):
     pController(0),
     pLastItem( 0 ),
     eLastState( 0 ),
-    bItemVisible( sal_True )
+    bItemVisible( true )
 {
-    bCtrlDirty = sal_True;
-    bSlotDirty = sal_True;
-    bItemDirty = sal_True;
+    bCtrlDirty = true;
+    bSlotDirty = true;
+    bItemDirty = true;
 }
 
 
@@ -212,12 +212,12 @@ SfxStateCache::~SfxStateCache()
 
 
 // invalidates the cache (next request will force update)
-void SfxStateCache::Invalidate( sal_Bool bWithMsg )
+void SfxStateCache::Invalidate( bool bWithMsg )
 {
-    bCtrlDirty = sal_True;
+    bCtrlDirty = true;
     if ( bWithMsg )
     {
-        bSlotDirty = sal_True;
+        bSlotDirty = true;
         aSlotServ.SetSlot( 0 );
         if ( pDispatch )
         {
@@ -250,8 +250,8 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons
 
             if ( !pSlot || !pSlot->pUnoName )
             {
-                bSlotDirty = sal_False;
-                bCtrlDirty = sal_True;
+                bSlotDirty = false;
+                bCtrlDirty = true;
                 return aSlotServ.GetSlot()? &aSlotServ: 0;
             }
 
@@ -286,8 +286,8 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons
                     if ( pDispatcher == &rDispat || pDispatcher == SFX_APP()->GetAppDispatcher_Impl() )
                     {
                         // so we can use it directly
-                        bSlotDirty = sal_False;
-                        bCtrlDirty = sal_True;
+                        bSlotDirty = false;
+                        bCtrlDirty = true;
                         return aSlotServ.GetSlot()? &aSlotServ: 0;
                     }
                 }
@@ -297,8 +297,8 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons
                 pDispatch->acquire();
 
                 // flags must be set before adding StatusListener because the dispatch object will set the state
-                bSlotDirty = sal_False;
-                bCtrlDirty = sal_True;
+                bSlotDirty = false;
+                bCtrlDirty = true;
                 xDisp->addStatusListener( pDispatch, aURL );
             }
             else if ( rDispat.GetFrame() )
@@ -310,8 +310,8 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons
             }
         }
 
-        bSlotDirty = sal_False;
-        bCtrlDirty = sal_True;
+        bSlotDirty = false;
+        bCtrlDirty = true;
     }
 
     // we *always* return a SlotServer (if there is one); but in case of an external dispatch we might not use it
@@ -328,7 +328,7 @@ void SfxStateCache::SetState
 (
     SfxItemState        eState,  // <SfxItemState> from 'pState'
     const SfxPoolItem*  pState,  // Slot Status, 0 or -1
-    sal_Bool bMaybeDirty
+    bool bMaybeDirty
 )
 
 /*  [Description]
@@ -344,11 +344,11 @@ void SfxStateCache::SetState
 
 
 
-void SfxStateCache::SetVisibleState( sal_Bool bShow )
+void SfxStateCache::SetVisibleState( bool bShow )
 {
     SfxItemState        eState( SFX_ITEM_AVAILABLE );
     const SfxPoolItem*  pState( NULL );
-    sal_Bool            bDeleteItem( sal_False );
+    bool            bDeleteItem( false );
 
     if ( bShow != bItemVisible )
     {
@@ -358,7 +358,7 @@ void SfxStateCache::SetVisibleState( sal_Bool bShow )
             if ( IsInvalidItem(pLastItem) || ( pLastItem == NULL ))
             {
                 pState = new SfxVoidItem( nId );
-                bDeleteItem = sal_True;
+                bDeleteItem = true;
             }
             else
                 pState = pLastItem;
@@ -368,7 +368,7 @@ void SfxStateCache::SetVisibleState( sal_Bool bShow )
         else
         {
             pState = new SfxVisibilityItem( nId, false );
-            bDeleteItem = sal_True;
+            bDeleteItem = true;
         }
 
         // Update Controller
@@ -394,7 +394,7 @@ void SfxStateCache::SetState_Impl
 (
     SfxItemState        eState,  // <SfxItemState> from 'pState'
     const SfxPoolItem*  pState,  // Slot Status, 0 or -1
-    sal_Bool bMaybeDirty
+    bool bMaybeDirty
 )
 {
     (void)bMaybeDirty; //unused
@@ -443,17 +443,17 @@ void SfxStateCache::SetState_Impl
         else
             pLastItem = 0;
         eLastState = eState;
-        bItemDirty = sal_False;
+        bItemDirty = false;
     }
 
-    bCtrlDirty = sal_False;
+    bCtrlDirty = false;
 }
 
 
 
 // Set old status again in all the controllers
 
-void SfxStateCache::SetCachedState( sal_Bool bAlways )
+void SfxStateCache::SetCachedState( bool bAlways )
 {
     DBG_ASSERT(pController==NULL||pController->GetId()==nId, "Cache with wrong ControllerItem" );
 
@@ -475,7 +475,7 @@ void SfxStateCache::SetCachedState( sal_Bool bAlways )
             ((SfxDispatchController_Impl *)pInternalController)->StateChanged( nId, eLastState, pLastItem, &aSlotServ );
 
         // Controller is now ok
-        bCtrlDirty = sal_True;
+        bCtrlDirty = true;
     }
 }
 
@@ -501,7 +501,7 @@ void SfxStateCache::DeleteFloatingWindows()
     return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > ();
 }
 
-void SfxStateCache::Dispatch( const SfxItemSet* pSet, sal_Bool bForceSynchron )
+void SfxStateCache::Dispatch( const SfxItemSet* pSet, bool bForceSynchron )
 {
     // protect pDispatch against destruction in the call
     ::com::sun::star::uno::Reference < ::com::sun::star::frame::XStatusListener > xKeepAlive( pDispatch );
diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx
index 93e31bcb1ff6..60581cbc8888 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -175,14 +175,14 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent()
 
     if( pParent )
     {
-        sal_Bool bFound = sal_False;
+        bool bFound = false;
 
         for( sal_uInt16 i = 0, nCount = pParent->GetChildCount(); ( i < nCount ) && !bFound; i++ )
         {
             if( pParent->GetChild( i ) == mpParent )
             {
                 nRet = i;
-                bFound = sal_True;
+                bFound = true;
             }
         }
     }
@@ -459,7 +459,7 @@ sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int32 nChildI
     ThrowIfDisposed();
     const SolarMutexGuard aSolarGuard;
     ThumbnailViewItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex));
-    sal_Bool            bRet = sal_False;
+    bool            bRet = false;
 
     if (pItem != NULL)
         bRet = mpParent->IsItemSelected( pItem->mnId );
@@ -839,12 +839,12 @@ void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Refer
     if( rxListener.is() )
     {
            ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aIter = mxEventListeners.begin();
-        sal_Bool bFound = sal_False;
+        bool bFound = false;
 
         while( !bFound && ( aIter != mxEventListeners.end() ) )
         {
             if( *aIter == rxListener )
-                bFound = sal_True;
+                bFound = true;
             else
                 ++aIter;
         }
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index aa901065c216..a1847402e903 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -60,7 +60,7 @@ public:
                               const ::com::sun::star::uno::Any& rOldValue,
                               const ::com::sun::star::uno::Any& rNewValue );
 
-    sal_Bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); }
+    bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); }
 
     static ThumbnailViewAcc* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw();
 
@@ -193,7 +193,7 @@ public:
 
     void    ParentDestroyed();
 
-    sal_Bool    HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); }
+    bool    HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); }
 
     static ThumbnailViewItemAcc* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw();
 
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 15f09b423bc7..f9389bd1f3ac 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -143,7 +143,7 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame:
 
             if ( pType == ::getBooleanCppuType() )
             {
-                sal_Bool bTemp = false;
+                bool bTemp = false;
                 rEvent.State >>= bTemp ;
                 pItem = new SfxBoolItem( pCtrlItem->GetId(), bTemp );
             }
@@ -620,7 +620,6 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
         sal_Int32   nMarkArg = -1;
 
         // Filter arguments which shouldn't be part of the sequence property value
-        sal_Bool    bTemp = sal_Bool();
         sal_uInt16  nModifier(0);
         std::vector< ::com::sun::star::beans::PropertyValue > aAddArgs;
         for( sal_Int32 n=0; n<nCount; n++ )
@@ -628,7 +627,8 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
             const ::com::sun::star::beans::PropertyValue& rProp = aArgs[n];
             if( rProp.Name == "SynchronMode" )
             {
-                if( rProp.Value >>=bTemp )
+                bool    bTemp;
+                if( rProp.Value >>= bTemp )
                     nCall = bTemp ? SFX_CALLMODE_SYNCHRON : SFX_CALLMODE_ASYNCHRON;
             }
             else if( rProp.Name == "Bookmark" )
@@ -675,7 +675,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util
                 xFrameRef = pViewFrame->GetFrame().GetFrameInterface();
         }
 
-        sal_Bool bSuccess = sal_False;
+        bool bSuccess = false;
         const SfxPoolItem* pItem = NULL;
         SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM );
 
@@ -848,12 +848,12 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt
     // Bindings instance notifies controller about a state change, listeners must be notified also
     // Don't cache visibility state changes as they are volatile. We need our real state to send it
     // to our controllers after visibility is set to true.
-    sal_Bool bNotify = sal_True;
+    bool bNotify = true;
     if ( pState && !IsInvalidItem( pState ) )
     {
         if ( !pState->ISA( SfxVisibilityItem ) )
         {
-            sal_Bool bBothAvailable = pLastState && !IsInvalidItem(pLastState);
+            bool bBothAvailable = pLastState && !IsInvalidItem(pLastState);
             if ( bBothAvailable )
                 bNotify = pState->Type() != pLastState->Type() || *pState != *pLastState;
             if ( pLastState && !IsInvalidItem( pLastState ) )