sfx2: sal_Bool->bool

Change-Id: I1fd02cc148fd9a54d2092dad1e548f51a0813a14

41 files changed, 146 insertions, 144 deletions

diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index b966c033176e..b00df7aad0d6 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -382,23 +382,23 @@ namespace offapp
     }
 
 
-    sal_Bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
+    bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
     {
         commitTimeoutField();
 
-        sal_Bool bModified = sal_False;
+        bool bModified = false;
         // the enabled flag
         if (m_pEnablePooling->GetSavedValue() != TriState(m_pEnablePooling->IsChecked()))
         {
             _rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED);
-            bModified = sal_True;
+            bModified = true;
         }
 
         // the settings for the single drivers
         if (m_pDriverList->isModified())
         {
             _rSet.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS);
-            bModified = sal_True;
+            bModified = true;
         }
 
         return bModified;
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 535c8d5f6c93..27fef9a06487 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -56,7 +56,7 @@ namespace offapp
     protected:
         virtual bool        Notify( NotifyEvent& _rNEvt );
 
-        virtual sal_Bool    FillItemSet(SfxItemSet& _rSet);
+        virtual bool        FillItemSet(SfxItemSet& _rSet);
         virtual void        Reset(const SfxItemSet& _rSet);
         virtual void        ActivatePage( const SfxItemSet& _rSet);
 
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 4ea648141bd0..d71d7927054f 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -182,10 +182,10 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
 
 
 
-sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
+bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
 {
     // the settings for the single drivers
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     DatabaseRegistrations aRegistrations;
     sal_uLong nCount = pPathBox->GetEntryCount();
     for ( sal_uLong i = 0; i < nCount; ++i )
@@ -202,7 +202,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
     if ( m_nOldCount != aRegistrations.size() || m_bModified )
     {
         rCoreSet.Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER);
-        bModified = sal_True;
+        bModified = true;
     }
 
     return bModified;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 84a4868c6639..86fe6b513ae3 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -150,7 +150,7 @@ SfxTabPage*  SvxFontSubstTabPage::Create( Window* pParent,
     return new SvxFontSubstTabPage(pParent, rAttrSet);
 }
 
-sal_Bool  SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
+bool  SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
 {
     pConfig->ClearSubstitutions();// remove all entries
 
@@ -189,7 +189,7 @@ sal_Bool  SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
         boost::optional< OUString >(sFontName), batch);
     batch->commit();
 
-    return sal_False;
+    return false;
 }
 
 void  SvxFontSubstTabPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 16301725b623..bbc891555c9e 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -96,7 +96,7 @@ class SvxFontSubstTabPage : public SfxTabPage
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet);
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index df029f024529..0ac465444a23 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -187,9 +187,9 @@ void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ )
     m_pPrefBox->SetUpdateMode(true);
 }
 
-sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ )
+bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
 
     std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter;
     for( pIter = m_vectorOfModified.begin() ; pIter != m_vectorOfModified.end(); ++pIter )
@@ -198,7 +198,7 @@ sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ )
         Reference< XNameReplace > xNameReplace( xUpdateAccess, UNO_QUERY_THROW );
 
         xNameReplace->replaceByName( (*pIter)->Property, (*pIter)->Value );
-        bModified = sal_True;
+        bModified = true;
 
         Reference< util::XChangesBatch > xChangesBatch( xUpdateAccess, UNO_QUERY_THROW );
         xChangesBatch->commitChanges();
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 135fc21e39c5..e9a11d4a37b2 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -63,7 +63,7 @@ public:
    void     Reset(/* const SfxItemSet&*/ );
    void     FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess);
    com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate );
-   virtual sal_Bool FillItemSet( /* SfxItemSet& rSet*/ );
+   virtual bool FillItemSet( /* SfxItemSet& rSet*/ );
 
    virtual Size GetOptimalSize() const;
 };
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 47a2f5c14aea..88c2a2aea1cd 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -66,7 +66,7 @@ SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxIt
     return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet);
 }
 
