sfx2: sal_Bool->bool

Change-Id: I0240d8d093478c62fd7d63cac228092e641bf0dc

include/sfx2/sfxbasecontroller.hxx

@@ -351,9 +351,9 @@ public:
     // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now;
     // either the _Impl name should vanish or there should be an "official" API
     SfxViewShell* GetViewShell_Impl() const;
-    SAL_DLLPRIVATE sal_Bool HandleEvent_Impl( NotifyEvent& rEvent );
-    SAL_DLLPRIVATE sal_Bool HasKeyListeners_Impl();
-    SAL_DLLPRIVATE sal_Bool HasMouseClickListeners_Impl();
+    SAL_DLLPRIVATE bool HandleEvent_Impl( NotifyEvent& rEvent );
+    SAL_DLLPRIVATE bool HasKeyListeners_Impl();
+    SAL_DLLPRIVATE bool HasMouseClickListeners_Impl();
     SAL_DLLPRIVATE void SetCreationArguments_Impl( const css::uno::Sequence< css::beans::PropertyValue >& i_rCreationArgs );
     SAL_DLLPRIVATE css::uno::Reference< css::frame::XTitle > impl_getTitleHelper ();
 private:

sfx2/source/view/sfxbasecontroller.cxx

@@ -398,7 +398,7 @@ struct IMPL_SfxBaseController_DataContainer
     SfxViewShell*                           m_pViewShell            ;
     SfxBaseController*                      m_pController           ;
     bool                                    m_bDisposing            ;
-    sal_Bool                                m_bSuspendState         ;
+    bool                                    m_bSuspendState         ;
     Reference< XTitle >                     m_xTitleHelper          ;
     Sequence< PropertyValue >               m_aCreationArgs         ;
 
@@ -413,7 +413,7 @@ struct IMPL_SfxBaseController_DataContainer
             ,   m_pViewShell            ( pViewShell                                            )
             ,   m_pController           ( pController                                           )
             ,   m_bDisposing            ( false                                                 )
-            ,   m_bSuspendState                 ( sal_False                                              )
+            ,   m_bSuspendState         ( false                                              )
     {
     }
 
@@ -606,14 +606,14 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
     SolarMutexGuard aGuard;
 
     // ignore dublicate calls, which doesn't change anything real
-    if (bSuspend == m_pData->m_bSuspendState)
+    if (bSuspend == (m_pData->m_bSuspendState ? 1 : 0))
        return sal_True;
 
     if ( bSuspend == sal_True )
     {
         if ( !m_pData->m_pViewShell )
         {
-            m_pData->m_bSuspendState = sal_True;
+            m_pData->m_bSuspendState = true;
             return sal_True;
         }
 
@@ -635,7 +635,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
         if ( bRet )
         {
             ConnectSfxFrame_Impl( E_DISCONNECT );
-            m_pData->m_bSuspendState = sal_True;
+            m_pData->m_bSuspendState = true;
         }
 
         return bRet;
@@ -650,7 +650,7 @@ sal_Bool SAL_CALL SfxBaseController::suspend( sal_Bool bSuspend ) throw( Runtime
             ConnectSfxFrame_Impl( E_RECONNECT );
         }
 
-        m_pData->m_bSuspendState = sal_False;
+        m_pData->m_bSuspendState = false;
         return sal_True ;
     }
 }
@@ -743,7 +743,7 @@ Reference< frame::XDispatch > SAL_CALL SfxBaseController::queryDispatch(   const
             if ( aURL.Protocol == ".uno:" )
             {
                 OUString aMasterCommand = SfxOfficeDispatch::GetMasterUnoCommand( aURL );
-                sal_Bool      bMasterCommand( !aMasterCommand.isEmpty() );
+                bool     bMasterCommand( !aMasterCommand.isEmpty() );
 
                 pAct = m_pData->m_pViewShell->GetViewFrame() ;
                 SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool( pAct );
@@ -1210,17 +1210,17 @@ throw (RuntimeException, std::exception)
     return aSeq;
 }
 
-sal_Bool SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent )
+bool SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent )
 {
     return m_pData->m_aUserInputInterception.handleNotifyEvent( rEvent );
 }
 
-sal_Bool SfxBaseController::HasKeyListeners_Impl()
+bool SfxBaseController::HasKeyListeners_Impl()
 {
     return m_pData->m_aUserInputInterception.hasKeyHandlers();
 }
 
-sal_Bool SfxBaseController::HasMouseClickListeners_Impl()
+bool SfxBaseController::HasMouseClickListeners_Impl()
 {
     return m_pData->m_aUserInputInterception.hasMouseClickListeners();
 }
@@ -1431,7 +1431,7 @@ void SfxBaseController::ShowInfoBars( )
                 // Loop over the CMIS Properties to find cmis:isVersionSeriesCheckedOut
                 // and find if it is a Google Drive file.
                 bool bIsGoogleFile = false;
-                sal_Bool bCheckedOut = sal_False;
+                bool bCheckedOut = false;
                 for ( sal_Int32 i = 0; i < aCmisProperties.getLength(); ++i )
                 {
                     if ( aCmisProperties[i].Id == "cmis:isVersionSeriesCheckedOut" ) {

sfx2/source/view/viewsh.cxx

@@ -2025,7 +2025,7 @@ void SfxViewShell::TakeFrameOwnership_Impl()
 long SfxViewShell::HandleNotifyEvent_Impl( NotifyEvent& rEvent )
 {
     if (pImp->m_pController.is())
-        return pImp->m_pController->HandleEvent_Impl( rEvent );
+        return pImp->m_pController->HandleEvent_Impl( rEvent ) ? 1 : 0;
     return 0;
 }