sfx2: sal_Bool->bool

Change-Id: I87c5a180566e9da185c2992844e6522e82c17747

22 files changed, 89 insertions, 89 deletions

diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index d1211c4f6aea..63de29cdc04d 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -858,7 +858,7 @@ LanguageType SdDrawDocument::GetLanguage( const sal_uInt16 nId ) const
 IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
 {
     if( mpDocSh )
-        mpDocSh->SetWaitCursor( sal_True );
+        mpDocSh->SetWaitCursor( true );
 
     sal_Bool bChanged = IsChanged();        // remember this
 
@@ -890,7 +890,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
     SetChanged(bChanged);
 
     if( mpDocSh )
-        mpDocSh->SetWaitCursor( sal_False );
+        mpDocSh->SetWaitCursor( false );
     return 0;
 }
 
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index f8654f0dbe15..b7c9d83f3df6 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -1393,7 +1393,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
                                    sal_Bool bCheckMasters)
 {
     if( mpDocSh )
-        mpDocSh->SetWaitCursor( sal_True );
+        mpDocSh->SetWaitCursor( true );
 
     ::svl::IUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
 
@@ -1467,7 +1467,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
             pUndoMgr->LeaveListAction();
 
             if( mpDocSh )
-                mpDocSh->SetWaitCursor( sal_False );
+                mpDocSh->SetWaitCursor( false );
 
             OSL_FAIL( "SdDrawDocument::SetMasterPage() failed!" );
 
@@ -1892,7 +1892,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
         pUndoMgr->LeaveListAction();
 
     if( mpDocSh )
-        mpDocSh->SetWaitCursor( sal_False );
+        mpDocSh->SetWaitCursor( false );
 }
 
 void SdDrawDocument::Merge(SdrModel& rSourceModel,
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index f8429c582333..71a2dc210ee6 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1353,13 +1353,13 @@ void ModifyGuard::init()
     mbIsDocumentChanged = mpDoc ? mpDoc->IsChanged() : false;
 
     if( mbIsEnableSetModified )
-        mpDocShell->EnableSetModified( sal_False );
+        mpDocShell->EnableSetModified( false );
 }
 
 ModifyGuard::~ModifyGuard()
 {
     if( mbIsEnableSetModified )
-        mpDocShell->EnableSetModified( sal_True );
+        mpDocShell->EnableSetModified( true );
 
     if( mpDoc && (mpDoc->IsChanged() != mbIsDocumentChanged) )
         mpDoc->SetChanged(mbIsDocumentChanged);
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 38ff219d8124..16600d157e4c 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -801,7 +801,7 @@ void HtmlExport::ExportWebCast()
     mnPagesWritten = 0;
     InitProgress( mnSdPageCount + 9 );
 
-    mpDocSh->SetWaitCursor( sal_True );
+    mpDocSh->SetWaitCursor( true );
 
     CreateFileNames();
 
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 2e1c6fd5d246..5fa4be3d37db 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -648,7 +648,7 @@ void AnnotationWindow::Deactivate()
                 if( mpDoc->IsUndoEnabled() )
                     mpDoc->EndUndo();
 
-                DocView()->GetDocSh()->SetModified(sal_True);
+                DocView()->GetDocSh()->SetModified(true);
             }
 
         }
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index d4cd23b18792..61f4030c8c50 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -707,7 +707,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
 
                             pDoc->SetChanged(!bIsDocEmpty);
 
-                            pDocShell->SetUseUserData(sal_True);
+                            pDocShell->SetUseUserData(true);
 
                             // clear UNDO stack after autopilot
                             pDocShell->ClearUndoBuffer();
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 24ba06bb54a2..71f2251d745a 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -613,7 +613,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject
                 pEmbObj->SetupStorage( xWorkStore, SOFFICE_FILEFORMAT_CURRENT, false );
                 // mba: no relative ULRs for clipboard!
                 SfxMedium aMedium( xWorkStore, OUString() );
-                bRet = pEmbObj->DoSaveObjectAs( aMedium, sal_False );
+                bRet = pEmbObj->DoSaveObjectAs( aMedium, false );
                 pEmbObj->DoSaveCompleted();
 
                 uno::Reference< embed::XTransactedObject > xTransact( xWorkStore, uno::UNO_QUERY );
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index 3ccf8ab54a82..eb759625df3d 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -709,7 +709,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName )
 
         ::sd::DrawDocShell* pCurrentDocShell =
               PTR_CAST(::sd::DrawDocShell, SfxObjectShell::Current() );