-sal_Bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
 {
     //aConfig.Set... from controls
 
@@ -91,7 +91,7 @@ sal_Bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
     Application::MergeSystemSettings( aAllSettings );
     Application::SetSettings(aAllSettings);
 
-    return sal_False;
+    return false;
 }
 
 void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index c004d23a6b45..400d3ebe1f74 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -46,7 +46,7 @@ public:
     virtual ~SvxAccessibilityOptionsTabPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 2681de82301e..953e742629a8 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -160,7 +160,7 @@ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttr
     return new SvxAsianLayoutPage(pParent, rAttrSet);
 }
 
-sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
+bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
 {
     if(m_pCharKerningRB->IsChecked() != m_pCharKerningRB->GetSavedValue())
     {
@@ -212,7 +212,7 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
     }
     eLastUsedLanguageTypeForForbiddenCharacters = m_pLanguageLB->GetSelectLanguage();
 
-    return sal_False;
+    return false;
 }
 
 void SvxAsianLayoutPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 366ac536d0a7..bd8c9bd3c5ab 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -66,16 +66,16 @@ void SvxBasicIDEOptionsPage::LoadConfig()
     pUseExtendedTypesChk->Check( bExtended );
 }
 
-sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
+bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
 
     if( TriState(pAutocloseProcChk->IsChecked()) != pAutocloseProcChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set( pAutocloseProcChk->IsChecked(), batch );
         CodeCompleteOptions::SetProcedureAutoCompleteOn( pAutocloseProcChk->IsChecked() );
-        bModified = sal_True;
+        bModified = true;
     }
 
     if( TriState(pCodeCompleteChk->IsChecked()) != pCodeCompleteChk->GetSavedValue() )
@@ -83,35 +83,35 @@ sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
         //boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
         officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set( pCodeCompleteChk->IsChecked(), batch );
         CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk->IsChecked() );
-        bModified = sal_True;
+        bModified = true;
     }
 
     if( TriState(pUseExtendedTypesChk->IsChecked()) != pUseExtendedTypesChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::UseExtended::set( pUseExtendedTypesChk->IsChecked(), batch );
         CodeCompleteOptions::SetExtendedTypeDeclaration( pUseExtendedTypesChk->IsChecked() );
-        bModified = sal_True;
+        bModified = true;
     }
 
     if( TriState(pAutocloseParenChk->IsChecked()) != pAutocloseParenChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::set( pAutocloseParenChk->IsChecked(), batch );
         CodeCompleteOptions::SetAutoCloseParenthesisOn( pAutocloseParenChk->IsChecked() );
-        bModified = sal_True;
+        bModified = true;
     }
 
     if( TriState(pAutocloseQuotesChk->IsChecked()) != pAutocloseQuotesChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::set( pAutocloseQuotesChk->IsChecked(), batch );
         CodeCompleteOptions::SetAutoCloseQuotesOn( pAutocloseQuotesChk->IsChecked() );
-        bModified = sal_True;
+        bModified = true;
     }
 
     if( TriState(pAutoCorrectChk->IsChecked()) != pAutoCorrectChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::set( pAutoCorrectChk->IsChecked(), batch );
         CodeCompleteOptions::SetAutoCorrectOn( pAutoCorrectChk->IsChecked() );
-        bModified = sal_True;
+        bModified = true;
     }
 
     if( bModified )
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index 3e75c8116dbf..13c8490383a9 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -41,7 +41,7 @@ public:
     ~SvxBasicIDEOptionsPage();
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
-    virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+    virtual bool FillItemSet( SfxItemSet& rSet );
     virtual void Reset( const SfxItemSet& rSet );
     virtual void FillUserData();
 };
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 5fac95aeaf9e..673a08f013af 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -108,12 +108,12 @@ SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& r
     return new SvxDefaultColorOptPage( pParent, rAttrs );
 }
 
-sal_Bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
 {
     if( pColorConfig )
         rOutAttrs.Put( *(static_cast< SfxPoolItem* >(pColorConfig)));
 
-    return sal_True;
+    return true;
 }
 
 void SvxDefaultColorOptPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 8c38565857c2..d91ebb6b6149 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -64,7 +64,7 @@ public:
     void    Construct();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rInAttrs );
