sfx2: sal_Bool->bool

Change-Id: I375a72c34e46778385a9fdc24c9ebd0f0a3f3c9b

10 files changed, 88 insertions, 90 deletions

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 45165c558e4c..64ff4327572f 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -573,7 +573,7 @@ SfxApplication::ChooseScript()
         uno::Reference< frame::XFrame > xFrame( pFrame ? pFrame->GetFrameInterface() : uno::Reference< frame::XFrame >() );
 
           AbstractScriptSelectorDialog* pDlg =
-            pFact->CreateScriptSelectorDialog( NULL, sal_False, xFrame );
+            pFact->CreateScriptSelectorDialog( NULL, false, xFrame );
 
         SAL_INFO( "sfx.appl", "done, now exec it");
 
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 3e8a8939def8..a80a91a9f776 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -1194,7 +1194,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq )
             do  // artificial loop for flow control
             {
                 AbstractScriptSelectorDialog* pDlg = pFact->CreateScriptSelectorDialog(
-                    lcl_getDialogParent( xFrame, GetTopWindow() ), sal_False, xFrame );
+                    lcl_getDialogParent( xFrame, GetTopWindow() ), false, xFrame );
                 OSL_ENSURE( pDlg, "SfxApplication::OfaExec_Impl( SID_RUNMACRO ): no dialog!" );
                 if ( !pDlg )
                     break;
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 59005019f08b..ff10f76ea3be 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -218,7 +218,7 @@ OUString SfxHelp_Impl::GetHelpText( const OUString& aCommandURL, const OUString&
 }
 
 SfxHelp::SfxHelp() :
-    bIsDebug( sal_False ),
+    bIsDebug( false ),
     pImp    ( NULL )
 {
     // read the environment variable "HELP_DEBUG"
@@ -528,7 +528,7 @@ static bool impl_showOnlineHelp( const OUString& rURL )
     return false;
 }
 
-sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword)
+bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword)
 {
     OUStringBuffer aHelpRootURL("vnd.sun.star.help://");
     AppendConfigToken(aHelpRootURL, sal_True);
@@ -605,13 +605,11 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
     if ( !impl_hasHelpInstalled() )
     {
         if ( impl_showOnlineHelp( aHelpURL ) )
-            return sal_True;
-        else
-        {
-            NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
-            aErrBox.Execute();
-            return sal_False;
-        }
+            return true;
+
+        NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) );
+        aErrBox.Execute();
+        return false;
     }
 
     Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );
@@ -632,7 +630,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
     else
         pHelpWindow = (SfxHelpWindow_Impl*)VCLUnoHelper::GetWindow(xHelp->getComponentWindow());
     if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow)
-        return sal_False;
+        return false;
 
 #ifdef DBG_UTIL
     OStringBuffer aTmp("SfxHelp: HelpId = ");
@@ -649,7 +647,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
     if ( xTopWindow.is() )
         xTopWindow->toFront();
 
-    return sal_True;
+    return true;
 }
 
 OUString SfxHelp::CreateHelpURL(const OUString& aCommandURL, const OUString& rModuleName)
diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx
index f06cbc87c61b..95b4751949f6 100644
--- a/sfx2/source/bastyp/sfxhtml.cxx
+++ b/sfx2/source/bastyp/sfxhtml.cxx
@@ -62,7 +62,7 @@ static HTMLOptionEnum const aAreaShapeOptEnums[] =
     { 0,                    0                   }
 };
 
-SfxHTMLParser::SfxHTMLParser( SvStream& rStream, sal_Bool bIsNewDoc,
+SfxHTMLParser::SfxHTMLParser( SvStream& rStream, bool bIsNewDoc,
                               SfxMedium *pMed )
     : HTMLParser(rStream, bIsNewDoc)
     , pMedium(pMed)
@@ -238,9 +238,9 @@ void SfxHTMLParser::StartFileDownload(const OUString& rURL)
     pDLMedium->DownLoad();
 }
 