-        SfxObjectShell* pSfxDocShell = SfxObjectShell::GetFirst(0, sal_False);
+        SfxObjectShell* pSfxDocShell = SfxObjectShell::GetFirst(0, false);
         while( pSfxDocShell )
         {
             ::sd::DrawDocShell* pDocShell = PTR_CAST(::sd::DrawDocShell, pSfxDocShell );
@@ -738,7 +738,7 @@ void SdNavigatorWin::RefreshDocumentLB( const OUString* pDocName )
 
                 maDocList.push_back( aInfo );
             }
-            pSfxDocShell = SfxObjectShell::GetNext( *pSfxDocShell, 0 , sal_False );
+            pSfxDocShell = SfxObjectShell::GetNext( *pSfxDocShell, 0, false );
         }
     }
     maLbDocs.SelectEntryPos( nPos );
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 7ad6dc631ae2..6fdab807f8de 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -134,7 +134,7 @@ Bitmap SdVectorizeDlg::GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale )
 
 void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
 {
-    mpDocSh->SetWaitCursor( sal_True );
+    mpDocSh->SetWaitCursor( true );
     m_pPrgs->SetValue( 0 );
 
     Fraction    aScale;
@@ -202,7 +202,7 @@ void SdVectorizeDlg::Calculate( Bitmap& rBmp, GDIMetaFile& rMtf )
     }
 
     m_pPrgs->SetValue( 0 );
-    mpDocSh->SetWaitCursor( sal_False );
+    mpDocSh->SetWaitCursor( false );
 }
 
 void SdVectorizeDlg::AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 6027f7374e50..1a4296ad9d50 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -242,9 +242,9 @@ void DrawDocShell::UpdateRefDevice()
 /**
  * Creates new document, opens streams
  */