-    virtual sal_Bool        FillItemSet( SfxItemSet& rOutAttrs );
+    virtual bool        FillItemSet( SfxItemSet& rOutAttrs );
     virtual void        Reset( const SfxItemSet& rInAttrs );
 };
 
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 6b97a1aaa182..f29162d19ebb 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1082,7 +1082,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r
     return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) );
 }
 
-sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet&  )
+bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet&  )
 {
     bFillItemSetCalled = sal_True;
     if(m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos())
@@ -1094,7 +1094,7 @@ sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet&  )
         pColorConfig->Commit();
     if(pExtColorConfig->IsModified())
         pExtColorConfig->Commit();
-    return sal_True;
+    return true;
 }
 
 void SvxColorOptionsTabPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 119909fdd7ab..4c6216cf9f27 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -52,7 +52,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
     virtual int         DeactivatePage( SfxItemSet* pSet );
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index ebd2e495c813..96e95a53d554 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -66,9 +66,9 @@ SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrS
     return new SvxCTLOptionsPage( pParent, rAttrSet );
 }
 
-sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
+bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     SvtCTLOptions aCTLOptions;
 
     // Sequence checking
@@ -76,20 +76,20 @@ sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
     if ( bChecked != m_pSequenceCheckingCB->GetSavedValue() )
     {
         aCTLOptions.SetCTLSequenceChecking( bChecked );
-        bModified = sal_True;
+        bModified = true;
     }
 
     bChecked = m_pRestrictedCB->IsChecked();
     if( bChecked != m_pRestrictedCB->GetSavedValue() )
     {
         aCTLOptions.SetCTLSequenceCheckingRestricted( bChecked );
-        bModified = sal_True;
+        bModified = true;
     }
     bChecked = m_pTypeReplaceCB->IsChecked();
     if( bChecked != m_pTypeReplaceCB->GetSavedValue())
     {
         aCTLOptions.SetCTLSequenceCheckingTypeAndReplace(bChecked);
-        bModified = sal_True;
+        bModified = true;
     }
 
     bool bLogicalChecked = m_pMovementLogicalRB->IsChecked();
@@ -100,14 +100,14 @@ sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
         SvtCTLOptions::CursorMovement eMovement =
             bLogicalChecked ? SvtCTLOptions::MOVEMENT_LOGICAL : SvtCTLOptions::MOVEMENT_VISUAL;
         aCTLOptions.SetCTLCursorMovement( eMovement );
-        bModified = sal_True;
+        bModified = true;
     }
 
     sal_uInt16 nPos = m_pNumeralsLB->GetSelectEntryPos();
     if ( nPos != m_pNumeralsLB->GetSavedValue() )
     {
         aCTLOptions.SetCTLTextNumerals( (SvtCTLOptions::TextNumerals)nPos );
-        bModified = sal_True;
+        bModified = true;
     }
 
     return bModified;
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index 358698c3ac16..32ae80c86873 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -48,7 +48,7 @@ public:
     virtual ~SvxCTLOptionsPage();
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index cf9bc8d45f54..f0f58ea1e90a 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -76,7 +76,7 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
     return new OfaMSFilterTabPage( pParent, rAttrSet );
 }
 
-sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
 {
     SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
@@ -100,7 +100,7 @@ sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
     if( aPBasicStgCB->GetSavedValue() != (bFlag = aPBasicStgCB->IsChecked()))
         rOpt.SetLoadPPointBasicStorage( bFlag );
 
-    return sal_False;
+    return false;
 }
 
 void OfaMSFilterTabPage::Reset( const SfxItemSet& )
@@ -170,7 +170,7 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
     return new OfaMSFilterTabPage2( pParent, rAttrSet );
 }
 
-sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
 {
     SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
@@ -221,7 +221,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
         }
     }
 
-    return sal_True;
+    return true;
 }
 
 void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index da6459fc41be..9ee8a71c36a4 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -46,7 +46,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
@@ -95,7 +95,7 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 67cc8e44efcb..c3794a85c952 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -242,7 +242,7 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
 
 
 
-sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
 {
     sal_Bool bModified = sal_False;
 
@@ -652,7 +652,7 @@ SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
     return new OfaViewTabPage(pParent, rAttrSet);
 }
 
-sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
+bool OfaViewTabPage::FillItemSet( SfxItemSet& )
 {
     SvtFontOptions aFontOpt;
     SvtMenuOptions aMenuOpt;
@@ -1179,7 +1179,7 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool
     }
 }
 
-sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
 {
     // lock configuration broadcasters so that we can coordinate the notifications
     pLangConfig->aSysLocaleOptions.BlockBroadcasts( true );
@@ -1414,7 +1414,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
     pLangConfig->aLanguageOptions.BlockBroadcasts( false );
     pLangConfig->aLinguConfig.BlockBroadcasts( false );
 
-    return sal_False;
+    return false;
 }
 
 void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 79aaeaed8c8a..8c28f7ac31a4 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -70,7 +70,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
@@ -125,7 +125,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
@@ -167,7 +167,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index b9e639708bff..647d1fde3fb9 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -304,19 +304,19 @@ SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrS
 
 
 
-sal_Bool SvxGeneralTabPage::FillItemSet( SfxItemSet& )
+bool SvxGeneralTabPage::FillItemSet( SfxItemSet& )
 {
     // remove leading and trailing whitespaces
     for (unsigned i = 0; i != vFields.size(); ++i)
         vFields[i]->pEdit->SetText(comphelper::string::strip(vFields[i]->pEdit->GetText(), ' '));
 
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     bModified |= GetAddress_Impl();
     SvtSaveOptions aSaveOpt;
     if ( m_pUseDataCB->IsChecked() != aSaveOpt.IsUseUserData() )
     {
         aSaveOpt.SetUseUserData( m_pUseDataCB->IsChecked() );
-        bModified |= sal_True;
+        bModified |= true;
     }
     return bModified;
 }
@@ -383,7 +383,7 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit )
 
 
 
-sal_Bool SvxGeneralTabPage::GetAddress_Impl()
+bool SvxGeneralTabPage::GetAddress_Impl()
 {
     // updating
     SvtUserOptions aUserOpt;
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 9b5ecba3a71b..3f71addc63e1 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -95,7 +95,7 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
     return new OfaHtmlTabPage(pParent, rAttrSet);
 }
 
-sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
+bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
 {
     SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
     if(aSize1NF->GetSavedValue() != aSize1NF->GetText())
@@ -140,7 +140,7 @@ sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
     if( aCharSetLB->GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() )
         rHtmlOpt.SetTextEncoding( aCharSetLB->GetSelectTextEncoding() );
 
-    return sal_False;
+    return false;
 }
 
 void OfaHtmlTabPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 6469f8f75def..2aa122f930ff 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -59,7 +59,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
 };
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index d802fb5dbd35..759c68152165 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -393,9 +393,9 @@ void SvxProxyTabPage::Reset(const SfxItemSet&)
     EnableControls_Impl( m_pProxyModeLB->GetSelectEntryPos() == 2 );
 }
 
-sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
+bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
 {
-    sal_Bool bModified=sal_False;
+    bool bModified = false;
 
     try {
         Reference< beans::XPropertySet > xPropertySet(m_xConfigurationUpdateAccess, UNO_QUERY_THROW );
@@ -406,54 +406,54 @@ sal_Bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
             if( nSelPos == 1 )
             {
                 RestoreConfigDefaults_Impl();
-                return sal_True;
+                return true;
             }
 
             xPropertySet->setPropertyValue(aProxyModePN,
                 makeAny((sal_Int32) nSelPos));
-            bModified = sal_True;
+            bModified = true;
         }
 
         if(m_pHttpProxyED->GetSavedValue() != m_pHttpProxyED->GetText())
         {
             xPropertySet->setPropertyValue( aHttpProxyPN, makeAny(m_pHttpProxyED->GetText()));
-            bModified = sal_True;
+            bModified = true;
         }
 
         if ( m_pHttpPortED->GetSavedValue() != m_pHttpPortED->GetText() )
         {
             xPropertySet->setPropertyValue( aHttpPortPN, makeAny(m_pHttpPortED->GetText().toInt32()));
-            bModified = sal_True;
+            bModified = true;
         }
 
         if( m_pHttpsProxyED->GetSavedValue() != m_pHttpsProxyED->GetText() )
         {
             xPropertySet->setPropertyValue( aHttpsProxyPN, makeAny(m_pHttpsProxyED->GetText()) );
-            bModified = sal_True;
+            bModified = true;
         }
 
         if ( m_pHttpsPortED->GetSavedValue() != m_pHttpsPortED->GetText() )
         {
             xPropertySet->setPropertyValue( aHttpsPortPN, makeAny(m_pHttpsPortED->GetText().toInt32()) );
-            bModified = sal_True;
+            bModified = true;
         }
 
         if( m_pFtpProxyED->GetSavedValue() != m_pFtpProxyED->GetText())
         {
             xPropertySet->setPropertyValue( aFtpProxyPN, makeAny(m_pFtpProxyED->GetText()) );
-            bModified = sal_True;
+            bModified = true;
         }
 
         if ( m_pFtpPortED->GetSavedValue() != m_pFtpPortED->GetText() )
         {
             xPropertySet->setPropertyValue( aFtpPortPN, makeAny(m_pFtpPortED->GetText().toInt32()));
-            bModified = sal_True;
+            bModified = true;
         }
 
         if ( m_pNoProxyForED->GetSavedValue() != m_pNoProxyForED->GetText() )
         {
             xPropertySet->setPropertyValue( aNoProxyDescPN, makeAny( m_pNoProxyForED->GetText()));
-            bModified = sal_True;
+            bModified = true;
         }
 
         Reference< util::XChangesBatch > xChangesBatch(m_xConfigurationUpdateAccess, UNO_QUERY_THROW);
@@ -890,7 +890,7 @@ namespace
     }
 }
 
-sal_Bool SvxSecurityTabPage::FillItemSet( SfxItemSet& )
+bool SvxSecurityTabPage::FillItemSet( SfxItemSet& )
 {
     bool bModified = false;
 
@@ -930,7 +930,8 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent,
 {
     return new MozPluginTabPage( pParent, rAttrSet );
 }
-sal_Bool MozPluginTabPage::FillItemSet( SfxItemSet& )
+
+bool MozPluginTabPage::FillItemSet( SfxItemSet& )
 {
     sal_Bool hasInstall = isInstalled();
     sal_Bool hasChecked = m_pWBasicCodeCB->IsChecked();
@@ -945,8 +946,9 @@ sal_Bool MozPluginTabPage::FillItemSet( SfxItemSet& )
     else{
         // do nothing
     }
-    return sal_True;
+    return true;
 }
+
 void MozPluginTabPage::Reset( const SfxItemSet& )
 {
         m_pWBasicCodeCB->Check( isInstalled());
@@ -1232,7 +1234,7 @@ SfxTabPage*  SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
 
 /* -------------------------------------------------------------------------*/
 
-sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
+bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
 {
     sal_Bool bMailModified = sal_False;
     if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->GetSavedValue() != m_pMailerURLED->GetText())
@@ -1243,7 +1245,7 @@ sal_Bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
     if ( bMailModified )
         pImpl->aMailConfig.Commit();
 
-    return sal_False;
+    return false;
 }
 
 /* -------------------------------------------------------------------------*/
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 1403b9e47a32..5b7243f85171 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -105,7 +105,7 @@ private:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
@@ -175,7 +175,7 @@ protected:
 
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
@@ -195,7 +195,7 @@ public:
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 
 };
@@ -220,7 +220,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index bb3f0ed983b5..be81c0c49baf 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -640,22 +640,22 @@ SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttr
 
 
 
-sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
+bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
 
     if ( TriState(m_pExperimentalCB->IsChecked()) != m_pExperimentalCB->GetSavedValue() )
     {
         SvtMiscOptions aMiscOpt;
         aMiscOpt.SetExperimentalMode( m_pExperimentalCB->IsChecked() );
-        bModified = sal_True;
+        bModified = true;
     }
 
     if ( TriState(m_pMacroCB->IsChecked()) != m_pMacroCB->GetSavedValue() )
     {
         SvtMiscOptions aMiscOpt;
         aMiscOpt.SetMacroRecorderMode( m_pMacroCB->IsChecked() );
-        bModified = sal_True;
+        bModified = true;
     }
 
 #if HAVE_FEATURE_JAVA
