sd: sal_Bool->bool

Change-Id: I3172a42f6b6abe434ffe0475d1201ff50b6c06ea

17 files changed, 227 insertions, 226 deletions

diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 801eed4a5e87..53356febc11f 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -140,7 +140,7 @@ CustomAnimationEffect::CustomAnimationEffect( const ::com::sun::star::uno::Refer
     mnIterateType(0),
     mfIterateInterval(0.0),
     mnParaDepth( -1 ),
-    mbHasText(sal_False),
+    mbHasText(false),
     mfAcceleration( 1.0 ),
     mfDecelerate( 1.0 ),
     mbAutoReverse(false),
@@ -555,7 +555,7 @@ bool CustomAnimationEffect::checkForText()
                 Reference< XEnumeration > xEnumeration( xEA->createEnumeration(), UNO_QUERY );
                 if( xEnumeration.is() )
                 {
-                    sal_Bool bHasText = xEnumeration->hasMoreElements();
+                    bool bHasText = xEnumeration->hasMoreElements();
                     bChange |= bHasText != mbHasText;
                     mbHasText = bHasText;
 
@@ -584,7 +584,7 @@ bool CustomAnimationEffect::checkForText()
     else
     {
         maTarget >>= xText;
-        sal_Bool bHasText = xText.is() && !xText->getString().isEmpty();
+        bool bHasText = xText.is() && !xText->getString().isEmpty();
         bChange |= bHasText != mbHasText;
         mbHasText = bHasText;
     }
@@ -805,7 +805,7 @@ void CustomAnimationEffect::setDecelerate( double fDecelerate )
     }
 }
 
-void CustomAnimationEffect::setAutoReverse( sal_Bool bAutoReverse )
+void CustomAnimationEffect::setAutoReverse( bool bAutoReverse )
 {
     if( mxNode.is() ) try
     {
@@ -827,7 +827,7 @@ void CustomAnimationEffect::replaceNode( const ::com::sun::star::uno::Reference<
     double fDuration = mfDuration;
     double fAcceleration = mfAcceleration;
     double fDecelerate = mfDecelerate ;
-    sal_Bool bAutoReverse = mbAutoReverse;
+    bool bAutoReverse = mbAutoReverse;
     Reference< XAudio > xAudio( mxAudio );
     sal_Int16 nIterateType = mnIterateType;
     double fIterateInterval = mfIterateInterval;
@@ -946,7 +946,7 @@ Reference< XAnimationNode > CustomAnimationEffect::createAfterEffectNode() const
     }
     else
     {
-        aTo = makeAny( (sal_Bool)sal_False );
+        aTo = makeAny( false );
         aAttributeName = "Visibility";
     }
 
@@ -2393,7 +2393,7 @@ void EffectSequenceHelper::updateTextGroups()
     }
 }
 
-CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, sal_Bool bAnimateForm, sal_Bool bTextReverse )
+CustomAnimationTextGroupPtr EffectSequenceHelper::createTextGroup( CustomAnimationEffectPtr pEffect, sal_Int32 nTextGrouping, double fTextGroupingAuto, bool bAnimateForm, bool bTextReverse )
 {
     // first finde a free group-id
     sal_Int32 nGroupId = 0;
@@ -2456,7 +2456,7 @@ void EffectSequenceHelper::createTextGroupParagraphEffects( CustomAnimationTextG
 
     sal_Int32 nTextGrouping = pTextGroup->mnTextGrouping;
     double fTextGroupingAuto = pTextGroup->mfGroupingAuto;
-    sal_Bool bTextReverse = pTextGroup->mbTextReverse;
+    bool bTextReverse = pTextGroup->mbTextReverse;
 
     // now add an effect for each paragraph
     if( nTextGrouping >= 0 ) try
@@ -2623,7 +2623,7 @@ void EffectSequenceHelper::setTextGrouping( CustomAnimationTextGroupPtr pTextGro
     }
 }
 
-void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bAnimateForm )
+void EffectSequenceHelper::setAnimateForm( CustomAnimationTextGroupPtr pTextGroup, bool bAnimateForm )
 {
     if( pTextGroup->mbAnimateForm == bAnimateForm )
     {
@@ -2772,7 +2772,7 @@ bool ImplStlTextGroupSortHelper::operator()( const CustomAnimationEffectPtr& p1,
     }
 }
 
-void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGroup, sal_Bool bTextReverse )
+void EffectSequenceHelper::setTextReverse( CustomAnimationTextGroupPtr pTextGroup, bool bTextReverse )
 {
     if( pTextGroup->mbTextReverse == bTextReverse )
     {
diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx
index 951a6dd05402..2c1e94010dd6 100644
--- a/sd/source/core/EffectMigration.cxx
+++ b/sd/source/core/EffectMigration.cxx
@@ -191,7 +191,7 @@ void EffectMigration::SetFadeEffect( SdPage* pPage, ::com::sun::star::presentati
     {
         pPage->setTransitionType( 0 );
         pPage->setTransitionSubtype( 0 );
-        pPage->setTransitionDirection( 0 );
+        pPage->setTransitionDirection( false );
         pPage->setTransitionFadeColor( 0 );
     }
 }
@@ -501,7 +501,7 @@ void EffectMigration::SetAnimationEffect( SvxShape* pShape, AnimationEffect eEff
                     {
                         // special case for outline text, effects are always mapped to text group effect
                         pMainSequence->
-                            createTextGroup( pEffect, 10, bManual ? -1 : 0.0, sal_False, sal_False );
+                            createTextGroup( pEffect, 10, bManual ? -1 : 0.0, false, false );
                     }
                 }
             }
@@ -676,7 +676,7 @@ void EffectMigration::SetTextAnimationEffect( SvxShape* pShape, AnimationEffect
                 // now create effects for each paragraph
                 pGroup =
                     pMainSequence->
-                        createTextGroup( pShapeEffect, 10, bManual ? -1 : 0.0, sal_True, sal_False );
+                        createTextGroup( pShapeEffect, 10, bManual ? -1 : 0.0, true, false );
             }
         }
 
@@ -967,7 +967,7 @@ sal_Int32 EffectMigration::GetDimColor( SvxShape* pShape )
 
 
 
-void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide )
+void EffectMigration::SetDimHide( SvxShape* pShape, bool bDimHide )
 {
     DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(),
                 "sd::EffectMigration::SetAnimationEffect(), invalid argument!" );
@@ -1006,9 +1006,9 @@ void EffectMigration::SetDimHide( SvxShape* pShape, sal_Bool bDimHide )
 
 
 