-sal_Bool DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
+bool DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
 {
-    sal_Bool bRet = SfxObjectShell::InitNew( xStorage );
+    bool bRet = SfxObjectShell::InitNew( xStorage );
 
     Rectangle aVisArea( Point(0, 0), Size(14100, 10000) );
     SetVisArea(aVisArea);
@@ -262,12 +262,12 @@ sal_Bool DrawDocShell::InitNew( const ::com::sun::star::uno::Reference< ::com::s
 /**
  * loads pools and document
  */
-sal_Bool DrawDocShell::Load( SfxMedium& rMedium )
+bool DrawDocShell::Load( SfxMedium& rMedium )
 {
     mbNewDocument = sal_False;
 
     sal_Bool    bRet = sal_False;
-    bool    bStartPresentation = false;
+    bool       bStartPresentation = false;
     ErrCode nError = ERRCODE_NONE;
 
     SfxItemSet* pSet = rMedium.GetItemSet();
@@ -314,7 +314,7 @@ sal_Bool DrawDocShell::Load( SfxMedium& rMedium )
         FinishedLoading( SFX_LOADED_ALL );
 
         const INetURLObject aUrl;
-        SfxObjectShell::SetAutoLoad( aUrl, 0, sal_False );
+        SfxObjectShell::SetAutoLoad( aUrl, 0, false );
     }
     else
     {
@@ -341,7 +341,7 @@ sal_Bool DrawDocShell::Load( SfxMedium& rMedium )
 /**
  * loads content for organizer
  */
-sal_Bool DrawDocShell::LoadFrom( SfxMedium& rMedium )
+bool DrawDocShell::LoadFrom( SfxMedium& rMedium )
 {
     mbNewDocument = sal_False;
 
@@ -355,7 +355,7 @@ sal_Bool DrawDocShell::LoadFrom( SfxMedium& rMedium )
 
     // TODO/LATER: nobody is interested in the error code?!
     ErrCode nError = ERRCODE_NONE;
-    sal_Bool bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Organizer, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError );
+    bool bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Organizer, SotStorage::GetVersion( rMedium.GetStorage() ) ).Import( nError );
 
 
     // tell SFX to change viewshell when in preview mode
@@ -404,15 +404,15 @@ bool DrawDocShell::ImportFrom(SfxMedium &rMedium,
 /**
  * load from a foreign format
  */
-sal_Bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
+bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
 {
     mbNewDocument = sal_False;
 
-    const OUString    aFilterName( rMedium.GetFilter()->GetFilterName() );
-    sal_Bool            bRet = sal_False;
-    bool    bStartPresentation = false;
+    const OUString  aFilterName( rMedium.GetFilter()->GetFilterName() );
+    bool            bRet = false;
+    bool            bStartPresentation = false;
 
-    SetWaitCursor( sal_True );
+    SetWaitCursor( true );
 
     SfxItemSet* pSet = rMedium.GetItemSet();
     if( pSet )
@@ -479,7 +479,7 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
         if( pMediumSet )
             pMediumSet->Put( SfxUInt16Item( SID_VIEW_ID, 5 ) );
     }
-    SetWaitCursor( sal_False );
+    SetWaitCursor( false );
 
     // tell SFX to change viewshell when in preview mode
     if( IsPreview() || bStartPresentation )
@@ -495,7 +495,7 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium& rMedium )
 /**
  * Writes pools and document to the open streams
  */
-sal_Bool DrawDocShell::Save()
+bool DrawDocShell::Save()
 {
     mpDoc->StopWorkStartupDelay();
 
@@ -503,7 +503,7 @@ sal_Bool DrawDocShell::Save()
     if( GetCreateMode() == SFX_CREATE_MODE_STANDARD )
         SfxObjectShell::SetVisArea( Rectangle() );
 
-    sal_Bool bRet = SfxObjectShell::Save();
+    bool bRet = SfxObjectShell::Save();
 
     if( bRet )
     {
@@ -519,7 +519,7 @@ sal_Bool DrawDocShell::Save()
 /**
  * Writes pools and document to the provided storage
  */
-sal_Bool DrawDocShell::SaveAs( SfxMedium& rMedium )
+bool DrawDocShell::SaveAs( SfxMedium& rMedium )
 {
     mpDoc->setDocAccTitle(OUString());
     SfxViewFrame* pFrame1 = SfxViewFrame::GetFirst( this );
@@ -542,7 +542,7 @@ sal_Bool DrawDocShell::SaveAs( SfxMedium& rMedium )
         SfxObjectShell::SetVisArea( Rectangle() );
 
     sal_uInt32  nVBWarning = ERRCODE_NONE;
-    sal_Bool    bRet = SfxObjectShell::SaveAs( rMedium );
+    bool    bRet = SfxObjectShell::SaveAs( rMedium );
 
     if( bRet )
     {
@@ -560,9 +560,9 @@ sal_Bool DrawDocShell::SaveAs( SfxMedium& rMedium )
 /**
  * save to foreign format
  */
-sal_Bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
+bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if( mpDoc->GetPageCount() )
     {
@@ -621,9 +621,9 @@ sal_Bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
  * Reopen own streams to ensure that nobody else can prevent use from opening
  * them.
  */
-sal_Bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
+bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
 
     if( SfxObjectShell::SaveCompleted(xStorage) )
     {
@@ -646,7 +646,7 @@ sal_Bool DrawDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::
             }
         }
 
-        bRet = sal_True;
+        bRet = true;
 
         SfxViewFrame* pFrame = ( mpViewShell && mpViewShell->GetViewFrame() ) ?
                                mpViewShell->GetViewFrame() :
@@ -1080,7 +1080,7 @@ sal_Bool DrawDocShell::GotoTreeBookmark(const OUString& rBookmark)
 /**
  * If it should become a document template.
  */
-sal_Bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium )
+bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium )
 {
 
     const SfxFilter* pFilter = rMedium.GetFilter();
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index a838deaaac72..518eabf0712b 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -289,7 +289,7 @@ void DrawDocShell::GetState(SfxItemSet &rSet)
     }
 }
 
-void DrawDocShell::InPlaceActivate( sal_Bool bActive )
+void DrawDocShell::InPlaceActivate( bool bActive )
 {
     ViewShell* pViewSh = NULL;
     SfxViewShell* pSfxViewSh = NULL;
@@ -407,7 +407,7 @@ void DrawDocShell::ApplySlotFilter() const
     }
 }
 
-void DrawDocShell::SetModified( sal_Bool bSet /* = sal_True */ )
+void DrawDocShell::SetModified( bool bSet /* = true */ )
 {
     SfxObjectShell::SetModified( bSet );
 
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index a2b1b1de2e3a..d2453fcf022d 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -176,7 +176,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
             aStr += " " + SD_RESSTR( STR_UNDO_COPYOBJECTS );
 
             pProgress = new SfxProgress( mpDocSh, aStr, nNumber );
-            mpDocSh->SetWaitCursor( sal_True );
+            mpDocSh->SetWaitCursor( true );
             bWaiting = sal_True;
         }
 
@@ -281,7 +281,7 @@ void FuCopy::DoExecute( SfxRequest& rReq )
             delete pProgress;
 
         if ( bWaiting )
-            mpDocSh->SetWaitCursor( sal_False );
+            mpDocSh->SetWaitCursor( false );
 
         // show handles
         mpView->AdjustMarkHdl(); //HMH sal_True );
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 95300a078bc3..b9de965cba98 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -247,7 +247,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
             aFilterName = pFilterName->GetValue ();
     }
 
-    mpDocSh->SetWaitCursor( sal_True );
+    mpDocSh->SetWaitCursor( true );
 
     SfxMedium*          pMedium = new SfxMedium( aFile, STREAM_READ | STREAM_NOCREATE );
     const SfxFilter*    pFilter = NULL;
@@ -303,7 +303,7 @@ void FuInsertFile::DoExecute( SfxRequest& rReq )
         }
     }
 