@@ -674,7 +674,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
                     "SvxJavaOptionsPage::FillItemSet(): error in jfw_setVMParameters" );
         pParamArrIter = pParamArr;
         rtl_freeMemory( pParamArr );
-        bModified = sal_True;
+        bModified = true;
     }
 
     if ( m_pPathDlg )
@@ -685,7 +685,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
             eErr = jfw_setUserClassPath( sPath.pData );
             DBG_ASSERT( JFW_E_NONE == eErr,
                         "SvxJavaOptionsPage::FillItemSet(): error in jfw_setUserClassPath" );
-            bModified = sal_True;
+            bModified = true;
         }
     }
 
@@ -721,7 +721,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
                     eErr = jfw_setSelectedJRE( pInfo );
                     DBG_ASSERT( JFW_E_NONE == eErr,
                                 "SvxJavaOptionsPage::FillItemSet(): error in jfw_setSelectedJRE" );
-                    bModified = sal_True;
+                    bModified = true;
                 }
             }
             jfw_freeJavaInfo( pSelectedJava );
@@ -738,7 +738,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
         eErr = jfw_setEnabled( m_pJavaEnableCB->IsChecked() );
         DBG_ASSERT( JFW_E_NONE == eErr,
                     "SvxJavaOptionsPage::FillItemSet(): error in jfw_setEnabled" );
-        bModified = sal_True;
+        bModified = true;
     }
 #endif
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index e37baa756c10..6a438f739b50 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -109,7 +109,7 @@ public:
 
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
 
-    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
+    virtual bool            FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
     virtual void            FillUserData();
 };
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index a3828d9e4717..10bb9e68a474 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -211,16 +211,16 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& )
 }
 
 