-sal_Bool SfxHTMLParser::FinishFileDownload( OUString& rStr )
+bool SfxHTMLParser::FinishFileDownload( OUString& rStr )
 {
-    sal_Bool bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
+    bool bOK = pDLMedium && pDLMedium->GetErrorCode()==0;
     if( bOK )
     {
         SvStream* pStream = pDLMedium->GetInStream();
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index a831ec977022..d74bd22c4c9c 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1692,9 +1692,9 @@ void SfxDispatcher::FlushImpl()
         if (!pImp->bActive)
             continue;
         if (i->bPush)
-            i->pCluster->DoActivate_Impl(pImp->pFrame, sal_True);
+            i->pCluster->DoActivate_Impl(pImp->pFrame, true);
         else
-            i->pCluster->DoDeactivate_Impl(pImp->pFrame, sal_True);
+            i->pCluster->DoDeactivate_Impl(pImp->pFrame, true);
     }
 
     aToDoCopy = pImp->aToDoCopyStack.back();
@@ -2354,7 +2354,7 @@ void SfxDispatcher::RemoveShell_Impl( SfxShell& rShell )
         {
             pImp->aStack.erase( pImp->aStack.begin() + n );
             rShell.SetDisableFlags( 0 );
-            rShell.DoDeactivate_Impl(pImp->pFrame, sal_True);
+            rShell.DoDeactivate_Impl(pImp->pFrame, true);
             break;
         }
     }
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index c10a49676818..f77261b4a5f8 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -90,10 +90,10 @@ struct SfxShell_Impl: public SfxBroadcaster
                                             // ViewFrame/ViewShell/SubShell list
     SfxViewFrame*            pFrame;        // Frame, if  <UI-active>
     SfxRepeatTarget*         pRepeatTarget; // SbxObjectRef xParent;
-    sal_Bool                        bInAppBASIC;
-    sal_Bool                        bActive;
-    sal_uIntPtr                     nDisableFlags;
-    sal_uIntPtr                       nHelpId;
+    bool                        bInAppBASIC;
+    bool                        bActive;
+    sal_uIntPtr                 nDisableFlags;
+    sal_uIntPtr                 nHelpId;
     svtools::AsynchronLink*     pExecuter;
     svtools::AsynchronLink*     pUpdater;
     SfxVerbSlotArr_Impl         aSlotArr;
@@ -134,9 +134,9 @@ SfxShell::SfxShell()
     pImp->pViewSh = 0;
     pImp->pFrame = 0;
     pImp->pRepeatTarget = 0;
-    pImp->bInAppBASIC = sal_False;
+    pImp->bInAppBASIC = false;
     pImp->nHelpId = 0L;
-    pImp->bActive = sal_False;
+    pImp->bActive = false;
     pImp->nDisableFlags = 0;
 }
 
@@ -159,9 +159,9 @@ SfxShell::SfxShell( SfxViewShell *pViewSh )
     pImp->pViewSh = pViewSh;
     pImp->pFrame = 0;
     pImp->pRepeatTarget = 0;
-    pImp->bInAppBASIC = sal_False;
+    pImp->bInAppBASIC = false;
     pImp->nHelpId = 0L;
-    pImp->bActive = sal_False;
+    pImp->bActive = false;
 }
 
 
@@ -547,7 +547,7 @@ void SfxShell::Invalidate_Impl( SfxBindings& rBindings, sal_uInt16 nId )
 
 
 