-    mpDocSh->SetWaitCursor( sal_False );
+    mpDocSh->SetWaitCursor( false );
 
     if( !bInserted )
     {
@@ -319,7 +319,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
 {
     sal_Bool bOK = sal_False;
 
-    mpDocSh->SetWaitCursor( sal_False );
+    mpDocSh->SetWaitCursor( false );
     SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
     AbstractSdInsertPagesObjsDlg* pDlg = pFact ? pFact->CreateSdInsertPagesObjsDlg( NULL, mpDoc, pMedium, aFile ) : 0;
 
@@ -335,7 +335,7 @@ sal_Bool FuInsertFile::InsSDDinDrMode(SfxMedium* pMedium)
 
     GetpApp()->SetDefDialogParent(pDefParent);
 
-    mpDocSh->SetWaitCursor( sal_True );
+    mpDocSh->SetWaitCursor( true );
 
     if( nRet == RET_OK )
     {
@@ -418,10 +418,10 @@ void FuInsertFile::InsTextOrRTFinDrMode(SfxMedium* pMedium)
     if( !pDlg )
         return;
 
-    mpDocSh->SetWaitCursor( sal_False );
+    mpDocSh->SetWaitCursor( false );
 
     sal_uInt16 nRet = pDlg->Execute();
-    mpDocSh->SetWaitCursor( sal_True );
+    mpDocSh->SetWaitCursor( true );
 
     if( nRet == RET_OK )
     {
@@ -629,7 +629,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
             pPara = pOutliner->GetParagraph( ++nPos );
         }
 
-        mpDocSh->SetWaitCursor( sal_False );
+        mpDocSh->SetWaitCursor( false );
 
         SfxProgress* pProgress = new SfxProgress( mpDocSh, SD_RESSTR(STR_CREATE_PAGES), nNewPages);
         if( pProgress )
@@ -678,7 +678,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium)
         if( pProgress )
             delete pProgress;
 
-        mpDocSh->SetWaitCursor( sal_True );
+        mpDocSh->SetWaitCursor( true );
     }
 
     delete pOutliner;
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index d1786136c620..05f015109155 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -176,7 +176,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
 
     if (!bError)
     {
-        mpDocSh->SetWaitCursor( sal_True );
+        mpDocSh->SetWaitCursor( true );
 
         /* Here, we only exchange masterpages, therefore the current page
            remains the current page. To prevent calling PageOrderChangedHint
@@ -250,7 +250,7 @@ void FuPresentationLayout::DoExecute( SfxRequest& rReq )
             pDrawViewSh->ChangeEditMode( eMode, bLayer );
         }
 
-        mpDocSh->SetWaitCursor( sal_False );
+        mpDocSh->SetWaitCursor( false );
     }
 }
 
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 055392ad8ec8..031ed17217f0 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -73,19 +73,19 @@ public:
     void                    UpdateRefDevice();
     virtual void            Activate( sal_Bool bMDI );
     virtual void            Deactivate( sal_Bool bMDI );
-    virtual sal_Bool            InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+    virtual bool            InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
     virtual bool            ImportFrom(SfxMedium &rMedium,
             css::uno::Reference<css::text::XTextRange> const& xInsertPosition)
         SAL_OVERRIDE;
-    virtual sal_Bool            ConvertFrom( SfxMedium &rMedium );
-    virtual sal_Bool            Save();
-    virtual sal_Bool            SaveAsOwnFormat( SfxMedium& rMedium );
-    virtual sal_Bool            ConvertTo( SfxMedium &rMedium );
-    virtual sal_Bool            SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+    virtual bool            ConvertFrom( SfxMedium &rMedium );
+    virtual bool            Save();
+    virtual bool            SaveAsOwnFormat( SfxMedium& rMedium );
+    virtual bool            ConvertTo( SfxMedium &rMedium );
+    virtual bool            SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
 
-    virtual sal_Bool        Load( SfxMedium &rMedium  );
-    virtual sal_Bool        LoadFrom( SfxMedium& rMedium );
-    virtual sal_Bool        SaveAs( SfxMedium &rMedium  );
+    virtual bool            Load( SfxMedium &rMedium  );
+    virtual bool            LoadFrom( SfxMedium& rMedium );
+    virtual bool            SaveAs( SfxMedium &rMedium  );
 
     virtual Rectangle       GetVisArea(sal_uInt16 nAspect) const;
     virtual void            Draw(OutputDevice*, const JobSetup& rSetup, sal_uInt16 nAspect = ASPECT_CONTENT);
@@ -96,7 +96,7 @@ public:
     virtual SfxStyleSheetBasePool* GetStyleSheetPool();
     virtual Size            GetFirstPageSize();
     virtual void            FillClass(SvGlobalName* pClassName, sal_uInt32*  pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const;
-    virtual void            SetModified( sal_Bool = sal_True );
+    virtual void            SetModified( bool = true );
     virtual SfxDocumentInfoDialog*  CreateDocumentInfoDialog( ::Window *pParent,
                                                               const SfxItemSet &rSet );
 
@@ -221,7 +221,7 @@ protected:
 
     bool                    mbOwnDocument;          // if true, we own mpDoc and will delete it in our d'tor
     void                    Construct(bool bClipboard);
-    virtual void            InPlaceActivate( sal_Bool bActive );
+    virtual void            InPlaceActivate( bool bActive );
 public:
     virtual void setDocAccTitle( const OUString& rTitle );
     virtual const OUString getDocAccTitle() const;
diff --git a/sd/source/ui/unoidl/UnoDocumentSettings.cxx b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
index d3e65e9f8d19..802caaa90c21 100644
--- a/sd/source/ui/unoidl/UnoDocumentSettings.cxx
+++ b/sd/source/ui/unoidl/UnoDocumentSettings.cxx
@@ -458,7 +458,7 @@ throw (UnknownPropertyException, PropertyVetoException,
 
             case HANDLE_APPLYUSERDATA:
                 {
-                    sal_Bool bApplyUserData = sal_False;
+                    bool bApplyUserData = false;
                     if( *pValues >>= bApplyUserData )
                     {
                         bChanged = ( bApplyUserData != pDocSh->IsUseUserData() );
@@ -858,7 +858,7 @@ throw (UnknownPropertyException, PropertyVetoException,
             }
             case HANDLE_UPDATEFROMTEMPLATE:
             {
-                sal_Bool value = sal_False;
+                bool value = false;
                 if( *pValues >>= value )
                 {
                     bChanged = ( value != pDocSh->IsQueryLoadTemplate() );
@@ -888,7 +888,7 @@ throw (UnknownPropertyException, PropertyVetoException,
             // --> #i33095#
             case HANDLE_LOAD_READONLY:
             {
-                sal_Bool bNewValue = sal_False;
+                bool bNewValue = false;
                 if ( *pValues >>= bNewValue )
                 {
                     bChanged = ( pDocSh->IsLoadReadonly() != bNewValue );
@@ -900,7 +900,7 @@ throw (UnknownPropertyException, PropertyVetoException,
 
             case HANDLE_SAVE_VERSION:
             {
-                sal_Bool bNewValue = sal_False;
+                bool bNewValue = false;
                 if ( *pValues >>= bNewValue )
                 {
                     bChanged = ( pDocSh->IsSaveVersionOnClose() != bNewValue );
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 89b62d27fa01..c59b1600ff59 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -387,7 +387,7 @@ bool Outliner::SpellNextDocument (void)
     {
         if (mpView->ISA(OutlineView))
             ((OutlineView*)mpView)->PrepareClose(sal_False);
-        mpDrawDocument->GetDocSh()->SetWaitCursor( sal_True );
+        mpDrawDocument->GetDocSh()->SetWaitCursor( true );
 
         Initialize (true);
 
@@ -397,7 +397,7 @@ bool Outliner::SpellNextDocument (void)
             pOutlinerView->SetWindow(mpWindow);
         ProvideNextTextObject ();
 
-        mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False );
+        mpDrawDocument->GetDocSh()->SetWaitCursor( false );
         ClearModifyFlag();
     }
 
@@ -460,7 +460,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem)
 {
     sal_Bool bEndOfSearch = sal_True;
 
-    mpDrawDocument->GetDocSh()->SetWaitCursor( sal_True );
+    mpDrawDocument->GetDocSh()->SetWaitCursor( true );
     if (mbPrepareSpellingPending)
         PrepareSpelling();
     ViewShellBase* pBase = PTR_CAST(ViewShellBase,SfxViewShell::Current());
@@ -530,7 +530,7 @@ bool Outliner::StartSearchAndReplace (const SvxSearchItem* pSearchItem)
         }
     }
     else
-        mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False );
+        mpDrawDocument->GetDocSh()->SetWaitCursor( false );
 
     return bEndOfSearch;
 }
@@ -713,7 +713,7 @@ bool Outliner::SearchAndReplaceOnce (void)
                         "SearchAndReplace without valid view!" );
                     if ( ! GetEditEngine().HasView( &pOutlinerView->GetEditView() ) )
                     {
-                        mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False );
+                        mpDrawDocument->GetDocSh()->SetWaitCursor( false );
                         return true;
                     }
 
@@ -724,7 +724,7 @@ bool Outliner::SearchAndReplaceOnce (void)
         }
         else if (pViewShell->ISA(OutlineViewShell))
         {
-            mpDrawDocument->GetDocSh()->SetWaitCursor (sal_False);
+            mpDrawDocument->GetDocSh()->SetWaitCursor(false);
             // The following loop is executed more then once only when a
             // wrap arround search is done.
             while (true)
@@ -745,7 +745,7 @@ bool Outliner::SearchAndReplaceOnce (void)
         }
     }
 
-    mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False );
+    mpDrawDocument->GetDocSh()->SetWaitCursor( false );
 
     return mbEndOfSearch;
 }
@@ -1251,7 +1251,7 @@ void Outliner::PrepareSearchAndReplace (void)
 
         EnterEditMode ();
 
-        mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False );
+        mpDrawDocument->GetDocSh()->SetWaitCursor( false );
         // Start seach at the right end of the current object's text
         // depending on the search direction.
         OutlinerView* pOutlinerView = mpImpl->GetOutlinerView();
@@ -1590,7 +1590,7 @@ void Outliner::PrepareConversion (void)
 
         EnterEditMode ();
 
-        mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False );
+        mpDrawDocument->GetDocSh()->SetWaitCursor( false );
         // Start seach at the right end of the current object's text
         // depending on the search direction.
     }
@@ -1649,7 +1649,7 @@ bool Outliner::ConvertNextDocument()
     if (pViewShell && pViewShell->ISA(OutlineViewShell) )
         return false;
 
-    mpDrawDocument->GetDocSh()->SetWaitCursor( sal_True );
+    mpDrawDocument->GetDocSh()->SetWaitCursor( true );
 
     Initialize ( true );
 
@@ -1661,7 +1661,7 @@ bool Outliner::ConvertNextDocument()
     }
     ProvideNextTextObject ();
 
-    mpDrawDocument->GetDocSh()->SetWaitCursor( sal_False );
+    mpDrawDocument->GetDocSh()->SetWaitCursor( false );
     ClearModifyFlag();
 
     // for text conversion we automaticly wrap around one
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 8d54b697e5f6..1fa6374a3ebd 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -177,7 +177,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
                     ::Outliner* pOutliner = pOV->GetOutliner();
 
                     pOutliner->SetUpdateMode(false);
-                    mpDocSh->SetWaitCursor( sal_True );
+                    mpDocSh->SetWaitCursor( true );
 
                     // replace placeholder by template name
                     OUString aComment(SD_RESSTR(STR_UNDO_CHANGE_PRES_OBJECT));
@@ -236,7 +236,7 @@ sal_Bool DrawView::SetAttributes(const SfxItemSet& rSet,
                             pPara = pOutliner->GetParagraph( 0 );  // Put NumBulletItem in outline level 1
                     }
 
-                    mpDocSh->SetWaitCursor( sal_False );
+                    mpDocSh->SetWaitCursor( false );
                     pOV->GetOutliner()->SetUpdateMode(true);
 
                     mpDocSh->GetUndoManager()->LeaveListAction();
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index ad9d93146d88..597a3dd22adf 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.cxx
@@ -75,7 +75,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
     if ( !pGalleryItem )
         return;
 
-    GetDocSh()->SetWaitCursor( sal_True );
+    GetDocSh()->SetWaitCursor( true );
 
     sal_Int8 nType( pGalleryItem->GetType() );
     // insert graphic
@@ -180,7 +180,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
         GetViewFrame()->GetDispatcher()->Execute( SID_INSERT_AVMEDIA, SFX_CALLMODE_SYNCHRON, &aMediaURLItem, 0L );
     }
 
-    GetDocSh()->SetWaitCursor( sal_False );
+    GetDocSh()->SetWaitCursor( false );
 }
 
 
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index da812e4d30f5..d981d7a55a8c 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -796,7 +796,7 @@ void DrawViewShell::Notify (SfxBroadcaster&, const SfxHint& rHint)
         }
 
         // Turn on design mode when document is not read-only.
-        if (GetDocSh()->IsReadOnly() != mbReadOnly )
+        if ((GetDocSh()->IsReadOnly() ? 1 : 0) != mbReadOnly )
         {
             mbReadOnly = GetDocSh()->IsReadOnly();
 
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 76abf4f257a0..692a70e76554 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -617,7 +617,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
             }
             else
             {
-                mpDocSh->SetWaitCursor( sal_True );
+                mpDocSh->SetWaitCursor( true );
             }
         }
 
@@ -641,7 +641,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner )
                 mpProgress = NULL;
             }
             else
-                mpDocSh->SetWaitCursor( sal_False );
+                mpDocSh->SetWaitCursor( false );
 
             mnPagesToProcess = 0;
             mnPagesProcessed = 0;
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 01626f7192e8..7c319ba9944c 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -736,7 +736,7 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
 
     SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX);
     sal_Bool bAbort = sal_False;
-    GetDocSh()->SetWaitCursor( sal_True );
+    GetDocSh()->SetWaitCursor( true );
     SfxViewShell* pViewShell = GetViewShell();
     OSL_ASSERT (pViewShell!=NULL);
     bool bChangeDefaultsForChart = false;
@@ -777,12 +777,12 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
             aName = "";
 
             // call dialog "insert OLE object"
-            GetDocSh()->SetWaitCursor( sal_False );
+            GetDocSh()->SetWaitCursor( false );
             pViewShell->GetViewFrame()->GetDispatcher()->Execute(
                 SID_INSERT_OBJECT,
                 SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD);
             xObj = pObj->GetObjRef();
-            GetDocSh()->SetWaitCursor( sal_True );
+            GetDocSh()->SetWaitCursor( true );
 
             if (!xObj.is())
             {
@@ -886,7 +886,7 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
             SID_NAVIGATOR_STATE, true, false);
     }
 
-    GetDocSh()->SetWaitCursor( sal_False );
+    GetDocSh()->SetWaitCursor( false );
 
     if (aErrCode != 0 && !bAbort)
     {