-sal_Bool EffectMigration::GetDimHide( SvxShape* pShape )
+bool EffectMigration::GetDimHide( SvxShape* pShape )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( pShape )
     {
         SdrObject* pObj = pShape->GetSdrObject();
@@ -1038,7 +1038,7 @@ sal_Bool EffectMigration::GetDimHide( SvxShape* pShape )
 
 
 
-void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious )
+void EffectMigration::SetDimPrevious( SvxShape* pShape, bool bDimPrevious )
 {
     DBG_ASSERT( pShape && pShape->GetSdrObject() && pShape->GetSdrObject()->GetPage(),
                 "sd::EffectMigration::SetAnimationEffect(), invalid argument!" );
@@ -1080,9 +1080,9 @@ void EffectMigration::SetDimPrevious( SvxShape* pShape, sal_Bool bDimPrevious )
 
 
 
-sal_Bool EffectMigration::GetDimPrevious( SvxShape* pShape )
+bool EffectMigration::GetDimPrevious( SvxShape* pShape )
 {
-    sal_Bool bRet = sal_False;
+    bool bRet = false;
     if( pShape )
     {
         SdrObject* pObj = pShape->GetSdrObject();
@@ -1317,7 +1317,7 @@ OUString EffectMigration::GetSoundFile( SvxShape* pShape )
 
 
 
-sal_Bool EffectMigration::GetSoundOn( SvxShape* pShape )
+bool EffectMigration::GetSoundOn( SvxShape* pShape )
 {
     return !GetSoundFile( pShape ).isEmpty();
 }
diff --git a/sd/source/core/PageListWatcher.cxx b/sd/source/core/PageListWatcher.cxx
index 5c2bc128e712..e6d3ad81ce57 100644
--- a/sd/source/core/PageListWatcher.cxx
+++ b/sd/source/core/PageListWatcher.cxx
@@ -65,13 +65,13 @@ void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand()
     }
 
     // set to valid
-    mbPageListValid = sal_True;
+    mbPageListValid = true;
 }
 
 ImpPageListWatcher::ImpPageListWatcher(const SdrModel& rModel)
     : mrModel(rModel)
     , mpHandoutPage(0L)
-    , mbPageListValid(sal_False)
+    , mbPageListValid(false)
     , mnVisiblePageCount(0)
 {
 }
diff --git a/sd/source/core/PageListWatcher.hxx b/sd/source/core/PageListWatcher.hxx
index 773a50aec729..26b3a96e9d71 100644
--- a/sd/source/core/PageListWatcher.hxx
+++ b/sd/source/core/PageListWatcher.hxx
@@ -42,7 +42,7 @@ protected:
     SdPageVector                    maPageVectorNotes;
     SdPage*                         mpHandoutPage;
 
-    sal_Bool                        mbPageListValid;
+    bool                        mbPageListValid;
     sal_uInt32                      mnVisiblePageCount;
 
     void ImpRecreateSortedPageListOnDemand();
@@ -58,7 +58,7 @@ public:
     ImpPageListWatcher(const SdrModel& rModel);
     virtual ~ImpPageListWatcher();
 
-    void Invalidate() { mbPageListValid = sal_False; }
+    void Invalidate() { mbPageListValid = false; }
     SdPage* GetSdPage(PageKind ePgKind, sal_uInt32 nPgNum = 0L);
     sal_uInt32 GetSdPageCount(PageKind ePgKind);
     sal_uInt32 GetVisibleSdPageCount();
diff --git a/sd/source/core/anminfo.cxx b/sd/source/core/anminfo.cxx
index f160910ede1a..f0ae560c6f72 100644
--- a/sd/source/core/anminfo.cxx
+++ b/sd/source/core/anminfo.cxx
@@ -39,18 +39,18 @@ SdAnimationInfo::SdAnimationInfo(SdrObject& rObject)
                  meEffect                   (presentation::AnimationEffect_NONE),
                  meTextEffect               (presentation::AnimationEffect_NONE),
                  meSpeed                    (presentation::AnimationSpeed_SLOW),
-                 mbActive                   (sal_True),
-                 mbDimPrevious              (sal_False),
-                 mbIsMovie                  (sal_False),
-                 mbDimHide                  (sal_False),
-                 mbSoundOn                  (sal_False),
-                 mbPlayFull                 (sal_False),
+                 mbActive                   (true),
+                 mbDimPrevious              (false),
+                 mbIsMovie                  (false),
+                 mbDimHide                  (false),
+                 mbSoundOn                  (false),
+                 mbPlayFull                 (false),
                  mpPathObj                  (NULL),
                  meClickAction              (presentation::ClickAction_NONE),
                  meSecondEffect             (presentation::AnimationEffect_NONE),
                  meSecondSpeed              (presentation::AnimationSpeed_SLOW),
-                 mbSecondSoundOn            (sal_False),
-                 mbSecondPlayFull           (sal_False),
+                 mbSecondSoundOn            (false),
+                 mbSecondPlayFull           (false),
                  mnVerb                     (0),
                  mnPresOrder                (TREELIST_APPEND),
                  mrObject                   (rObject)
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index d75ed4f953c2..1de1f33b94e4 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -148,7 +148,7 @@ PresentationSettings::PresentationSettings( const PresentationSettings& r )
 
 SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
 : FmFormModel( SvtPathOptions().GetPalettePath(), NULL, pDrDocSh )
-, bReadOnly(sal_False)
+, bReadOnly(false)
 , mpOutliner(NULL)
 , mpInternalOutliner(NULL)
 , mpWorkStartupTimer(NULL)
@@ -290,7 +290,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
 
     nCntrl &= ~ EE_CNTRL_ULSPACESUMMATION;
     if ( meDocType != DOCUMENT_TYPE_IMPRESS )
-        SetSummationOfParagraphs( sal_False );
+        SetSummationOfParagraphs( false );
     else
     {
         SetSummationOfParagraphs( pOptions->IsSummationOfParagraphs() );
@@ -450,10 +450,10 @@ SdrModel* SdDrawDocument::AllocModel() const
 
         if( meDocType == DOCUMENT_TYPE_IMPRESS )
             mpCreatingTransferable->SetDocShell( new ::sd::DrawDocShell(
-                SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) );
+                SFX_CREATE_MODE_EMBEDDED, true, meDocType ) );
         else
             mpCreatingTransferable->SetDocShell( new ::sd::GraphicDocShell(
-                SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) );
+                SFX_CREATE_MODE_EMBEDDED, true, meDocType ) );
 
         pNewDocSh = static_cast< ::sd::DrawDocShell*>( pObj = mpCreatingTransferable->GetDocShell() );
         pNewDocSh->DoInitNew( NULL );
@@ -486,7 +486,7 @@ SdrModel* SdDrawDocument::AllocModel() const
         SdDrawDocument* pDoc = (SdDrawDocument*) this;
         pDoc->SetAllocDocSh(false);
         pDoc->mxAllocedDocShRef = new ::sd::DrawDocShell(
-            SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType);
+            SFX_CREATE_MODE_EMBEDDED, true, meDocType);
         pDoc->mxAllocedDocShRef->DoInitNew(NULL);
         pNewModel = pDoc->mxAllocedDocShRef->GetDoc();
     }
@@ -528,7 +528,7 @@ void SdDrawDocument::SetChanged(bool bFlag)
 }
 
 // The model changed, don't call anything else
-void SdDrawDocument::NbcSetChanged(sal_Bool bFlag)
+void SdDrawDocument::NbcSetChanged(bool bFlag)
 {
     // forward to baseclass
     FmFormModel::SetChanged(bFlag);
@@ -555,7 +555,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
         CheckMasterPages();
 
         if ( GetMasterSdPageCount(PK_STANDARD) > 1 )
-            RemoveUnnecessaryMasterPages( NULL, sal_True, sal_False );
+            RemoveUnnecessaryMasterPages( NULL, true, false );
 
         for ( sal_uInt16 i = 0; i < GetPageCount(); i++ )
         {
@@ -640,7 +640,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
         for (nPage = 0; nPage < nPageCount; nPage++)
         {
             SdPage* pPage = GetMasterSdPage(nPage, PK_STANDARD);
-            pSPool->CreateLayoutStyleSheets( pPage->GetName(), sal_True );
+            pSPool->CreateLayoutStyleSheets( pPage->GetName(), true );
         }
 
         // Default and notes pages:
@@ -760,7 +760,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
 
                     if (!aString.isEmpty())
                     {
-                        sd::Outliner* pInternalOutl = GetInternalOutliner(sal_True);
+                        sd::Outliner* pInternalOutl = GetInternalOutliner(true);
                         pPage->SetObjText( (SdrTextObj*) pObj, pInternalOutl, ePresObjKind, aString );
                         pObj->NbcSetStyleSheet( pPage->GetStyleSheetForPresObj( ePresObjKind ), true );
                         pInternalOutl->Clear();
@@ -773,7 +773,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
 
 // Local outliner that is used for outline mode. In this outliner, OutlinerViews
 // may be inserted.
-::sd::Outliner* SdDrawDocument::GetOutliner(sal_Bool bCreateOutliner)
+::sd::Outliner* SdDrawDocument::GetOutliner(bool bCreateOutliner)
 {
     if (!mpOutliner && bCreateOutliner)
     {
@@ -791,7 +791,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
 
 // Internal outliner that is used to create text objects. We don't insert any
 // OutlinerViews into this outliner!
-::sd::Outliner* SdDrawDocument::GetInternalOutliner(sal_Bool bCreateOutliner)
+::sd::Outliner* SdDrawDocument::GetInternalOutliner(bool bCreateOutliner)
 {
     if ( !mpInternalOutliner && bCreateOutliner )
     {
@@ -823,7 +823,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool* pSPool
 }
 
 // OnlineSpelling on/off
-void SdDrawDocument::SetOnlineSpell(sal_Bool bIn)
+void SdDrawDocument::SetOnlineSpell(bool bIn)
 {
     mbOnlineSpell = bIn;
     sal_uLong nCntrl = 0;
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 817577842adc..3d3b8e9c57f2 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -138,14 +138,14 @@ SdrObject* SdDrawDocument::GetObj(const OUString& rObjName) const
 
 
 // Find SdPage by name
-sal_uInt16 SdDrawDocument::GetPageByName(const OUString& rPgName, sal_Bool& rbIsMasterPage) const
+sal_uInt16 SdDrawDocument::GetPageByName(const OUString& rPgName, bool& rbIsMasterPage) const
 {
     SdPage* pPage = NULL;
     sal_uInt16 nPage = 0;
     const sal_uInt16 nMaxPages = GetPageCount();
     sal_uInt16 nPageNum = SDRPAGE_NOTFOUND;
 
-    rbIsMasterPage = sal_False;
+    rbIsMasterPage = false;
 
     // Search all regular pages and all notes pages (handout pages are
     // ignored)
@@ -176,7 +176,7 @@ sal_uInt16 SdDrawDocument::GetPageByName(const OUString& rPgName, sal_Bool& rbIs
         if (pPage && pPage->GetName() == rPgName)
         {
             nPageNum = nPage;
-            rbIsMasterPage = sal_True;
+            rbIsMasterPage = true;
         }
 
         nPage++;
@@ -433,7 +433,7 @@ SdrPage* SdDrawDocument::RemoveMasterPage(sal_uInt16 nPgNum)
 }
 
 //Select pages
-void SdDrawDocument::SetSelected(SdPage* pPage, sal_Bool bSelect)
+void SdDrawDocument::SetSelected(SdPage* pPage, bool bSelect)
 {
     PageKind ePageKind = pPage->GetPageKind();
 
@@ -513,7 +513,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
         // If nPageCount==1 is, the model for the clipboard was created, thus a
         // default page must already exist
         SdPage* pPage;
-        sal_Bool bClipboard = sal_False;
+        bool bClipboard = false;
 
         if( pRefDocument )
             pRefPage = pRefDocument->GetSdPage( 0, PK_STANDARD );
@@ -532,7 +532,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
                 // Draw: always use default size with margins
                 pPage->SetSize(aDefSize);
 
-                SfxPrinter* pPrinter = mpDocSh->GetPrinter(sal_False);
+                SfxPrinter* pPrinter = mpDocSh->GetPrinter(false);
                 if (pPrinter && pPrinter->IsValid())
                 {
                     Size aOutSize(pPrinter->GetOutputSize());
@@ -569,7 +569,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
         }
         else
         {
-            bClipboard = sal_True;
+            bClipboard = true;
             pPage = (SdPage*) GetPage(1);
         }
 
@@ -630,7 +630,7 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
 
 
         if( !pRefPage && (meDocType != DOCUMENT_TYPE_DRAW) )
-            pPage->SetAutoLayout( AUTOLAYOUT_TITLE, sal_True, sal_True );
+            pPage->SetAutoLayout( AUTOLAYOUT_TITLE, true, true );
 
         mpWorkStartupTimer = new Timer();
         mpWorkStartupTimer->SetTimeoutHdl( LINK(this, SdDrawDocument, WorkStartupHdl) );
@@ -644,9 +644,9 @@ void SdDrawDocument::CreateFirstPages( SdDrawDocument* pRefDocument /* = 0 */ )
 // Creates missing notes and handout pages (after PowerPoint import).
 // We assume that at least one default page and one default master page exist.
 
-sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
+bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
 {
-    sal_Bool bOK = sal_False;
+    bool bOK = false;
     sal_uInt16 nPageCount = GetPageCount();
 
     if (nPageCount != 0)
@@ -678,7 +678,7 @@ sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
             pNotesPage->TRG_SetMasterPage(*GetMasterPage(nMasterPageAfterPagesMasterPage));
         }
 
-        bOK = sal_True;
+        bOK = true;
         StopWorkStartupDelay();
         SetChanged(false);
     }
@@ -689,12 +689,12 @@ sal_Bool SdDrawDocument::CreateMissingNotesAndHandoutPages()
 // + Move selected pages after said page
 //   (nTargetPage = (sal_uInt16)-1  --> move before first page)
 // + Returns sal_True when the page has been moved
-sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
+bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
 {
     SdPage* pPage              = NULL;
     sal_uInt16  nPage;
     sal_uInt16  nNoOfPages         = GetSdPageCount(PK_STANDARD);
-    sal_Bool    bSomethingHappened = sal_False;
+    bool    bSomethingHappened = false;
 
     const bool bUndo = IsUndoEnabled();
 
@@ -745,7 +745,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
                 if( bUndo )
                     AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage+1, 2));
                 MovePage(nPage+1, 2);
-                bSomethingHappened = sal_True;
+                bSomethingHappened = true;
             }
         }
     }
@@ -774,7 +774,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
                     if( bUndo )
                         AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage+1, nTargetPage+1));
                     MovePage(nPage+1, nTargetPage+1);
-                    bSomethingHappened = sal_True;
+                    bSomethingHappened = true;
                 }
             }
             else