-void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
+void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, bool bMDI )
 
 /*  [Description]
 
@@ -575,7 +575,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
     {
         // Remember Frame, in which it was activated
         pImp->pFrame = pFrame;
-        pImp->bActive = sal_True;
+        pImp->bActive = true;
     }
 
     // Notify Subclass
@@ -584,7 +584,7 @@ void SfxShell::DoActivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
 
 
 
-void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
+void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, bool bMDI )
 
 /*  [Description]
 
@@ -613,7 +613,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
     {
         // deliver
         pImp->pFrame = 0;
-        pImp->bActive = sal_False;
+        pImp->bActive = false;
     }
 
     // Notify Subclass
@@ -622,7 +622,7 @@ void SfxShell::DoDeactivate_Impl( SfxViewFrame *pFrame, sal_Bool bMDI )
 
 
 
-sal_Bool SfxShell::IsActive() const
+bool SfxShell::IsActive() const
 {
     return pImp->bActive;
 }
@@ -631,7 +631,7 @@ sal_Bool SfxShell::IsActive() const
 
 void SfxShell::Activate
 (
-    sal_Bool    /*bMDI*/        /*  TRUE
+    bool    /*bMDI*/        /*  TRUE
                             the <SfxDispatcher>, on which the SfxShell is
                             located, is activated or the SfxShell instance
                             was pushed on an active SfxDispatcher.
@@ -651,7 +651,7 @@ void SfxShell::Activate
 
     [Cross-reference]
 
-    StarView SystemWindow::Activate(sal_Bool)
+    StarView SystemWindow::Activate(bool)
 */
 
 {
@@ -662,7 +662,7 @@ void SfxShell::Activate
 
 void SfxShell::Deactivate
 (
-    sal_Bool    /*bMDI*/        /*  TRUE
+    bool    /*bMDI*/        /*  TRUE
                             the <SfxDispatcher>, on which the SfxShell is
                             located, is inactivated or the SfxShell instance
                             was popped on an active SfxDispatcher.
@@ -682,7 +682,7 @@ void SfxShell::Deactivate
 
     [Cross-reference]
 
-    StarView SystemWindow::Dectivate(sal_Bool)
+    StarView SystemWindow::Dectivate(bool)
 */
 
 {
@@ -777,7 +777,7 @@ long ShellCall_Impl( void* pObj, void* pArg )
  */
 
 
-const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, sal_Bool bAsync )
+const SfxPoolItem* SfxShell::ExecuteSlot( SfxRequest& rReq, bool bAsync )
 {
     if( !bAsync )
         return ExecuteSlot( rReq, (SfxInterface*)0L );
@@ -1048,7 +1048,7 @@ void SfxShell::VerbExec(SfxRequest& rReq)
     SfxViewShell *pViewShell = GetViewShell();
     if ( pViewShell )
     {
-        sal_Bool bReadOnly = pViewShell->GetObjectShell()->IsReadOnly();
+        bool bReadOnly = pViewShell->GetObjectShell()->IsReadOnly();
         com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor > aList = pViewShell->GetVerbs();
         for (sal_Int32 n=0, nVerb=0; n<aList.getLength(); n++)
         {
@@ -1118,9 +1118,9 @@ SfxObjectShell* SfxShell::GetObjectShell()
 
 
 
-sal_Bool SfxShell::HasUIFeature( sal_uInt32 )
+bool SfxShell::HasUIFeature( sal_uInt32 )
 {
-    return sal_False;
+    return false;
 }
 
 long DispatcherUpdate_Impl( void*, void* pArg )
diff --git a/sfx2/source/dialog/styfitem.cxx b/sfx2/source/dialog/styfitem.cxx
index 9da42533ac16..58dee4128d7c 100644
--- a/sfx2/source/dialog/styfitem.cxx
+++ b/sfx2/source/dialog/styfitem.cxx
@@ -126,9 +126,9 @@ SfxStyleFamilies::~SfxStyleFamilies()
 
 
 
-sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId )
+bool SfxStyleFamilies::updateImages( const ResId& _rId )
 {
-    sal_Bool bSuccess = sal_False;
+    bool bSuccess = false;
 
     {
         ::svt::OLocalResourceAccess aLocalRes( _rId );
@@ -154,7 +154,7 @@ sal_Bool SfxStyleFamilies::updateImages( const ResId& _rId )
                 pItem->SetImage( aImages.GetImage( aImages.GetImageId( i ) ) );
             }
 
-            bSuccess = sal_True;
+            bSuccess = true;
         }
     }
 
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index f22ba538eaeb..7fc23cb4ea3a 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -198,13 +198,13 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
     Sequence< Reference< frame::XController > >                m_seqControllers         ;
     Reference< container::XIndexAccess >                       m_contViewData           ;
     sal_uInt16                                                 m_nControllerLockCount   ;
-    sal_Bool                                                   m_bClosed                ;
-    sal_Bool                                                   m_bClosing               ;
-    sal_Bool                                                   m_bSaving                ;
-    sal_Bool                                                   m_bSuicide               ;
-    sal_Bool                                                   m_bInitialized           ;
-    sal_Bool                                                   m_bExternalTitle         ;
-    sal_Bool                                                   m_bModifiedSinceLastSave ;
+    bool                                                       m_bClosed                ;
+    bool                                                       m_bClosing               ;
+    bool                                                       m_bSaving                ;
+    bool                                                       m_bSuicide               ;
+    bool                                                       m_bInitialized           ;
+    bool                                                       m_bExternalTitle         ;
+    bool                                                       m_bModifiedSinceLastSave ;
     Reference< view::XPrintable>                               m_xPrintable             ;
     Reference< script::provider::XScriptProvider >             m_xScriptProvider        ;
     Reference< ui::XUIConfigurationManager2 >                  m_xUIConfigurationManager;
@@ -221,13 +221,13 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument
             :   m_pObjectShell          ( pObjectShell  )
             ,   m_aInterfaceContainer   ( rMutex        )
             ,   m_nControllerLockCount  ( 0             )
-            ,   m_bClosed               ( sal_False     )
-            ,   m_bClosing              ( sal_False     )
-            ,   m_bSaving               ( sal_False     )
-            ,   m_bSuicide              ( sal_False     )
-            ,   m_bInitialized          ( sal_False     )
-            ,   m_bExternalTitle        ( sal_False     )
-            ,   m_bModifiedSinceLastSave( sal_False     )
+            ,   m_bClosed               ( false     )
+            ,   m_bClosing              ( false     )
+            ,   m_bSaving               ( false     )
+            ,   m_bSuicide              ( false     )
+            ,   m_bInitialized          ( false     )
+            ,   m_bExternalTitle        ( false     )
+            ,   m_bModifiedSinceLastSave( false     )
             ,   m_pStorageModifyListen  ( NULL          )
             ,   m_xTitleHelper          ()
             ,   m_xNumberedControllers  ()
@@ -453,13 +453,13 @@ class SfxSaveGuard
     public:
         SfxSaveGuard(const Reference< frame::XModel >&             xModel                      ,
                            IMPL_SfxBaseModel_DataContainer* pData                       ,
-                           sal_Bool                         bRejectConcurrentSaveRequest);
+                           bool                             bRejectConcurrentSaveRequest);
         ~SfxSaveGuard();
 };
 
 SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >&             xModel                      ,
                                  IMPL_SfxBaseModel_DataContainer* pData                       ,
-                                 sal_Bool                         bRejectConcurrentSaveRequest)
+                                 bool                             bRejectConcurrentSaveRequest)
     : m_xModel     (xModel)
     , m_pData      (pData )
     , m_pFramesLock(0     )