-sal_Bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& )
+bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& )
 {
     sal_Int32 nOldVal = nTransliterationFlags;
     nTransliterationFlags = GetTransliterationFlags_Impl();
-    sal_Bool bModified = nOldVal != nTransliterationFlags;
+    bool bModified = nOldVal != nTransliterationFlags;
 
     if (!IsSaveOptions())
         return bModified;
 
-    bModified = sal_False;
+    bModified = false;
     SvtSearchOptions aOpt;
     sal_Bool bNewVal, bChanged;
 
@@ -229,133 +229,133 @@ sal_Bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& )
     if (bChanged)
     {
         aOpt.SetMatchCase(!bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchFullHalfWidth->IsChecked();
     bChanged = bNewVal != m_pMatchFullHalfWidth->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchFullHalfWidthForms( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchHiraganaKatakana->IsChecked();
     bChanged = bNewVal != m_pMatchHiraganaKatakana->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchHiraganaKatakana( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchContractions->IsChecked();
     bChanged = bNewVal != m_pMatchContractions->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchContractions( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchMinusDashChoon->IsChecked();
     bChanged = bNewVal != m_pMatchMinusDashChoon->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchMinusDashChoon( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchRepeatCharMarks->IsChecked();
     bChanged = bNewVal != m_pMatchRepeatCharMarks->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchRepeatCharMarks( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchVariantFormKanji->IsChecked();
     bChanged = bNewVal != m_pMatchVariantFormKanji->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchVariantFormKanji( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchOldKanaForms->IsChecked();
     bChanged = bNewVal != m_pMatchOldKanaForms->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchOldKanaForms( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchDiziDuzu->IsChecked();
     bChanged = bNewVal != m_pMatchDiziDuzu->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchDiziDuzu( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchBavaHafa->IsChecked();
     bChanged = bNewVal != m_pMatchBavaHafa->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchBavaHafa( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchTsithichiDhizi->IsChecked();
     bChanged = bNewVal != m_pMatchTsithichiDhizi->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchTsithichiDhizi( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchHyuiyuByuvyu->IsChecked();
     bChanged = bNewVal != m_pMatchHyuiyuByuvyu->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchHyuiyuByuvyu( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchSesheZeje->IsChecked();
     bChanged = bNewVal != m_pMatchSesheZeje->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchSesheZeje( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchIaiya->IsChecked();
     bChanged = bNewVal != m_pMatchIaiya->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchIaiya( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchKiku->IsChecked();
     bChanged = bNewVal != m_pMatchKiku->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetMatchKiku( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pIgnorePunctuation->IsChecked();
     bChanged = bNewVal != m_pIgnorePunctuation->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetIgnorePunctuation( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pIgnoreWhitespace->IsChecked();
     bChanged = bNewVal != m_pIgnoreWhitespace->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetIgnoreWhitespace( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pMatchProlongedSoundMark->IsChecked();
     bChanged = bNewVal != m_pMatchProlongedSoundMark->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetIgnoreProlongedSoundMark( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
     bNewVal  = m_pIgnoreMiddleDot->IsChecked();
     bChanged = bNewVal != m_pIgnoreMiddleDot->GetSavedValue();
     if (bChanged)
     {
         aOpt.SetIgnoreMiddleDot( bNewVal );
-        bModified = sal_True;
+        bModified = true;
     }
 
     return bModified;
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index f1231fccda9e..6262375083e3 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -67,7 +67,7 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
 
     virtual void        Reset( const SfxItemSet& rSet );
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
 
     sal_Bool                IsSaveOptions() const           { return bSaveOptions; }
     void                EnableSaveOptions( sal_Bool bVal )  { bSaveOptions = bVal; }
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index b2f7c1ee5736..acf6a1269c22 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1183,9 +1183,9 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
 
 
 
-sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
+bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
 {
-    sal_Bool bModified = sal_True; // !!!!
+    bool bModified = true; // !!!!
 
     // if not HideGroups was called with GROUP_MODULES...
     if (m_pLinguModulesCLB->IsVisible())
@@ -1340,7 +1340,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
     {
         rCoreSet.Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ),
                                 bNewAutoCheck ) );
-        bModified |= sal_True;
+        bModified |= true;
     }
 
     return bModified;
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 80249e37e940..f67f5b883b96 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -155,9 +155,9 @@ SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAt
 
 
 
-sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
+bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
 
     boost::shared_ptr< comphelper::ConfigurationChanges > batch(
         comphelper::ConfigurationChanges::create());
@@ -199,7 +199,7 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
     if( TriState(m_pQuickLaunchCB->IsChecked()) != m_pQuickLaunchCB->GetSavedValue())
     {
         rSet.Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked()));
-        bModified = sal_True;
+        bModified = true;
     }
 
     return bModified;
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index ba85a7e74e60..cba5303e1b36 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -61,7 +61,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 788d08714e81..9d6f538701cf 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -264,7 +264,7 @@ SfxTabPage* SvxPathTabPage::Create( Window* pParent,
 
 
 
-sal_Bool SvxPathTabPage::FillItemSet( SfxItemSet& )
+bool SvxPathTabPage::FillItemSet( SfxItemSet& )
 {
     for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
     {
@@ -273,7 +273,7 @@ sal_Bool SvxPathTabPage::FillItemSet( SfxItemSet& )
         if ( pPathImpl->eState == SFX_ITEM_SET )
             SetPathList( nRealId, pPathImpl->sUserPath, pPathImpl->sWritablePath );
     }
-    return sal_True;
+    return true;
 }
 
 
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index b9490de6c6a4..21a4474618be 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -238,9 +238,9 @@ void SfxSaveTabPage::DetectHiddenControls()
 
 }
 
-sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
+bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
     SvtSaveOptions aSaveOpt;
     if(TriState(aLoadUserSettingsCB->IsChecked()) != aLoadUserSettingsCB->GetSavedValue())
     {
@@ -260,55 +260,55 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ),
                                aDocInfoCB->IsChecked() ) );
-        bModified |= sal_True;
+        bModified |= true;
     }
 
     if ( aBackupCB->IsEnabled() && TriState(aBackupCB->IsChecked()) != aBackupCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ),
                                aBackupCB->IsChecked() ) );
-        bModified |= sal_True;
+        bModified |= true;
     }
 
     if ( TriState(aAutoSaveCB->IsChecked()) != aAutoSaveCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
                                aAutoSaveCB->IsChecked() ) );
-        bModified |= sal_True;
+        bModified |= true;
     }
     if ( TriState(aWarnAlienFormatCB->IsChecked()) != aWarnAlienFormatCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ),
                                aWarnAlienFormatCB->IsChecked() ) );
-        bModified |= sal_True;
+        bModified |= true;
     }
 
     if ( aAutoSaveEdit->GetText() != aAutoSaveEdit->GetSavedValue() )
     {
         rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
                                  (sal_uInt16)aAutoSaveEdit->GetValue() ) );
-        bModified |= sal_True;
+        bModified |= true;
     }
 
     if ( TriState(aUserAutoSaveCB->IsChecked()) != aUserAutoSaveCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
                                aUserAutoSaveCB->IsChecked() ) );
-        bModified |= sal_True;
+        bModified |= true;
     }
     // save relatively
     if ( TriState(aRelativeFsysCB->IsChecked()) != aRelativeFsysCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ),
                                aRelativeFsysCB->IsChecked() ) );