@@ -789,7 +789,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
                     if( bUndo )
                         AddUndo(GetSdrUndoFactory().CreateUndoSetPageNum(*pPg, nPage, nTargetPage));
                     MovePage(nPage, nTargetPage);
-                    bSomethingHappened = sal_True;
+                    bSomethingHappened = true;
                 }
             }
             nTargetPage = pPage->GetPageNum();
@@ -812,22 +812,22 @@ sal_uLong SdDrawDocument::GetLinkCount()
 // Set Language
 void SdDrawDocument::SetLanguage( const LanguageType eLang, const sal_uInt16 nId )
 {
-    sal_Bool bChanged = sal_False;
+    bool bChanged = false;
 
     if( nId == EE_CHAR_LANGUAGE && meLanguage != eLang )
     {
         meLanguage = eLang;
-        bChanged = sal_True;
+        bChanged = true;
     }
     else if( nId == EE_CHAR_LANGUAGE_CJK && meLanguageCJK != eLang )
     {
         meLanguageCJK = eLang;
-        bChanged = sal_True;
+        bChanged = true;
     }
     else if( nId == EE_CHAR_LANGUAGE_CTL && meLanguageCTL != eLang )
     {
         meLanguageCTL = eLang;
-        bChanged = sal_True;
+        bChanged = true;
     }
 
     if( bChanged )
@@ -860,7 +860,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
     if( mpDocSh )
         mpDocSh->SetWaitCursor( true );
 
-    sal_Bool bChanged = IsChanged();        // remember this
+    bool bChanged = IsChanged();        // remember this
 
     // Initialize Autolayouts
     SdPage* pHandoutMPage = GetMasterSdPage(0, PK_HANDOUT);
@@ -868,7 +868,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
     if (pHandoutMPage->GetAutoLayout() == AUTOLAYOUT_NONE)
     {
         // No AutoLayout yet -> initialize
-        pHandoutMPage->SetAutoLayout(AUTOLAYOUT_HANDOUT6, sal_True, sal_True);
+        pHandoutMPage->SetAutoLayout(AUTOLAYOUT_HANDOUT6, true, true);
     }
 
     SdPage* pPage = GetSdPage(0, PK_STANDARD);
@@ -876,7 +876,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
     if (pPage->GetAutoLayout() == AUTOLAYOUT_NONE)
     {
         // No AutoLayout yet -> initialize
-        pPage->SetAutoLayout(AUTOLAYOUT_NONE, sal_True, sal_True);
+        pPage->SetAutoLayout(AUTOLAYOUT_NONE, true, true);
     }
 
     SdPage* pNotesPage = GetSdPage(0, PK_NOTES);
@@ -884,7 +884,7 @@ IMPL_LINK_NOARG(SdDrawDocument, WorkStartupHdl)
     if (pNotesPage->GetAutoLayout() == AUTOLAYOUT_NONE)
     {
         // No AutoLayout yet -> initialize
-        pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True);
+        pNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, true, true);
     }
 
     SetChanged(bChanged);
@@ -987,7 +987,7 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
         Point               aRelPoint( rWinPoint );
         ImageMap&           rImageMap = (ImageMap&) pIMapInfo->GetImageMap();
         const Rectangle&    rRect = pObj->GetLogicRect();
-        sal_Bool                bObjSupported = sal_False;
+        bool                bObjSupported = false;
 
         // execute HitTest
         if ( pObj->ISA( SdrGrafObj )  ) // simple graphics object
@@ -1015,12 +1015,12 @@ IMapObject* SdDrawDocument::GetHitIMapObject( SdrObject* pObj,
                                                          pGrafObj->GetGrafPrefMapMode(), aMap100 );
 
             delete pGeoData;
-            bObjSupported = sal_True;
+            bObjSupported = true;
         }
         else if ( pObj->ISA( SdrOle2Obj ) ) // OLE object
         {
             aGraphSize = ( (SdrOle2Obj*) pObj )->GetOrigObjSize();
-            bObjSupported = sal_True;
+            bObjSupported = true;
         }
 
         // Everything worked out well, thus execute HitTest
@@ -1082,7 +1082,7 @@ void SdDrawDocument::CheckMasterPages()
     {
         // there is a fatal error in the master page order,
         // we need to repair the document
-        sal_Bool bChanged = sal_False;
+        bool bChanged = false;
 
         nPage = 1;
         while( nPage < nMaxPages )
@@ -1090,7 +1090,7 @@ void SdDrawDocument::CheckMasterPages()
             pPage = static_cast<SdPage*> (GetMasterPage( nPage ));
             if( pPage->GetPageKind() != PK_STANDARD )
             {
-                bChanged = sal_True;
+                bChanged = true;
                 sal_uInt16 nFound = nPage + 1;
                 while( nFound < nMaxPages )
                 {
@@ -1120,7 +1120,7 @@ void SdDrawDocument::CheckMasterPages()
 
             if( (NULL == pNotesPage) || (pNotesPage->GetPageKind() != PK_NOTES) || ( pPage->GetLayoutName() != pNotesPage->GetLayoutName() ) )
             {
-                bChanged = sal_True;
+                bChanged = true;
 
                 sal_uInt16 nFound = nPage + 1;
                 while( nFound < nMaxPages )
@@ -1166,7 +1166,7 @@ void SdDrawDocument::CheckMasterPages()
                     }
                     InsertMasterPage(pNewNotesPage,  nPage );
                     pNewNotesPage->SetLayoutName( pPage->GetLayoutName() );
-                    pNewNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, sal_True, sal_True );
+                    pNewNotesPage->SetAutoLayout(AUTOLAYOUT_NOTES, true, true );
                     nMaxPages++;
                 }
             }