@@ -477,7 +477,7 @@ SfxSaveGuard::SfxSaveGuard(const Reference< frame::XModel >&             xModel
                 OUString("Concurrent save requests on the same document are not possible."),
                 Reference< XInterface >());
 
-    m_pData->m_bSaving = sal_True;
+    m_pData->m_bSaving = true;
     m_pFramesLock = new SfxOwnFramesLocker(m_pData->m_pObjectShell);
 }
 
@@ -487,7 +487,7 @@ SfxSaveGuard::~SfxSaveGuard()
     m_pFramesLock = 0;
     delete pFramesLock;
 
-    m_pData->m_bSaving = sal_False;
+    m_pData->m_bSaving = false;
 
     // m_bSuicide was set e.g. in case someone tried to close a document, while it was used for
     // storing at the same time. Further m_bSuicide was set to sal_True only if close(sal_True) was called.
@@ -499,7 +499,7 @@ SfxSaveGuard::~SfxSaveGuard()
     {
         // Reset this state. In case the new close() request is not accepted by someone else ...
         // it's not a good idea to have two "owners" for close .-)
-        m_pData->m_bSuicide = sal_False;
+        m_pData->m_bSuicide = false;
         try
         {
             Reference< util::XCloseable > xClose(m_xModel, UNO_QUERY);
@@ -893,7 +893,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const   OUString&
         // but _only_ before load() or initNew() methods
         if ( m_pData->m_pObjectShell.Is() && !m_pData->m_pObjectShell->GetMedium() )
         {
-            sal_Bool bEmb = sal_Bool();
+            sal_Bool bEmb(sal_False);
             if ( ( rArgs[0].Value >>= bEmb ) && bEmb )
                 m_pData->m_pObjectShell->SetCreateMode_Impl( SFX_CREATE_MODE_EMBEDDED );
         }
@@ -1395,14 +1395,14 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
     if ( m_pData->m_bSaving )
     {
         if (bDeliverOwnership)
-            m_pData->m_bSuicide = sal_True;
+            m_pData->m_bSuicide = true;
         throw util::CloseVetoException(
                 OUString("Cant close while saving."),
                 static_cast< util::XCloseable* >(this));
     }
 
     // no own objections against closing!
-    m_pData->m_bClosing = sal_True;
+    m_pData->m_bClosing = true;
     pContainer = m_pData->m_aInterfaceContainer.getContainer( ::getCppuType( ( const Reference< util::XCloseListener >*) NULL ) );
     if (pContainer!=NULL)
     {
@@ -1420,8 +1420,8 @@ void SAL_CALL SfxBaseModel::close( sal_Bool bDeliverOwnership ) throw (util::Clo
         }
     }
 
-    m_pData->m_bClosed = sal_True;
-    m_pData->m_bClosing = sal_False;
+    m_pData->m_bClosed = true;
+    m_pData->m_bClosing = false;
 
     dispose();
 }
@@ -1537,7 +1537,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const    Sequence< beans::PropertyValue >
     if ( m_pData->m_pObjectShell.Is() )
     {
         m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeSelf"  ) );
-        SfxSaveGuard aSaveGuard(this, m_pData, sal_False);
+        SfxSaveGuard aSaveGuard(this, m_pData, false);
 
         sal_Bool bCheckIn = sal_False;
         for ( sal_Int32 nInd = 0; nInd < aSeqArgs.getLength(); nInd++ )
@@ -1667,9 +1667,9 @@ void SAL_CALL SfxBaseModel::storeAsURL( const   OUString&                   rURL
     if ( m_pData->m_pObjectShell.Is() )
     {
         m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeAsURL"  ) );
-        SfxSaveGuard aSaveGuard(this, m_pData, sal_False);
+        SfxSaveGuard aSaveGuard(this, m_pData, false);
 
-        impl_store( rURL, rArgs, sal_False );
+        impl_store( rURL, rArgs, false );
 
         Sequence< beans::PropertyValue > aSequence ;
         TransformItems( SID_OPENDOC, *m_pData->m_pObjectShell->GetMedium()->GetItemSet(), aSequence );
@@ -1708,12 +1708,12 @@ void SAL_CALL SfxBaseModel::storeToURL( const   OUString&                   rURL
     if ( m_pData->m_pObjectShell.Is() )
     {
         m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeToURL"  ) );
-        SfxSaveGuard aSaveGuard(this, m_pData, sal_False);
-        impl_store( rURL, rArgs, sal_True );
+        SfxSaveGuard aSaveGuard(this, m_pData, false);
+        impl_store( rURL, rArgs, true );
     }
 }
 
-::sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception )
+sal_Bool SAL_CALL SfxBaseModel::wasModifiedSinceLastSave() throw ( RuntimeException, std::exception )
 {
     SfxModelGuard aGuard( *this );
     return m_pData->m_bModifiedSinceLastSave;
@@ -1724,11 +1724,11 @@ void SAL_CALL SfxBaseModel::storeToRecoveryFile( const OUString& i_TargetLocatio
     SfxModelGuard aGuard( *this );
 
     // delegate
-    SfxSaveGuard aSaveGuard( this, m_pData, sal_False );
-    impl_store( i_TargetLocation, i_MediaDescriptor, sal_True );
+    SfxSaveGuard aSaveGuard( this, m_pData, false );
+    impl_store( i_TargetLocation, i_MediaDescriptor, true );
 
     // no need for subsequent calls to storeToRecoveryFile, unless we're modified, again
-    m_pData->m_bModifiedSinceLastSave = sal_False;
+    m_pData->m_bModifiedSinceLastSave = false;
 }
 
 void SAL_CALL SfxBaseModel::recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const Sequence< PropertyValue >& i_MediaDescriptor ) throw ( RuntimeException, IOException, WrappedTargetException, std::exception )
@@ -2790,7 +2790,7 @@ void SfxBaseModel::Notify(          SfxBroadcaster& rBC     ,
             {
                 impl_getPrintHelper();
                 ListenForStorage_Impl( m_pData->m_pObjectShell->GetStorage() );
-                m_pData->m_bModifiedSinceLastSave = sal_False;
+                m_pData->m_bModifiedSinceLastSave = false;
             }
             break;
 
@@ -2810,7 +2810,7 @@ void SfxBaseModel::Notify(          SfxBroadcaster& rBC     ,
             case SFX_EVENT_DOCCREATED:
             {
                 impl_getPrintHelper();
-                m_pData->m_bModifiedSinceLastSave = sal_False;
+                m_pData->m_bModifiedSinceLastSave = false;
             }
             break;
 
@@ -2884,12 +2884,12 @@ SfxObjectShell* SfxBaseModel::GetObjectShell() const
 //  public impl.
 
 
-sal_Bool SfxBaseModel::IsInitialized() const
+bool SfxBaseModel::IsInitialized() const
 {
     if ( !m_pData || !m_pData->m_pObjectShell )
     {
         OSL_FAIL( "SfxBaseModel::IsInitialized: this should have been caught earlier!" );
-        return sal_False;
+        return false;
     }
 
     return m_pData->m_pObjectShell->GetMedium() != NULL;
@@ -2903,7 +2903,7 @@ void SfxBaseModel::MethodEntryCheck( const bool i_mustBeInitialized ) const
         throw lang::NotInitializedException( OUString(), *const_cast< SfxBaseModel* >( this ) );
 }
 
-sal_Bool SfxBaseModel::impl_isDisposed() const
+bool SfxBaseModel::impl_isDisposed() const
 {
     return ( m_pData == NULL ) ;
 }
@@ -2927,7 +2927,7 @@ OUString SfxBaseModel::GetMediumFilterName_Impl()
 
 void SfxBaseModel::impl_store(  const   OUString&                   sURL            ,
                                 const   Sequence< beans::PropertyValue >&  seqArguments    ,
-                                        sal_Bool                    bSaveTo         )
+                                        bool                        bSaveTo         )
 {
     if( sURL.isEmpty() )
         throw frame::IllegalArgumentIOException();
@@ -3284,7 +3284,7 @@ void SfxBaseModel::notifyEvent( const document::EventObject& aEvent ) const
 }
 
 /** returns true if someone added a XEventListener to this XEventBroadcaster */
-sal_Bool SfxBaseModel::hasEventListeners() const
+bool SfxBaseModel::hasEventListeners() const
 {
     return !impl_isDisposed() && (NULL != m_pData->m_aInterfaceContainer.getContainer( ::getCppuType((const Reference< document::XEventListener >*)0) ) );
 }
@@ -3455,12 +3455,12 @@ OUString SfxBaseModel::getRuntimeUID() const
     return m_pData->m_sRuntimeUID;
 }
 
-sal_Bool SfxBaseModel::hasValidSignatures() const
+bool SfxBaseModel::hasValidSignatures() const
 {
     SolarMutexGuard aGuard;
     if ( m_pData->m_pObjectShell.Is() )
         return ( m_pData->m_pObjectShell->ImplGetSignatureState( false ) == SIGNATURESTATE_SIGNATURES_OK );
-    return sal_False;
+    return false;
 }
 
 void SfxBaseModel::getGrabBagItem(com::sun::star::uno::Any& rVal) const
@@ -4034,7 +4034,7 @@ void SAL_CALL SfxBaseModel::setTitle( const OUString& sTitle )
     SfxModelGuard aGuard( *this );
 
     impl_getTitleHelper()->setTitle (sTitle);
-    m_pData->m_bExternalTitle = sal_True;
+    m_pData->m_bExternalTitle = true;
 }
 
 
diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index b5a4ebb349c9..edade4ae15d8 100644
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -390,7 +390,7 @@ void SfxViewFrame::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY
     GetViewShell()->SetZoomFactor( rZoomX, rZoomY );
 }
 
-void SfxViewFrame::Activate( sal_Bool bMDI )
+void SfxViewFrame::Activate( bool bMDI )
 {
     DBG_ASSERT(GetViewShell(), "No Shell");
     if ( bMDI )
@@ -398,7 +398,7 @@ void SfxViewFrame::Activate( sal_Bool bMDI )
 //(mba): here maybe as in Beanframe NotifyEvent ?!
 }
 
-void SfxViewFrame::Deactivate( sal_Bool bMDI )
+void SfxViewFrame::Deactivate( bool bMDI )
 {
     DBG_ASSERT(GetViewShell(), "No Shell");
     if ( bMDI )
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index beb399352f04..59a0e8a54db9 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -983,7 +983,7 @@ SfxInPlaceClient* SfxViewShell::GetUIActiveClient() const
 
 
 
-void SfxViewShell::Activate( sal_Bool bMDI )
+void SfxViewShell::Activate( bool bMDI )
 {
     if ( bMDI )
     {
@@ -997,7 +997,7 @@ void SfxViewShell::Activate( sal_Bool bMDI )
 
 
 
-void SfxViewShell::Deactivate(sal_Bool /*bMDI*/)
+void SfxViewShell::Deactivate(bool /*bMDI*/)
 {
 }