-        bModified |= sal_True;
+        bModified |= true;
     }
 
     if ( TriState(aRelativeInetCB->IsChecked()) != aRelativeInetCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ),
                                aRelativeInetCB->IsChecked() ) );
-        bModified |= sal_True;
+        bModified |= true;
     }
 
     SvtModuleOptions aModuleOpt;
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index a3d2a1250e0e..b1a1485c6c7b 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -76,7 +76,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
-    virtual sal_Bool        FillItemSet( SfxItemSet& rSet );
+    virtual bool        FillItemSet( SfxItemSet& rSet );
     virtual void        Reset( const SfxItemSet& rSet );
 };
 
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 41f875cccca7..788ef9399322 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -157,9 +157,9 @@ SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
 
 
 
-sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
+bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
 {
-    sal_Bool bModified = sal_False;
+    bool bModified = false;
 
     sal_Bool bValue;
     sal_Int64 nValue;
@@ -168,7 +168,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
     {
         bValue = m_pAutoCheckCheckBox->IsChecked();
         m_xUpdateAccess->replaceByName( "AutoCheckEnabled", uno::makeAny( bValue ) );
-        bModified = sal_True;
+        bModified = true;
     }
 
     nValue = 0;
@@ -191,14 +191,14 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
     if( nValue > 0 )
     {
         m_xUpdateAccess->replaceByName( "CheckInterval", uno::makeAny( nValue ) );
-        bModified = sal_True;
+        bModified = true;
     }
 
     if( m_pAutoDownloadCheckBox->GetSavedValue() != TriState(m_pAutoDownloadCheckBox->IsChecked()) )
     {
         bValue = m_pAutoDownloadCheckBox->IsChecked();
         m_xUpdateAccess->replaceByName( "AutoDownloadEnabled", uno::makeAny( bValue ) );
-        bModified = sal_True;
+        bModified = true;
     }
 
     OUString sValue, aURL;
@@ -208,7 +208,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
         ( ! aURL.equals( sValue ) ) )
     {
         m_xUpdateAccess->replaceByName( "DownloadDestination", uno::makeAny( aURL ) );
-        bModified = sal_True;
+        bModified = true;
     }
 
     uno::Reference< util::XChangesBatch > xChangesBatch(m_xUpdateAccess, uno::UNO_QUERY);
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 5610fb0fe9a5..53e049161aa9 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -56,7 +56,7 @@ public:
 
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
 
-    virtual sal_Bool            FillItemSet( SfxItemSet& rSet );
+    virtual bool            FillItemSet( SfxItemSet& rSet );
     virtual void            Reset( const SfxItemSet& rSet );
     virtual void            FillUserData();
 };
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 0588e384bdc7..21cb2b4dde41 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -108,7 +108,7 @@ SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet
     return new SvxPersonalizationTabPage( pParent, rSet );
 }
 
-sal_Bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet & )
+bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet & )
 {
     // persona
     OUString aPersona( "default" );
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index f3ef5228daa7..db323d061b90 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -32,7 +32,7 @@ public:
     static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet );
 
     /// Apply the settings ([OK] button).
-    virtual sal_Bool FillItemSet( SfxItemSet &rSet );
+    virtual bool FillItemSet( SfxItemSet &rSet );
 
     /// Reset to default settings ([Revert] button).
     virtual void Reset( const SfxItemSet &rSet );