@@ -1177,7 +1177,7 @@ void SdDrawDocument::CheckMasterPages()
         // now remove all remaining and unused non PK_STANDARD slides
         while( nPage < nMaxPages )
         {
-            bChanged = sal_True;
+            bChanged = true;
 
             RemoveMasterPage( nPage );
             nMaxPages--;
@@ -1198,8 +1198,8 @@ sal_uInt16 SdDrawDocument::CreatePage (
     const OUString& sNotesPageName,
     AutoLayout eStandardLayout,
     AutoLayout eNotesLayout,
-    sal_Bool bIsPageBack,
-    sal_Bool bIsPageObj,
+    bool bIsPageBack,
+    bool bIsPageObj,
     const sal_Int32 nInsertPosition)
 {
     SdPage* pPreviousStandardPage;
@@ -1240,7 +1240,7 @@ sal_uInt16 SdDrawDocument::CreatePage (
 
     // User layout of current standard page
     pStandardPage->SetLayoutName( pPreviousStandardPage->GetLayoutName() );
-    pStandardPage->SetAutoLayout(eStandardLayout, sal_True);
+    pStandardPage->SetAutoLayout(eStandardLayout, true);
     pStandardPage->setHeaderFooterSettings( pPreviousStandardPage->getHeaderFooterSettings() );
 
     // transition settings of current page
@@ -1263,7 +1263,7 @@ sal_uInt16 SdDrawDocument::CreatePage (
 
     // Use layout of current notes page
     pNotesPage->SetLayoutName( pPreviousNotesPage->GetLayoutName() );
-    pNotesPage->SetAutoLayout(eNotesLayout, sal_True);
+    pNotesPage->SetAutoLayout(eNotesLayout, true);
     pNotesPage->setHeaderFooterSettings( pPreviousNotesPage->getHeaderFooterSettings() );
 
     return InsertPageSet (
@@ -1310,8 +1310,8 @@ sal_uInt16 SdDrawDocument::DuplicatePage (
     PageKind ePageKind,
     const OUString& sStandardPageName,
     const OUString& sNotesPageName,
-    sal_Bool bIsPageBack,
-    sal_Bool bIsPageObj,
+    bool bIsPageBack,
+    bool bIsPageObj,
     const sal_Int32 nInsertPosition)
 {
     SdPage* pPreviousStandardPage;
@@ -1358,8 +1358,8 @@ sal_uInt16 SdDrawDocument::InsertPageSet (
     PageKind ePageKind,
     const OUString& sStandardPageName,
     const OUString& sNotesPageName,
-    sal_Bool bIsPageBack,
-    sal_Bool bIsPageObj,
+    bool bIsPageBack,
+    bool bIsPageObj,
     SdPage* pStandardPage,
     SdPage* pNotesPage,
     sal_Int32 nInsertPosition)
@@ -1426,8 +1426,8 @@ void SdDrawDocument::SetupNewPage (
     SdPage* pPage,
     const OUString& sPageName,
     sal_uInt16 nInsertionPoint,
-    sal_Bool bIsPageBack,
-    sal_Bool bIsPageObj)
+    bool bIsPageBack,
+    bool bIsPageObj)
 {
     if (pPreviousPage != NULL)
     {
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 272db5d30237..d423352d4c06 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -161,7 +161,7 @@ static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBoo
         {
             // fetch nPos'th entry from bookmark list, and determine master page
             OUString aBMPgName(rBookmarkList[nPos]);
-            sal_Bool  bIsMasterPage;
+            bool  bIsMasterPage;
 
             sal_uInt16 nBMPage = pBookmarkDoc->GetPageByName( aBMPgName, bIsMasterPage );
 
@@ -194,7 +194,7 @@ static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBoo
 // Opens a bookmark document
 SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
 {
-    sal_Bool bOK = sal_True;
+    bool bOK = true;
     SdDrawDocument* pBookmarkDoc = NULL;
     OUString aBookmarkName = rMedium.GetName();
     const SfxFilter* pFilter = rMedium.GetFilter();
@@ -206,12 +206,12 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
 
     if ( !pFilter )
     {
-        bOK = sal_False;
+        bOK = false;
     }
     else if ( !aBookmarkName.isEmpty() && maBookmarkFile != aBookmarkName )
     {
-        sal_Bool bCreateGraphicShell = pFilter->GetServiceName() == "com.sun.star.drawing.DrawingDocument";
-        sal_Bool bCreateImpressShell = pFilter->GetServiceName() == "com.sun.star.presentation.PresentationDocument";
+        bool bCreateGraphicShell = pFilter->GetServiceName() == "com.sun.star.drawing.DrawingDocument";
+        bool bCreateImpressShell = pFilter->GetServiceName() == "com.sun.star.presentation.PresentationDocument";
         if ( bCreateGraphicShell || bCreateImpressShell )
         {
             CloseBookmarkDoc();
@@ -221,10 +221,10 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(SfxMedium& rMedium)
             // If that wasn't the case, we could load the model directly.
             if ( bCreateGraphicShell )
                 // Draw
-                mxBookmarkDocShRef = new ::sd::GraphicDocShell(SFX_CREATE_MODE_STANDARD, sal_True);
+                mxBookmarkDocShRef = new ::sd::GraphicDocShell(SFX_CREATE_MODE_STANDARD, true);
             else
                 // Impress
-                mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, sal_True);
+                mxBookmarkDocShRef = new ::sd::DrawDocShell(SFX_CREATE_MODE_STANDARD, true);
 
             bOK = mxBookmarkDocShRef->DoLoad(&rMedium);
             if( bOK )
@@ -272,24 +272,24 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const OUString& rBookmarkFile)
 }
 
 // Inserts a bookmark (page or object)
-sal_Bool SdDrawDocument::InsertBookmark(
-    const std::vector<OUString> &rBookmarkList,    // List of names of the bookmarks to be inserted
-    std::vector<OUString> &rExchangeList,          // List of the names to be used
-    sal_Bool bLink,                                     // Insert bookmarks as links?
-    sal_Bool bReplace,                                  // Replace current default and notes pages?
-    sal_uInt16 nInsertPos,                              // Insertion position of pages
-    sal_Bool bNoDialogs,                                // Don't show dialogs
-    ::sd::DrawDocShell* pBookmarkDocSh,                 // If set, this is the source document
-    sal_Bool bCopy,                                     // Copy the pages?
-    Point* pObjPos)                                     // Insertion position of objects
+bool SdDrawDocument::InsertBookmark(
+    const std::vector<OUString> &rBookmarkList,     // List of names of the bookmarks to be inserted
+    std::vector<OUString> &rExchangeList,           // List of the names to be used
+    bool bLink,                                     // Insert bookmarks as links?
+    bool bReplace,                                  // Replace current default and notes pages?
+    sal_uInt16 nInsertPos,                          // Insertion position of pages
+    bool bNoDialogs,                                // Don't show dialogs
+    ::sd::DrawDocShell* pBookmarkDocSh,             // If set, this is the source document
+    bool bCopy,                                     // Copy the pages?
+    Point* pObjPos)                                 // Insertion position of objects
 {
-    sal_Bool bOK = sal_True;
-    sal_Bool bInsertPages = sal_False;
+    bool bOK = true;
+    bool bInsertPages = false;
 
     if (rBookmarkList.empty())
     {
         // Insert all pages
-        bInsertPages = sal_True;
+        bInsertPages = true;
     }
     else
     {
@@ -304,28 +304,28 @@ sal_Bool SdDrawDocument::InsertBookmark(
             pBookmarkDoc = mxBookmarkDocShRef->GetDoc();
         }
         else
-            bOK = sal_False;
+            bOK = false;
 
         std::vector<OUString>::const_iterator pIter;
         for ( pIter = rBookmarkList.begin(); bOK && pIter != rBookmarkList.end() && !bInsertPages; ++pIter )
         {
             // Is there a page name in the bookmark list?
-            sal_Bool    bIsMasterPage;
+            bool    bIsMasterPage;
             if( pBookmarkDoc->GetPageByName( *pIter, bIsMasterPage ) != SDRPAGE_NOTFOUND )
             {
                 // Found the page
-                bInsertPages = sal_True;
+                bInsertPages = true;
             }
         }
     }
 
-    sal_Bool bCalcObjCount = !rExchangeList.empty();
+    bool bCalcObjCount = !rExchangeList.empty();
 
     if ( bOK && bInsertPages )
     {
         // Insert all page bookmarks
         bOK = InsertBookmarkAsPage(rBookmarkList, &rExchangeList, bLink, bReplace,
-                                   nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, sal_True, sal_False);
+                                   nInsertPos, bNoDialogs, pBookmarkDocSh, bCopy, true, false);
     }
 
     if ( bOK && !rBookmarkList.empty() )
@@ -368,21 +368,21 @@ SfxStyleSheet *lcl_findStyle(SdStyleSheetVector& rStyles, const OUString& aStyle
 
 }
 
-sal_Bool SdDrawDocument::InsertBookmarkAsPage(
+bool SdDrawDocument::InsertBookmarkAsPage(
     const std::vector<OUString> &rBookmarkList,
     std::vector<OUString> *pExchangeList,            // List of names to be used
-    sal_Bool bLink,
-    sal_Bool bReplace,
+    bool bLink,
+    bool bReplace,
     sal_uInt16 nInsertPos,
-    sal_Bool bNoDialogs,
+    bool bNoDialogs,
     ::sd::DrawDocShell* pBookmarkDocSh,
-    sal_Bool bCopy,
-    sal_Bool bMergeMasterPages,
-    sal_Bool bPreservePageNames)
+    bool bCopy,
+    bool bMergeMasterPages,
+    bool bPreservePageNames)
 {
-    sal_Bool bOK = sal_True;
-    sal_Bool bContinue = sal_True;
-    sal_Bool bScaleObjects = sal_False;
+    bool bOK = true;
+    bool bContinue = true;
+    bool bScaleObjects = false;
     sal_uInt16 nReplacedStandardPages = 0;
 
     SdDrawDocument* pBookmarkDoc = NULL;
@@ -404,7 +404,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
     }
     else
     {
-        return sal_False;
+        return false;
     }
 
     const sal_uInt16 nSdPageCount = GetSdPageCount(PK_STANDARD);
@@ -413,7 +413,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
 
     if (nSdPageCount==0 || nBMSdPageCount==0 || nMPageCount==0)
     {
-        bContinue = bOK = sal_False;
+        bContinue = bOK = false;
         return(bContinue);
     }
 
@@ -445,7 +445,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
         if( rBookmarkList.empty() )
             bScaleObjects = pRefPage->IsScaleObjects();
         else
-            bScaleObjects = sal_True;
+            bScaleObjects = true;
     }
     else
     {
@@ -491,7 +491,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
 
     // When copying styles, also copy the master pages!
     if( !aLayoutsToTransfer.empty() )
-        bMergeMasterPages = sal_True;
+        bMergeMasterPages = true;
 
     std::vector<OUString>::const_iterator pIter;
     for ( pIter = aLayoutsToTransfer.begin(); pIter != aLayoutsToTransfer.end(); ++pIter )
@@ -551,7 +551,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
         {
             SdPage* pBMPage = pBookmarkDoc->GetSdPage(nBMSdPage, PK_STANDARD);
             OUString sName(pBMPage->GetName());
-            sal_Bool    bIsMasterPage;
+            bool    bIsMasterPage;
 
             if (bLink)
             {
@@ -613,7 +613,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
         if (nInsertPos >= GetPageCount())
         {
             // Add pages to the end
-            bReplace = sal_False;
+            bReplace = false;
             nInsertPos = GetPageCount();
         }
 
@@ -624,7 +624,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
         for ( size_t nPos = 0, n = rBookmarkList.size(); nPos < n; ++nPos)
         {
             OUString aPgName(rBookmarkList[nPos]);
-            sal_Bool    bIsMasterPage;
+            bool    bIsMasterPage;
             sal_uInt16  nBMPage = pBookmarkDoc->GetPageByName( aPgName, bIsMasterPage );
 
             if (nBMPage != SDRPAGE_NOTFOUND)
@@ -641,20 +641,20 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
             if (pBMPage && pBMPage->GetPageKind()==PK_STANDARD && !pBMPage->IsMasterPage())
             {
                 // It has to be a default page
-                sal_Bool bMustRename = sal_False;
+                bool bMustRename = false;
 
                 // delay renaming *after* pages are copied (might destroy source otherwise)
                 // don't change name if source and dest model are the same!
                 // avoid renaming if replacing the same page
                 OUString aPgName(rBookmarkList[nPos]);
-                sal_Bool    bIsMasterPage;
+                bool    bIsMasterPage;
                 sal_uInt16 nPageSameName = GetPageByName(aPgName, bIsMasterPage);
                 if( pBookmarkDoc != this &&
                     nPageSameName != SDRPAGE_NOTFOUND &&
                     ( !bReplace ||
                       nPageSameName != nActualInsertPos ) )
                 {
-                    bMustRename = sal_True;
+                    bMustRename = true;
                 }
 
                 SdPage* pBookmarkPage = pBMPage;
@@ -850,7 +850,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
             if (bScaleObjects)
             {
                 Rectangle aBorderRect(nLeft, nUpper, nRight, nLower);
-                pRefPage->ScaleObjects(aSize, aBorderRect, sal_True);
+                pRefPage->ScaleObjects(aSize, aBorderRect, true);
             }
             pRefPage->SetSize(aSize);
             pRefPage->SetBorder(nLeft, nUpper, nRight, nLower);
@@ -869,7 +869,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
             if (bScaleObjects)
             {
                 Rectangle aBorderRect(nNLeft, nNUpper, nNRight, nNLower);
-                pRefPage->ScaleObjects(aNSize, aBorderRect, sal_True);
+                pRefPage->ScaleObjects(aNSize, aBorderRect, true);
             }
 
             pRefPage->SetSize(aNSize);
@@ -892,7 +892,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
                 if (bScaleObjects)
                 {
                     Rectangle aBorderRect(nLeft, nUpper, nRight, nLower);
-                    pRefPage->ScaleObjects(aSize, aBorderRect, sal_True);
+                    pRefPage->ScaleObjects(aSize, aBorderRect, true);
                 }
                 pRefPage->SetSize(aSize);
                 pRefPage->SetBorder(nLeft, nUpper, nRight, nLower);
@@ -903,7 +903,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
                 if (bScaleObjects)
                 {
                     Rectangle aBorderRect(nNLeft, nNUpper, nNRight, nNLower);
-                    pRefPage->ScaleObjects(aNSize, aBorderRect, sal_True);
+                    pRefPage->ScaleObjects(aNSize, aBorderRect, true);
                 }
                 pRefPage->SetSize(aNSize);
                 pRefPage->SetBorder(nNLeft, nNUpper, nNRight, nNLower);
@@ -916,7 +916,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
     }
 
     // Make absolutely sure no double masterpages are there
-    RemoveUnnecessaryMasterPages(NULL, sal_True, sal_True);
+    RemoveUnnecessaryMasterPages(NULL, true, true);
 
     // Rename object styles if necessary
     if(!aRenameStr.isEmpty())
@@ -964,15 +964,16 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
 }
 
 // Inserts a bookmark as an object
-sal_Bool SdDrawDocument::InsertBookmarkAsObject(
+bool SdDrawDocument::InsertBookmarkAsObject(
     const std::vector<OUString> &rBookmarkList,
     const std::vector<OUString> &rExchangeList,            // List of names to use
-    sal_Bool /* bLink */,
+    bool /* bLink */,
     ::sd::DrawDocShell* pBookmarkDocSh,
-    Point* pObjPos, bool bCalcObjCount)
+    Point* pObjPos,
+    bool bCalcObjCount)
 {
-    sal_Bool bOK = sal_True;
-    sal_Bool bOLEObjFound = sal_False;
+    bool bOK = true;
+    bool bOLEObjFound = false;
     ::sd::View* pBMView = NULL;
 
     SdDrawDocument* pBookmarkDoc = NULL;
@@ -987,7 +988,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject(
     }
     else
     {
-        return sal_False;
+        return false;
     }
 
     if (rBookmarkList.empty())
@@ -1013,7 +1014,7 @@ sal_Bool SdDrawDocument::InsertBookmarkAsObject(
                 if (pObj->GetObjInventor() == SdrInventor &&
                     pObj->GetObjIdentifier() == OBJ_OLE2)
                 {
-                    bOLEObjFound = sal_True;
+                    bOLEObjFound = true;
                 }
 
                 if (!pBMView)
@@ -1164,7 +1165,7 @@ void SdDrawDocument::SetAllocDocSh(bool bAlloc)
 }
 
 // Return list of CustomShows (create it, too, if necessary)
-SdCustomShowList* SdDrawDocument::GetCustomShowList(sal_Bool bCreate)
+SdCustomShowList* SdDrawDocument::GetCustomShowList(bool bCreate)
 {
     if (!mpCustomShowList && bCreate)
     {
@@ -1175,13 +1176,13 @@ SdCustomShowList* SdDrawDocument::GetCustomShowList(sal_Bool bCreate)
 }
 
 // Remove unused master pages and layouts
-void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool bOnlyDuplicatePages, sal_Bool bUndo)
+void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, bool bOnlyDuplicatePages, bool bUndo)
 {
     ::sd::View* pView = NULL;
     ::svl::IUndoManager* pUndoMgr = NULL;
 
     if( bUndo && !IsUndoEnabled() )
-        bUndo = sal_False;
+        bUndo = false;
 
     if (mpDocSh)
     {
@@ -1222,13 +1223,13 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
              pNotesMaster )
         {
             // Do not delete master pages that have their precious flag set
-            sal_Bool bDeleteMaster = !pMaster->IsPrecious();
+            bool bDeleteMaster = !pMaster->IsPrecious();
             OUString aLayoutName = pMaster->GetLayoutName();
 
             if(bOnlyDuplicatePages )
             {
                 // remove only duplicate pages
-                bDeleteMaster = sal_False;
+                bDeleteMaster = false;
                 for (sal_uInt16 i = 0; i < GetMasterSdPageCount( PK_STANDARD ); i++)
                 {
                     SdPage* pMPg = (SdPage*) GetMasterSdPage( i, PK_STANDARD );
@@ -1236,7 +1237,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
                         pMPg->GetLayoutName() == aLayoutName )
                     {
                         // duplicate page found -> remove it
-                        bDeleteMaster = sal_True;
+                        bDeleteMaster = true;
                     }
                 }
             }
@@ -1281,7 +1282,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
                     EndUndo();  // do this here already, so Joe's actions happen _between_ our own
 
                 // Delete old, unused layout stylesheets
-                sal_Bool bDeleteOldStyleSheets = sal_True;
+                bool bDeleteOldStyleSheets = true;
                 for ( sal_uInt16 nMPg = 0;
                           nMPg < GetMasterPageCount() && bDeleteOldStyleSheets;
                        nMPg++ )
@@ -1289,7 +1290,7 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
                     SdPage* pMPg = (SdPage*) GetMasterPage(nMPg);
                     if (pMPg->GetLayoutName() == aLayoutName)
                     {
-                        bDeleteOldStyleSheets = sal_False;
+                        bDeleteOldStyleSheets = false;
                     }
                 }
 
@@ -1389,8 +1390,8 @@ OUString createNewMasterPageLayoutName(const SdDrawDocument& rDoc)
 void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
                                    const OUString& rLayoutName,
                                    SdDrawDocument* pSourceDoc,
-                                   sal_Bool bMaster,
-                                   sal_Bool bCheckMasters)
+                                   bool bMaster,
+                                   bool bCheckMasters)
 {
     ::svl::IUndoManager* pUndoMgr = NULL;
 
@@ -1423,7 +1424,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
     if (pSourceDoc)
     {
         std::vector<StyleReplaceData> aReplList; // List of replaced stylesheets
-        sal_Bool bLayoutReloaded = sal_False;   // Wurde ex. Layout wieder geladen?
+        bool bLayoutReloaded = false;   // Wurde ex. Layout wieder geladen?
 
         // LayoutName, Page and Notes page
         if (rLayoutName.isEmpty())
@@ -1528,7 +1529,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
                 SdPage* pCheckMaster = (SdPage*)GetMasterPage(nMPage);
                 if( pCheckMaster->GetName() == aTargetNewLayoutName )
                 {
-                    bLayoutReloaded = sal_True;
+                    bLayoutReloaded = true;
                     break;
                 }
             }
@@ -1564,7 +1565,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
                     {
                         // A stylesheet of the same name already exists -> overwrite contents
 #ifdef DBG_UTIL
-                        sal_Bool bTest =
+                        bool bTest =
 #endif
                             pMySheet->SetName(pHisSheet->GetName());
                         DBG_ASSERT(bTest, "Renaming StyleSheet failed.");
@@ -1739,7 +1740,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
                         (this,
                         ( pPage && pPage->IsMasterPage() ) ? aLayoutName : aOldLayoutName,
                         aLayoutName,
-                         eAutoLayout, eAutoLayout, sal_False, *pIter);
+                         eAutoLayout, eAutoLayout, false, *pIter);
                 pUndoMgr->AddUndoAction(pPLUndoAction);
             }
             (*pIter)->SetPresentationLayout(aLayoutName);
@@ -1754,7 +1755,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
                                   rOldMaster.GetUppBorder(),
                                   rOldMaster.GetRgtBorder(),
                                   rOldMaster.GetLwrBorder());
-            pMaster->ScaleObjects(aSize, aBorderRect, sal_True);
+            pMaster->ScaleObjects(aSize, aBorderRect, true);
             pMaster->SetSize(aSize);
             pMaster->SetBorder(rOldMaster.GetLftBorder(),
                                rOldMaster.GetUppBorder(),
@@ -1768,7 +1769,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
                                        rOldNotesMaster.GetUppBorder(),
                                        rOldNotesMaster.GetRgtBorder(),
                                        rOldNotesMaster.GetLwrBorder());
-            pNotesMaster->ScaleObjects(aSize, aNotesBorderRect, sal_True);
+            pNotesMaster->ScaleObjects(aSize, aNotesBorderRect, true);
             pNotesMaster->SetSize(aSize);
             pNotesMaster->SetBorder(rOldNotesMaster.GetLftBorder(),
                                     rOldNotesMaster.GetUppBorder(),
@@ -1871,7 +1872,7 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
                 SdPresentationLayoutUndoAction * pPLUndoAction =
                     new SdPresentationLayoutUndoAction
                             (this, aOldLayoutName, aName,
-                             eOldAutoLayout, eNewAutoLayout, sal_True,
+                             eOldAutoLayout, eNewAutoLayout, true,
                              *pIter);
                 pUndoMgr->AddUndoAction(pPLUndoAction);
             }
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index be6a43b9f52c..716f008a9180 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -737,14 +737,14 @@ void SdDrawDocument::StopOnlineSpelling()
 }
 
 // Start OnlineSpelling in the background
-void SdDrawDocument::StartOnlineSpelling(sal_Bool bForceSpelling)
+void SdDrawDocument::StartOnlineSpelling(bool bForceSpelling)
 {
     if (mbOnlineSpell && (bForceSpelling || mbInitialOnlineSpellingEnabled) &&
         mpDocSh && !mpDocSh->IsReadOnly() )
     {
         StopOnlineSpelling();
 
-        ::sd::Outliner* pOutl = GetInternalOutliner(sal_True);
+        ::sd::Outliner* pOutl = GetInternalOutliner(true);
 
         Reference< XSpellChecker1 > xSpellChecker( LinguMgr::GetSpellChecker() );
         if ( xSpellChecker.is() )
@@ -803,14 +803,14 @@ void SdDrawDocument::FillOnlineSpellingList(SdPage* pPage)
             SdrObjListIter aGroupIter(*((SdrObjGroup*)pObj)->GetSubList(),
                                       IM_DEEPNOGROUPS);
 
-            sal_Bool bSubTextObjFound = sal_False;
+            bool bSubTextObjFound = false;
 
             while (aGroupIter.IsMore() && !bSubTextObjFound)
             {
                 if (aGroupIter.Next()->GetOutlinerParaObject())
                 {
                     // Found a text object in a group object
-                    bSubTextObjFound = sal_True;
+                    bSubTextObjFound = true;
                 }
             }
 
@@ -883,7 +883,7 @@ void SdDrawDocument::SpellObject(SdrTextObj* pObj)
     if (pObj && pObj->GetOutlinerParaObject() /* && pObj != pView->GetTextEditObject() */)
     {
         mbHasOnlineSpellErrors = false;
-        ::sd::Outliner* pOutl = GetInternalOutliner(sal_True);
+        ::sd::Outliner* pOutl = GetInternalOutliner(true);
         pOutl->SetUpdateMode(true);
         Link aEvtHdl = pOutl->GetStatusEventHdl();
         pOutl->SetStatusEventHdl(LINK(this, SdDrawDocument, OnlineSpellEventHdl));
@@ -982,7 +982,7 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject*
     {
         if(pObj && pOutl && pObj->ISA(SdrTextObj))
         {
-            sal_Bool bModified(IsChanged());
+            bool bModified(IsChanged());
             ((SdrTextObj*)pObj)->SetOutlinerParaObject(pOutl->CreateParaObject());
             SetChanged(bModified);
             pObj->BroadcastObjectChange();
@@ -1042,7 +1042,7 @@ void SdDrawDocument::RestoreLayerNames()
 OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
 {
     OUString aPageNumValue;
-    sal_Bool bUpper = sal_False;
+    bool bUpper = false;
 
     switch (mePageNumType)
     {
@@ -1053,7 +1053,7 @@ OUString SdDrawDocument::CreatePageNumValue(sal_uInt16 nNum) const
             aPageNumValue += OUString( (sal_Unicode)(char)((nNum - 1) % 26 + 'a') );
             break;
         case SVX_ROMAN_UPPER:
-            bUpper = sal_True;
+            bUpper = true;
         case SVX_ROMAN_LOWER:
             aPageNumValue += SvxNumberFormat::CreateRomanString(nNum, bUpper);
             break;
diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx
index 81318d193fe8..e7f1c71b172f 100644
--- a/sd/source/core/pglink.cxx
+++ b/sd/source/core/pglink.cxx
@@ -95,20 +95,20 @@ SdPageLink::~SdPageLink()
             std::vector<OUString> aBookmarkList;
             aBookmarkList.push_back(aBookmarkName);
             sal_uInt16 nInsertPos = pPage->GetPageNum();
-            sal_Bool bLink = sal_True;
-            sal_Bool bReplace = sal_True;
-            sal_Bool bNoDialogs = sal_False;
-            sal_Bool bCopy = sal_False;
+            bool bLink = true;
+            bool bReplace = true;
+            bool bNoDialogs = false;
+            bool bCopy = false;
 
             if( pDoc->pDocLockedInsertingLinks )
             {
                 // resolving links while loading pDoc
-                bNoDialogs = sal_True;
-                bCopy = sal_True;
+                bNoDialogs = true;
+                bCopy = true;
             }
 
             pDoc->InsertBookmarkAsPage(aBookmarkList, NULL, bLink, bReplace,
-                                       nInsertPos, bNoDialogs, NULL, bCopy, sal_True, sal_True);
+                                       nInsertPos, bNoDialogs, NULL, bCopy, true, true);
 
             if( !pDoc->pDocLockedInsertingLinks )
                 pDoc->CloseBookmarkDoc();
diff --git a/sd/source/core/sdiocmpt.cxx b/sd/source/core/sdiocmpt.cxx
index eac66af774dd..09d116e0457e 100644
--- a/sd/source/core/sdiocmpt.cxx
+++ b/sd/source/core/sdiocmpt.cxx
@@ -26,7 +26,7 @@ old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode)
     nSubRecSiz(0),
     nSubRecPos(0),
     nMode(nNewMode),
-    bOpen(sal_False)
+    bOpen(false)
 {
     OpenSubRecord();
 }
@@ -63,7 +63,7 @@ void old_SdrDownCompat::OpenSubRecord()
         Write();
     }
 
-    bOpen = sal_True;
+    bOpen = true;
 }
 
 void old_SdrDownCompat::CloseSubRecord()
@@ -89,7 +89,7 @@ void old_SdrDownCompat::CloseSubRecord()
         rStream.Seek(nAktPos);
     }
 
-    bOpen = sal_False;
+    bOpen = false;
 }
 
 /*************************************************************************
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 439377134296..e2f782ad8fdb 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -90,27 +90,27 @@ TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall );
 |*
 \************************************************************************/
 
-SdPage::SdPage(SdDrawDocument& rNewDoc, sal_Bool bMasterPage)
+SdPage::SdPage(SdDrawDocument& rNewDoc, bool bMasterPage)
 :   FmFormPage(rNewDoc, bMasterPage)
 ,   SdrObjUserCall()
 ,   mePageKind(PK_STANDARD)
 ,   meAutoLayout(AUTOLAYOUT_NONE)
-,   mbSelected(sal_False)
+,   mbSelected(false)
 ,   mePresChange(PRESCHANGE_MANUAL)
 ,   mfTime(1.0)
-,   mbSoundOn(sal_False)
-,   mbExcluded(sal_False)
+,   mbSoundOn(false)
+,   mbExcluded(false)
 ,   mbLoopSound(false)
 ,   mbStopSound(false)
-,   mbScaleObjects(sal_True)
-,   mbBackgroundFullSize( sal_False )
+,   mbScaleObjects(true)
+,   mbBackgroundFullSize( false )
 ,   meCharSet(osl_getThreadTextEncoding())
 ,   mnPaperBin(PAPERBIN_PRINTER_SETTINGS)
 ,   mpPageLink(NULL)
 ,   mpItems(NULL)
 ,   mnTransitionType(0)
 ,   mnTransitionSubtype(0)
-,   mbTransitionDirection(sal_True)
+,   mbTransitionDirection(true)
 ,   mnTransitionFadeColor(0)
 ,   mfTransitionDuration(2.0)
 ,   mbIsPrecious(true)
@@ -242,7 +242,7 @@ void SdPage::EnsureMasterPageDefaultBackground()
 
 /** creates a presentation object with the given PresObjKind on this page. A user call will be set
 */
-SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, sal_Bool bVertical, const Rectangle& rRect, sal_Bool /* bInsert */ )
+SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, bool bVertical, const Rectangle& rRect, bool /* bInsert */ )
 {
     ::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
     const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
@@ -751,7 +751,7 @@ void SdPage::Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectang
 |*
 \************************************************************************/
 
-void SdPage::CreateTitleAndLayout(sal_Bool bInit, sal_Bool bCreate )
+void SdPage::CreateTitleAndLayout(bool bInit, bool bCreate )
 {
     ::svl::IUndoManager* pUndoManager = pModel ? static_cast<SdDrawDocument*>(pModel)->GetUndoManager() : 0;
     const bool bUndo = pUndoManager && pUndoManager->IsInListAction() && IsInserted();
@@ -806,7 +806,7 @@ void SdPage::CreateTitleAndLayout(sal_Bool bInit, sal_Bool bCreate )
 
             while( iter != aAreas.end() )
             {
-                SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, sal_False, (*iter++), sal_True) );
+                SdrPageObj* pPageObj = static_cast<SdrPageObj*>(pMasterPage->CreatePresObj(PRESOBJ_HANDOUT, false, (*iter++), true) );
                 // #i105146# We want no content to be displayed for PK_HANDOUT,
                 // so just never set a page as content
                 pPageObj->SetReferencedPage(0L);
@@ -938,17 +938,17 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
     if( eObjKind == PRESOBJ_TITLE )
     {
         Rectangle aTitleRect( GetTitleRect() );
-        return CreatePresObj(PRESOBJ_TITLE, sal_False, aTitleRect, bInsert);
+        return CreatePresObj(PRESOBJ_TITLE, false, aTitleRect, bInsert);
     }
     else if( eObjKind == PRESOBJ_OUTLINE )
     {
         Rectangle aLayoutRect( GetLayoutRect() );
-        return CreatePresObj( PRESOBJ_OUTLINE, sal_False, aLayoutRect, bInsert);
+        return CreatePresObj( PRESOBJ_OUTLINE, false, aLayoutRect, bInsert);
     }
     else if( eObjKind == PRESOBJ_NOTES )
     {
         Rectangle aLayoutRect( GetLayoutRect() );
-        return CreatePresObj( PRESOBJ_NOTES, sal_False, aLayoutRect, bInsert);
+        return CreatePresObj( PRESOBJ_NOTES, false, aLayoutRect, bInsert);
     }
     else if( (eObjKind == PRESOBJ_FOOTER) || (eObjKind == PRESOBJ_DATETIME) || (eObjKind == PRESOBJ_SLIDENUMBER) || (eObjKind == PRESOBJ_HEADER ) )
     {
@@ -981,7 +981,7 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
             else
             {
                 Rectangle aRect( aPos, aSize );
-                return CreatePresObj( eObjKind, sal_False, aRect, bInsert );
+                return CreatePresObj( eObjKind, false, aRect, bInsert );
             }
         }
         else
@@ -1008,7 +1008,7 @@ SdrObject* SdPage::CreateDefaultPresObj(PresObjKind eObjKind, bool bInsert)
                 aPos.Y() = aPosition.Y() + long( aPageSize.Height() - NOTES_HEADER_FOOTER_HEIGHT );
 
             Rectangle aRect( aPos, aSize );
-            return CreatePresObj( eObjKind, sal_False, aRect, bInsert );
+            return CreatePresObj( eObjKind, false, aRect, bInsert );
         }
     }
     else
@@ -1554,7 +1554,7 @@ void findAutoLayoutShapesImpl( SdPage& rPage, const LayoutDescriptor& rDescripto
     }
 }
 
-void SdPage::SetAutoLayout(AutoLayout eLayout, sal_Bool bInit, sal_Bool bCreate )
+void SdPage::SetAutoLayout(AutoLayout eLayout, bool bInit, bool bCreate )
 {
     sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement );
 
@@ -1775,7 +1775,7 @@ void SdPage::SetLwrBorder(sal_Int32 nBorder)
 |*
 \************************************************************************/
 
-void SdPage::SetBackgroundFullSize( sal_Bool bIn )
+void SdPage::SetBackgroundFullSize( bool bIn )
 {
     if( bIn != mbBackgroundFullSize )
     {
@@ -1793,7 +1793,7 @@ void SdPage::SetBackgroundFullSize( sal_Bool bIn )
 |*
 \************************************************************************/
 
-void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, sal_Bool bScaleAllObj)
+void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderRect, bool bScaleAllObj)
 {
     sd::ScopeLockGuard aGuard( maLockAutoLayoutArrangement );
 
@@ -1855,7 +1855,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
 
     for (sal_uLong nObj = 0; nObj < nObjCnt; nObj++)
     {
-        sal_Bool bIsPresObjOnMaster = sal_False;
+        bool bIsPresObjOnMaster = false;
 
         // all Objects
         pObj = GetObj(nObj);
@@ -1863,7 +1863,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
         if (mbMaster && IsPresObj(pObj))
         {
             // There is a presentation object on the master page
-            bIsPresObjOnMaster = sal_True;
+            bIsPresObjOnMaster = true;
         }
 
         if (pObj)
@@ -1966,7 +1966,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
                                     }
 
                                     // adjust bullet
-                                    ((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, sal_False);
+                                    ((SdStyleSheet*) pOutlineSheet)->AdjustToFontHeight(aTempSet, false);
 
                                     // Special treatment: reset the INVALIDS to
                                     // NULL pointer (otherwise we have INVALID's
@@ -2077,7 +2077,7 @@ SdrObject* convertPresentationObjectImpl( SdPage& rPage, SdrObject* pSourceObj,
         if(pOutlParaObj)
         {
             // assign text
-            ::sd::Outliner* pOutl = pModel->GetInternalOutliner( sal_True );
+            ::sd::Outliner* pOutl = pModel->GetInternalOutliner( true );
             pOutl->Clear();
             pOutl->SetText( *pOutlParaObj );
             pOutlParaObj = pOutl->CreateParaObject();
@@ -2382,7 +2382,7 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
 
         sal_uInt16 nOutlMode = pOutl->GetMode();
         Size aPaperSize = pOutl->GetPaperSize();
-        sal_Bool bUpdateMode = pOutl->GetUpdateMode();
+        bool bUpdateMode = pOutl->GetUpdateMode();
         pOutl->SetUpdateMode(false);
         pOutl->SetParaAttribs( 0, pOutl->GetEmptyItemSet() );
 
@@ -2872,7 +2872,7 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj )
 
             if (!aString.isEmpty())
             {
-                sal_Bool bVertical = sal_False;
+                bool bVertical = false;
                 OutlinerParaObject* pOldPara = pTextObj->GetOutlinerParaObject();
                 if( pOldPara )
                     bVertical = pOldPara->IsVertical();  // is old para object vertical?
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 738f745c8b07..d76d29a3fb77 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -76,9 +76,9 @@ using namespace ::com::sun::star::office;
 \************************************************************************/
 
 void SdPage::SetPresentationLayout(const OUString& rLayoutName,
-                                   sal_Bool bReplaceStyleSheets,
-                                   sal_Bool bSetMasterPage,
-                                   sal_Bool bReverseOrder)
+                                   bool bReplaceStyleSheets,
+                                   bool bSetMasterPage,
+                                   bool bReverseOrder)
 {
     /*********************************************************************
     |* Name of the layout of the page
@@ -388,7 +388,7 @@ SdPage::SdPage(const SdPage& rSrcPage)
         InsertPresObj(GetObj(pObj->GetOrdNum()), rSrcPage.GetPresObjKind(pObj));
     }
 
-    mbSelected           = sal_False;
+    mbSelected           = false;
     mnTransitionType    = rSrcPage.mnTransitionType;
     mnTransitionSubtype = rSrcPage.mnTransitionSubtype;
     mbTransitionDirection = rSrcPage.mbTransitionDirection;
@@ -483,7 +483,7 @@ SfxItemSet* SdPage::getOrCreateItems()
 }
 
 
-sal_Bool SdPage::setAlienAttributes( const com::sun::star::uno::Any& rAttributes )
+bool SdPage::setAlienAttributes( const com::sun::star::uno::Any& rAttributes )
 {
     SfxItemSet* pSet = getOrCreateItems();
 
@@ -491,10 +491,10 @@ sal_Bool SdPage::setAlienAttributes( const com::sun::star::uno::Any& rAttributes
     if( aAlienAttributes.PutValue( rAttributes, 0 ) )
     {
         pSet->Put( aAlienAttributes );
-        return sal_True;
+        return true;
     }
 
-    return sal_False;
+    return false;
 }
 
 void SdPage::getAlienAttributes( com::sun::star::uno::Any& rAttributes )
@@ -550,12 +550,12 @@ void SdPage::setTransitionSubtype ( sal_Int16 nTransitionSubtype )
     ActionChanged();
 }
 
-sal_Bool SdPage::getTransitionDirection (void) const
+bool SdPage::getTransitionDirection (void) const
 {
     return mbTransitionDirection;
 }
 
-void SdPage::setTransitionDirection ( sal_Bool bTransitionbDirection )
+void SdPage::setTransitionDirection ( bool bTransitionbDirection )
 {
     mbTransitionDirection = bTransitionbDirection;
     ActionChanged();
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 19f3031993cb..45133f1c8cff 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -187,12 +187,12 @@ void SdStyleSheetPool::CreateOutlineSheetList (const OUString& rLayoutName, std:
 |*
 \************************************************************************/
 
-void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_Bool bCheck /*= sal_False*/ )
+void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool bCheck /*= sal_False*/ )
 {
     const sal_uInt16 nUsedMask = SFXSTYLEBIT_ALL & ~SFXSTYLEBIT_USERDEF;
 
     (void)bCheck;
-    sal_Bool bCreated = sal_False;
+    bool bCreated = false;
 
     SfxStyleSheetBase* pSheet = NULL;
 
@@ -230,7 +230,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
 
         if (!Find(aLevelName, SD_STYLE_FAMILY_MASTERPAGE))
         {
-            bCreated = sal_True;
+            bCreated = true;
             pSheet = &Make(aLevelName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask);
             pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_OUTLINE + nLevel );
 
@@ -347,7 +347,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
 
     if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
     {
-        bCreated = sal_True;
+        bCreated = true;
 
         pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask);
         pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_TITLE );
@@ -392,7 +392,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
 
     if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
     {
-        bCreated = sal_True;
+        bCreated = true;
 
         pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask);
         pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_SUBTITLE );
@@ -440,7 +440,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
 
     if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
     {
-        bCreated = sal_True;
+        bCreated = true;
 
         pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask);
         pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_NOTES );
@@ -484,7 +484,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
 
     if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
     {
-        bCreated = sal_True;
+        bCreated = true;
 
         pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask);
         pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUNDOBJECTS );
@@ -506,7 +506,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
 
     if (!Find(aName, SD_STYLE_FAMILY_MASTERPAGE))
     {
-        bCreated = sal_True;
+        bCreated = true;
 
         pSheet = &Make(aName, SD_STYLE_FAMILY_MASTERPAGE,nUsedMask);
         pSheet->SetHelpId( aHelpFile, HID_PSEUDOSHEET_BACKGROUND );
@@ -961,7 +961,7 @@ void SdStyleSheetPool::UpdateStdNames()
             sal_uLong nHelpId   = pStyle->GetHelpId( aHelpFile );
             SfxStyleFamily eFam = pStyle->GetFamily();
 
-            sal_Bool bHelpKnown = sal_True;
+            bool bHelpKnown = true;
             OUString aNewName;
             sal_uInt16 nNameId = 0;
             switch( nHelpId )
@@ -1007,7 +1007,7 @@ void SdStyleSheetPool::UpdateStdNames()
 
                 default:
                     // 0 or wrong (old) HelpId
-                    bHelpKnown = sal_False;
+                    bHelpKnown = false;
             }
             if( bHelpKnown )
             {
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 8ee3a6d925d2..7dd6df603c86 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -553,7 +553,7 @@ void SdStyleSheet::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
  * @param bOnlyMissingItems If sal_True, only not set items are completed. With
  * sal_False, are items are overwritten.
  */
-void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, sal_Bool bOnlyMissingItems)
+void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems)
 {
     /* If not explicit set, adjust bullet width and text indent to new font
        height. */
@@ -1022,7 +1022,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con
     {
         if( pEntry->nWID == WID_STYLE_HIDDEN )
         {
-            sal_Bool bValue = sal_False;
+            bool bValue = false;
             if ( aValue >>= bValue )
                 SetHidden( bValue );
             return;
diff --git a/sd/source/core/undo/undoobjects.cxx b/sd/source/core/undo/undoobjects.cxx
index 9f1ab74db1ce..ec2989da1e63 100644
--- a/sd/source/core/undo/undoobjects.cxx
+++ b/sd/source/core/undo/undoobjects.cxx
@@ -285,7 +285,7 @@ void UndoAutoLayoutPosAndSize::Redo()
 {
     SdPage* pPage = static_cast< SdPage* >( mxPage.get() );
     if( pPage )
-        pPage->SetAutoLayout( pPage->GetAutoLayout(), sal_False, sal_False );
+        pPage->SetAutoLayout( pPage->GetAutoLayout(), false, false );
 }
 
 UndoGeoObject::UndoGeoObject( SdrObject& rNewObj )
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index 8dad60b441f6..4c7de1454a8c 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -192,7 +192,7 @@ struct UndoTransitionImpl
 
     sal_Int16 mnNewTransitionType;
     sal_Int16 mnNewTransitionSubtype;
-    sal_Bool mbNewTransitionDirection;
+    bool mbNewTransitionDirection;
     sal_Int32 mnNewTransitionFadeColor;
     double mfNewTransitionDuration;
     OUString maNewSoundFile;
@@ -202,7 +202,7 @@ struct UndoTransitionImpl
 
     sal_Int16 mnOldTransitionType;
     sal_Int16 mnOldTransitionSubtype;
-    sal_Bool mbOldTransitionDirection;
+    bool mbOldTransitionDirection;
     sal_Int32 mnOldTransitionFadeColor;
     double mfOldTransitionDuration;
     OUString maOldSoundFile;