unotools: sal_Bool -> bool

Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97

17 files changed, 75 insertions, 75 deletions

diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index adc1a5dbd9af..b32599db0d1d 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -195,7 +195,7 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
     }
     aStr += rLocaleWrapper.getDate(aDate);
     aStr += ", ";
-    aStr += rLocaleWrapper.getTime(aTime, sal_False, sal_False);
+    aStr += rLocaleWrapper.getTime(aTime, false, false);
     aStr += " ----\n";
 
     aStr = convertLineEnd(aStr, GetSystemLineEnd());
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 56adb934854c..988ddd85f918 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -388,7 +388,7 @@ namespace offapp
 
         sal_Bool bModified = sal_False;
         // the enabled flag
-        if (m_pEnablePooling->GetSavedValue() != m_pEnablePooling->IsChecked())
+        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;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index b44a347a64f4..eb66e8bcf3bd 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -177,7 +177,7 @@ sal_Bool  SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
         officecfg::Office::Common::Font::SourceViewFont::FontHeight::set(
             static_cast< sal_Int16 >(m_pFontHeightLB->GetSelectEntry().toInt32()),
             batch);
-    if(m_pNonPropFontsOnlyCB->GetSavedValue() != m_pNonPropFontsOnlyCB->IsChecked())
+    if(m_pNonPropFontsOnlyCB->GetSavedValue() != TriState(m_pNonPropFontsOnlyCB->IsChecked()))
         officecfg::Office::Common::Font::SourceViewFont::
             NonProportionalFontsOnly::set(
                 m_pNonPropFontsOnlyCB->IsChecked(), batch);
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 7cddcc66dd4b..366ac536d0a7 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -71,14 +71,14 @@ sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
     sal_Bool bModified = sal_False;
     boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
 
-    if( pAutocloseProcChk->IsChecked() != pAutocloseProcChk->GetSavedValue() )
+    if( TriState(pAutocloseProcChk->IsChecked()) != pAutocloseProcChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set( pAutocloseProcChk->IsChecked(), batch );
         CodeCompleteOptions::SetProcedureAutoCompleteOn( pAutocloseProcChk->IsChecked() );
         bModified = sal_True;
     }
 
-    if( pCodeCompleteChk->IsChecked() != pCodeCompleteChk->GetSavedValue() )
+    if( TriState(pCodeCompleteChk->IsChecked()) != pCodeCompleteChk->GetSavedValue() )
     {
         //boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
         officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set( pCodeCompleteChk->IsChecked(), batch );
@@ -86,28 +86,28 @@ sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
         bModified = sal_True;
     }
 
-    if( pUseExtendedTypesChk->IsChecked() != pUseExtendedTypesChk->GetSavedValue() )
+    if( TriState(pUseExtendedTypesChk->IsChecked()) != pUseExtendedTypesChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::UseExtended::set( pUseExtendedTypesChk->IsChecked(), batch );
         CodeCompleteOptions::SetExtendedTypeDeclaration( pUseExtendedTypesChk->IsChecked() );
         bModified = sal_True;
     }
 
-    if( pAutocloseParenChk->IsChecked() != pAutocloseParenChk->GetSavedValue() )
+    if( TriState(pAutocloseParenChk->IsChecked()) != pAutocloseParenChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::set( pAutocloseParenChk->IsChecked(), batch );
         CodeCompleteOptions::SetAutoCloseParenthesisOn( pAutocloseParenChk->IsChecked() );
         bModified = sal_True;
     }
 
-    if( pAutocloseQuotesChk->IsChecked() != pAutocloseQuotesChk->GetSavedValue() )
+    if( TriState(pAutocloseQuotesChk->IsChecked()) != pAutocloseQuotesChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::set( pAutocloseQuotesChk->IsChecked(), batch );
         CodeCompleteOptions::SetAutoCloseQuotesOn( pAutocloseQuotesChk->IsChecked() );
         bModified = sal_True;
     }
 
-    if( pAutoCorrectChk->IsChecked() != pAutoCorrectChk->GetSavedValue() )
+    if( TriState(pAutoCorrectChk->IsChecked()) != pAutoCorrectChk->GetSavedValue() )
     {
         officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::set( pAutoCorrectChk->IsChecked(), batch );
         CodeCompleteOptions::SetAutoCorrectOn( pAutoCorrectChk->IsChecked() );
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 3b78b3bc3cf2..951ac053f5dd 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -176,8 +176,8 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
 
     static struct ChkCBoxEntries{
         MSFltrPg2_CheckBoxEntries eType;
-        sal_Bool (SvtFilterOptions:: *FnIs)() const;
-        void (SvtFilterOptions:: *FnSet)( sal_Bool bFlag );
+        bool (SvtFilterOptions:: *FnIs)() const;
+        void (SvtFilterOptions:: *FnSet)( bool bFlag );
     } aChkArr[] = {
         { Math,     &SvtFilterOptions::IsMathType2Math,
                         &SvtFilterOptions::SetMathType2Math },
@@ -200,7 +200,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
         { InvalidCBEntry, 0, 0 }
     };
 
-    sal_Bool bCheck, bFirst = sal_True;
+    bool bCheck, bFirst = true;
     for( const ChkCBoxEntries* pArr = aChkArr;
             InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst )
     {
@@ -246,7 +246,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
 
     static struct ChkCBoxEntries{
         MSFltrPg2_CheckBoxEntries eType;
-        sal_Bool (SvtFilterOptions:: *FnIs)() const;
+        bool (SvtFilterOptions:: *FnIs)() const;
     } aChkArr[] = {
         { Math,     &SvtFilterOptions::IsMathType2Math },
         { Math,     &SvtFilterOptions::IsMath2MathType },
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 2aedac056ade..45e0d329578d 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -252,28 +252,28 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
     if ( bChecked != m_pExtHelpCB->GetSavedValue() )
         aHelpOptions.SetExtendedHelp( bChecked );
 
-    if ( m_pFileDlgCB->IsChecked() != m_pFileDlgCB->GetSavedValue() )
+    if ( TriState(m_pFileDlgCB->IsChecked()) != m_pFileDlgCB->GetSavedValue() )
     {
         SvtMiscOptions aMiscOpt;
         aMiscOpt.SetUseSystemFileDialog( !m_pFileDlgCB->IsChecked() );
         bModified = sal_True;
     }
 
-    if ( m_pPrintDlgCB->IsChecked() != m_pPrintDlgCB->GetSavedValue() )
+    if ( TriState(m_pPrintDlgCB->IsChecked()) != m_pPrintDlgCB->GetSavedValue() )
     {
         SvtMiscOptions aMiscOpt;
         aMiscOpt.SetUseSystemPrintDialog( !m_pPrintDlgCB->IsChecked() );
         bModified = sal_True;
     }
 
-    if ( m_pDocStatusCB->IsChecked() != m_pDocStatusCB->GetSavedValue() )
+    if ( TriState(m_pDocStatusCB->IsChecked()) != m_pDocStatusCB->GetSavedValue() )
     {
         SvtPrintWarningOptions aPrintOptions;
         aPrintOptions.SetModifyDocumentOnPrintingAllowed( m_pDocStatusCB->IsChecked() );
         bModified = sal_True;
     }
 
-    if ( m_pSaveAlwaysCB->IsChecked() != m_pSaveAlwaysCB->GetSavedValue() )
+    if ( TriState(m_pSaveAlwaysCB->IsChecked()) != m_pSaveAlwaysCB->GetSavedValue() )
     {
         SvtMiscOptions aMiscOpt;
         aMiscOpt.SetSaveAlwaysAllowed( m_pSaveAlwaysCB->IsChecked() );
@@ -751,7 +751,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
     }
 
 #if defined( UNX )
-    if ( m_pFontAntiAliasing->IsChecked() != m_pFontAntiAliasing->GetSavedValue() )
+    if ( TriState(m_pFontAntiAliasing->IsChecked()) != m_pFontAntiAliasing->GetSavedValue() )
     {
         pAppearanceCfg->SetFontAntiAliasing( m_pFontAntiAliasing->IsChecked() );
         bAppearanceChanged = sal_True;
@@ -764,7 +764,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
     }
 #endif
 
-    if ( m_pFontShowCB->IsChecked() != m_pFontShowCB->GetSavedValue() )
+    if ( TriState(m_pFontShowCB->IsChecked()) != m_pFontShowCB->GetSavedValue() )
     {
         aFontOpt.EnableFontWYSIWYG( m_pFontShowCB->IsChecked() );
         bModified = sal_True;
@@ -778,7 +778,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
         bAppearanceChanged = sal_True;
     }
 
-    if ( m_pFontHistoryCB->IsChecked() != m_pFontHistoryCB->GetSavedValue() )
+    if ( TriState(m_pFontHistoryCB->IsChecked()) != m_pFontHistoryCB->GetSavedValue() )
     {
         aFontOpt.EnableFontHistory( m_pFontHistoryCB->IsChecked() );
         bModified = sal_True;
@@ -787,7 +787,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
     // #i95644#  if disabled, do not use value, see in ::Reset()
     if(m_pUseHardwareAccell->IsEnabled())
     {
-        if(m_pUseHardwareAccell->IsChecked() != m_pUseHardwareAccell->GetSavedValue())
+        if(TriState(m_pUseHardwareAccell->IsChecked()) != m_pUseHardwareAccell->GetSavedValue())
         {
             pCanvasSettings->EnabledHardwareAcceleration(m_pUseHardwareAccell->IsChecked());
             bModified = sal_True;
@@ -1289,10 +1289,10 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
         aCompatOpts.SetDefault( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE, !bNewCJK );
     }
 
-    if(m_pDecimalSeparatorCB->GetSavedValue() != m_pDecimalSeparatorCB->IsChecked())
+    if(m_pDecimalSeparatorCB->GetSavedValue() != TriState(m_pDecimalSeparatorCB->IsChecked()))
         pLangConfig->aSysLocaleOptions.SetDecimalSeparatorAsLocale(m_pDecimalSeparatorCB->IsChecked());
 
-    if(m_pIgnoreLanguageChangeCB->GetSavedValue() != m_pIgnoreLanguageChangeCB->IsChecked())
+    if(m_pIgnoreLanguageChangeCB->GetSavedValue() != TriState(m_pIgnoreLanguageChangeCB->IsChecked()))
         pLangConfig->aSysLocaleOptions.SetIgnoreLanguageChange(m_pIgnoreLanguageChangeCB->IsChecked());
 
     // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default.
@@ -1380,7 +1380,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
         }
     }
 
-    if(m_pAsianSupportCB->GetSavedValue() != m_pAsianSupportCB->IsChecked() )
+    if(m_pAsianSupportCB->GetSavedValue() != TriState(m_pAsianSupportCB->IsChecked()) )
     {
         sal_Bool bChecked = m_pAsianSupportCB->IsChecked();
         pLangConfig->aLanguageOptions.SetAll(bChecked);
@@ -1399,7 +1399,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
         lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT);
     }
 
-    if ( m_pCTLSupportCB->GetSavedValue() != m_pCTLSupportCB->IsChecked() )
+    if ( m_pCTLSupportCB->GetSavedValue() != TriState(m_pCTLSupportCB->IsChecked()) )
     {
         SvtSearchOptions aOpt;
         aOpt.SetIgnoreDiacritics_CTL (true);
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 1e0957fb9b35..1ae7df384f98 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -113,28 +113,28 @@ sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
     if(aSize7NF->GetSavedValue() != aSize7NF->GetText())
         rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF->GetValue());
 
-    if(aNumbersEnglishUSCB->IsChecked() != aNumbersEnglishUSCB->GetSavedValue())
+    if(TriState(aNumbersEnglishUSCB->IsChecked()) != aNumbersEnglishUSCB->GetSavedValue())
         rHtmlOpt.SetNumbersEnglishUS(aNumbersEnglishUSCB->IsChecked());
 
-    if(aUnknownTagCB->IsChecked() != aUnknownTagCB->GetSavedValue())
+    if(TriState(aUnknownTagCB->IsChecked()) != aUnknownTagCB->GetSavedValue())
         rHtmlOpt.SetImportUnknown(aUnknownTagCB->IsChecked());
 
-    if(aIgnoreFontNamesCB->IsChecked() != aIgnoreFontNamesCB->GetSavedValue())
+    if(TriState(aIgnoreFontNamesCB->IsChecked()) != aIgnoreFontNamesCB->GetSavedValue())
         rHtmlOpt.SetIgnoreFontFamily(aIgnoreFontNamesCB->IsChecked());
 
     if(aExportLB->GetSelectEntryPos() != aExportLB->GetSavedValue())
         rHtmlOpt.SetExportMode(aPosToExportArr[aExportLB->GetSelectEntryPos()]);
 
-    if(aStarBasicCB->IsChecked() != aStarBasicCB->GetSavedValue())
+    if(TriState(aStarBasicCB->IsChecked()) != aStarBasicCB->GetSavedValue())
         rHtmlOpt.SetStarBasic(aStarBasicCB->IsChecked());
 
-    if(aStarBasicWarningCB->IsChecked() != aStarBasicWarningCB->GetSavedValue())
+    if(TriState(aStarBasicWarningCB->IsChecked()) != aStarBasicWarningCB->GetSavedValue())
         rHtmlOpt.SetStarBasicWarning(aStarBasicWarningCB->IsChecked());
 
-    if(aSaveGrfLocalCB->IsChecked() != aSaveGrfLocalCB->GetSavedValue())
+    if(TriState(aSaveGrfLocalCB->IsChecked()) != aSaveGrfLocalCB->GetSavedValue())
         rHtmlOpt.SetSaveGraphicsLocal(aSaveGrfLocalCB->IsChecked());
 
-    if(aPrintExtensionCB->IsChecked() != aPrintExtensionCB->GetSavedValue())
+    if(TriState(aPrintExtensionCB->IsChecked()) != aPrintExtensionCB->GetSavedValue())
         rHtmlOpt.SetPrintLayoutExtension(aPrintExtensionCB->IsChecked());
 
     if( aCharSetLB->GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() )
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 5e28451c6817..e5ec7b8d6334 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -644,14 +644,14 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
 {
     sal_Bool bModified = sal_False;
 
-    if ( m_pExperimentalCB->IsChecked() != m_pExperimentalCB->GetSavedValue() )
+    if ( TriState(m_pExperimentalCB->IsChecked()) != m_pExperimentalCB->GetSavedValue() )
     {
         SvtMiscOptions aMiscOpt;
         aMiscOpt.SetExperimentalMode( m_pExperimentalCB->IsChecked() );
         bModified = sal_True;
     }
 
-    if ( m_pMacroCB->IsChecked() != m_pMacroCB->GetSavedValue() )
+    if ( TriState(m_pMacroCB->IsChecked()) != m_pMacroCB->GetSavedValue() )
     {
         SvtMiscOptions aMiscOpt;
         aMiscOpt.SetMacroRecorderMode( m_pMacroCB->IsChecked() );
@@ -733,7 +733,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
     eErr = jfw_getEnabled( &bEnabled );
     DBG_ASSERT( JFW_E_NONE == eErr,
                 "SvxJavaOptionsPage::FillItemSet(): error in jfw_getEnabled" );
-    if ( bEnabled != m_pJavaEnableCB->IsChecked() )
+    if ( bool(bEnabled) != m_pJavaEnableCB->IsChecked() )
     {
         eErr = jfw_setEnabled( m_pJavaEnableCB->IsChecked() );
         DBG_ASSERT( JFW_E_NONE == eErr,
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 9e8976d500dc..3eca0b561c59 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -196,7 +196,7 @@ sal_Bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
 
     batch->commit();
 
-    if( m_pQuickLaunchCB->IsChecked() != m_pQuickLaunchCB->GetSavedValue())
+    if( TriState(m_pQuickLaunchCB->IsChecked()) != m_pQuickLaunchCB->GetSavedValue())
     {
         rSet.Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked()));
         bModified = sal_True;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index ce66f0960051..27d8da1de675 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -242,12 +242,12 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
 {
     sal_Bool bModified = sal_False;
     SvtSaveOptions aSaveOpt;
-    if(aLoadUserSettingsCB->IsChecked() != aLoadUserSettingsCB->GetSavedValue())
+    if(TriState(aLoadUserSettingsCB->IsChecked()) != aLoadUserSettingsCB->GetSavedValue())
     {
         aSaveOpt.SetLoadUserSettings(aLoadUserSettingsCB->IsChecked());
     }
 
-    if ( aLoadDocPrinterCB->IsChecked() != aLoadDocPrinterCB->GetSavedValue() )
+    if ( TriState(aLoadDocPrinterCB->IsChecked()) != aLoadDocPrinterCB->GetSavedValue() )
         aSaveOpt.SetLoadDocumentPrinter( aLoadDocPrinterCB->IsChecked() );
 
     if ( aODFVersionLB->GetSelectEntryPos() != aODFVersionLB->GetSavedValue() )
@@ -256,27 +256,27 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
         aSaveOpt.SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion( nVersion ) );
     }
 
-    if ( aDocInfoCB->IsChecked() != aDocInfoCB->GetSavedValue() )
+    if ( TriState(aDocInfoCB->IsChecked()) != aDocInfoCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ),
                                aDocInfoCB->IsChecked() ) );
         bModified |= sal_True;
     }
 
-    if ( aBackupCB->IsEnabled() && aBackupCB->IsChecked() != aBackupCB->GetSavedValue() )
+    if ( aBackupCB->IsEnabled() && TriState(aBackupCB->IsChecked()) != aBackupCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ),
                                aBackupCB->IsChecked() ) );
         bModified |= sal_True;
     }
 
-    if ( aAutoSaveCB->IsChecked() != aAutoSaveCB->GetSavedValue() )
+    if ( TriState(aAutoSaveCB->IsChecked()) != aAutoSaveCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
                                aAutoSaveCB->IsChecked() ) );
         bModified |= sal_True;
     }
-    if ( aWarnAlienFormatCB->IsChecked() != aWarnAlienFormatCB->GetSavedValue() )
+    if ( TriState(aWarnAlienFormatCB->IsChecked()) != aWarnAlienFormatCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ),
                                aWarnAlienFormatCB->IsChecked() ) );
@@ -290,21 +290,21 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
         bModified |= sal_True;
     }
 
-    if ( aUserAutoSaveCB->IsChecked() != aUserAutoSaveCB->GetSavedValue() )
+    if ( TriState(aUserAutoSaveCB->IsChecked()) != aUserAutoSaveCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
                                aUserAutoSaveCB->IsChecked() ) );
         bModified |= sal_True;
     }
     // save relatively
-    if ( aRelativeFsysCB->IsChecked() != aRelativeFsysCB->GetSavedValue() )
+    if ( TriState(aRelativeFsysCB->IsChecked()) != aRelativeFsysCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ),
                                aRelativeFsysCB->IsChecked() ) );
         bModified |= sal_True;
     }
 
-    if ( aRelativeInetCB->IsChecked() != aRelativeInetCB->GetSavedValue() )
+    if ( TriState(aRelativeInetCB->IsChecked()) != aRelativeInetCB->GetSavedValue() )
     {
         rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ),
                                aRelativeInetCB->IsChecked() ) );
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index a6a9eec5bbe6..20990c3a425b 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -163,9 +163,9 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
     sal_Bool bValue;
     sal_Int64 nValue;
 
-    if( m_pAutoCheckCheckBox->GetSavedValue() != m_pAutoCheckCheckBox->IsChecked() )
+    if( m_pAutoCheckCheckBox->GetSavedValue() != TriState(m_pAutoCheckCheckBox->IsChecked()) )
     {
-        bValue = (sal_True == m_pAutoCheckCheckBox->IsChecked());
+        bValue = m_pAutoCheckCheckBox->IsChecked();
         m_xUpdateAccess->replaceByName( "AutoCheckEnabled", uno::makeAny( bValue ) );
         bModified = sal_True;
     }
@@ -193,9 +193,9 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
         bModified = sal_True;
     }
 
-    if( m_pAutoDownloadCheckBox->GetSavedValue() != m_pAutoDownloadCheckBox->IsChecked() )
+    if( m_pAutoDownloadCheckBox->GetSavedValue() != TriState(m_pAutoDownloadCheckBox->IsChecked()) )
     {
-        bValue = (sal_True == m_pAutoDownloadCheckBox->IsChecked());
+        bValue = m_pAutoDownloadCheckBox->IsChecked();
         m_xUpdateAccess->replaceByName( "AutoDownloadEnabled", uno::makeAny( bValue ) );
         bModified = sal_True;
     }
diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index 7ff25c4ae5b1..ba2f3798ca92 100644
--- a/cui/source/options/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
@@ -51,14 +51,14 @@ namespace svx
         SecurityOptionsDialog( Window* pParent, SvtSecurityOptions* pOptions );
         ~SecurityOptionsDialog();
 
-        bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked() != sal_False; }
-        bool IsSignDocsChecked() const { return m_pSignDocsCB->IsChecked() != sal_False; }
-        bool IsPrintDocsChecked() const { return m_pPrintDocsCB->IsChecked() != sal_False; }
-        bool IsCreatePdfChecked() const { return m_pCreatePdfCB->IsChecked() != sal_False; }
-        bool IsRemovePersInfoChecked() const { return m_pRemovePersInfoCB->IsChecked() != sal_False; }
-        bool IsRecommPasswdChecked() const { return m_pRecommPasswdCB->IsChecked() != sal_False; }
-        bool IsCtrlHyperlinkChecked() const { return m_pCtrlHyperlinkCB->IsChecked() != sal_False; }
-        bool IsBlockUntrustedRefererLinksChecked() const { return m_pBlockUntrustedRefererLinksCB->IsChecked() != sal_False; }
+        bool IsSaveOrSendDocsChecked() const { return m_pSaveOrSendDocsCB->IsChecked(); }
+        bool IsSignDocsChecked() const { return m_pSignDocsCB->IsChecked(); }
+        bool IsPrintDocsChecked() const { return m_pPrintDocsCB->IsChecked(); }
+        bool IsCreatePdfChecked() const { return m_pCreatePdfCB->IsChecked(); }
+        bool IsRemovePersInfoChecked() const { return m_pRemovePersInfoCB->IsChecked(); }
+        bool IsRecommPasswdChecked() const { return m_pRecommPasswdCB->IsChecked(); }
+        bool IsCtrlHyperlinkChecked() const { return m_pCtrlHyperlinkCB->IsChecked(); }
+        bool IsBlockUntrustedRefererLinksChecked() const { return m_pBlockUntrustedRefererLinksCB->IsChecked(); }
     };
 
 //........................................................................
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 9394bbe26227..a438073716f4 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1522,9 +1522,9 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet&  )
         }
         pAutoCorrect->SaveCplSttExceptList(eLang);
     }
-    if(m_pAutoAbbrevCB->IsChecked() != m_pAutoAbbrevCB->GetSavedValue())
+    if(TriState(m_pAutoAbbrevCB->IsChecked()) != m_pAutoAbbrevCB->GetSavedValue())
         pAutoCorrect->SetAutoCorrFlag( SaveWordCplSttLst, m_pAutoAbbrevCB->IsChecked());
-    if(m_pAutoCapsCB->IsChecked() != m_pAutoCapsCB->GetSavedValue())
+    if(TriState(m_pAutoCapsCB->IsChecked()) != m_pAutoCapsCB->GetSavedValue())
         pAutoCorrect->SetAutoCorrFlag( SaveWordWrdSttLst, m_pAutoCapsCB->IsChecked());
     return sal_False;
 }
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 110e0b17982a..d2b44bb97ebc 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -2279,7 +2279,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
     }
 
     if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE &&
-         m_pIndividualWordsBtn->IsChecked() == m_pIndividualWordsBtn->GetSavedValue() )
+         TriState(m_pIndividualWordsBtn->IsChecked()) == m_pIndividualWordsBtn->GetSavedValue() )
         bChanged = false;
 
     if ( bChanged )
@@ -3211,7 +3211,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
     // Pair-Kerning
     nWhich = GetWhich( SID_ATTR_CHAR_AUTOKERN );
 
-    if ( m_pPairKerningBtn->IsChecked() != m_pPairKerningBtn->GetSavedValue() )
+    if ( TriState(m_pPairKerningBtn->IsChecked()) != m_pPairKerningBtn->GetSavedValue() )
     {
         rSet.Put( SvxAutoKernItem( m_pPairKerningBtn->IsChecked(), nWhich ) );
         bModified = sal_True;
@@ -3234,7 +3234,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
     if ( m_p0degRB->IsChecked() != m_p0degRB->GetSavedValue()  ||
          m_p90degRB->IsChecked() != m_p90degRB->GetSavedValue()  ||
          m_p270degRB->IsChecked() != m_p270degRB->GetSavedValue()  ||
-         m_pFitToLineCB->IsChecked() != m_pFitToLineCB->GetSavedValue() )
+         TriState(m_pFitToLineCB->IsChecked()) != m_pFitToLineCB->GetSavedValue() )
     {
         SvxCharRotateItem aItem( 0, m_pFitToLineCB->IsChecked(), nWhich );
         if (m_p90degRB->IsChecked())
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 46b9901e713d..d801568b801a 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -826,7 +826,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
     {
         case SVX_PAGE_MODE_CENTER:
         {
-            if ( m_pHorzBox->IsChecked() != m_pHorzBox->GetSavedValue() )
+            if ( TriState(m_pHorzBox->IsChecked()) != m_pHorzBox->GetSavedValue() )
             {
                 SfxBoolItem aHorz( GetWhich( SID_ATTR_PAGE_EXT1 ),
                                    m_pHorzBox->IsChecked() );
@@ -834,7 +834,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
                 bModified |= sal_True;
             }
 
-            if ( m_pVertBox->IsChecked() != m_pVertBox->GetSavedValue() )
+            if ( TriState(m_pVertBox->IsChecked()) != m_pVertBox->GetSavedValue() )
             {
                 SfxBoolItem aVert( GetWhich( SID_ATTR_PAGE_EXT2 ),
                                    m_pVertBox->IsChecked() );
@@ -857,7 +857,7 @@ sal_Bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet )
     }
 
     if(m_pRegisterCB->IsVisible() &&
-        (m_pRegisterCB->IsChecked() || m_pRegisterCB->GetSavedValue() != m_pRegisterCB->IsChecked()))
+       (m_pRegisterCB->IsChecked() || m_pRegisterCB->GetSavedValue() != TriState(m_pRegisterCB->IsChecked())))
     {
         const SfxBoolItem& rRegItem = (const SfxBoolItem&)rOldSet.Get(SID_SWREGISTER_MODE);
         SfxBoolItem* pRegItem = (SfxBoolItem*)rRegItem.Clone();
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index fd5da1ae6864..f3189681bc9b 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -256,7 +256,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
     }
 
     if ( m_pTopDist->IsValueModified() || m_pBottomDist->IsValueModified()
-            || m_pContextualCB->GetSavedValue() != m_pContextualCB->IsChecked())
+         || m_pContextualCB->GetSavedValue() != TriState(m_pContextualCB->IsChecked()))
     {
         nWhich = GetWhich( SID_ATTR_ULSPACE );
         SfxMapUnit eUnit = pPool->GetMetric( nWhich );
@@ -303,7 +303,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
     if ( m_pLeftIndent->IsValueModified() ||
          m_pFLineIndent->IsValueModified() ||
          m_pRightIndent->IsValueModified()
-         ||  m_pAutoCB->GetSavedValue() != m_pAutoCB->IsChecked() )
+         ||  m_pAutoCB->GetSavedValue() != TriState(m_pAutoCB->IsChecked()) )
     {
         nWhich = GetWhich( SID_ATTR_LRSPACE );
         SfxMapUnit eUnit = pPool->GetMetric( nWhich );
@@ -383,7 +383,7 @@ sal_Bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet )
                             rOutSet, SID_ATTR_PARA_REGISTER);
         SfxBoolItem* pRegItem = (SfxBoolItem*)pBoolItem->Clone();
         sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_REGISTER );
-        sal_Bool bSet = pRegItem->GetValue();
+        bool bSet = pRegItem->GetValue();
 
         if(m_pRegisterCB->IsChecked() != bSet )
         {
@@ -1081,7 +1081,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
     {
         eAdjust = SVX_ADJUST_BLOCK;
         bAdj = !m_pJustify->GetSavedValue() ||
-            m_pExpandCB->IsChecked() != m_pExpandCB->GetSavedValue() ||
+            TriState(m_pExpandCB->IsChecked()) != m_pExpandCB->GetSavedValue() ||
             m_pLastLineLB->GetSelectEntryPos() != m_pLastLineLB->GetSavedValue();
         bChecked = true;
     }
@@ -1119,7 +1119,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
             rOutSet.Put( aAdj );
         }
     }
-    if(m_pSnapToGridCB->IsChecked() != m_pSnapToGridCB->GetSavedValue())
+    if(TriState(m_pSnapToGridCB->IsChecked()) != m_pSnapToGridCB->GetSavedValue())
     {
         rOutSet.Put(SvxParaGridItem(m_pSnapToGridCB->IsChecked(), GetWhich( SID_ATTR_PARA_SNAPTOGRID )));
         bModified = sal_True;
@@ -2151,7 +2151,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
 {
     sal_Bool bRet = sal_False;
     SfxItemPool* pPool = rSet.GetPool();
-    if (m_pScriptSpaceCB->IsEnabled() && m_pScriptSpaceCB->IsChecked() != m_pScriptSpaceCB->GetSavedValue())
+    if (m_pScriptSpaceCB->IsEnabled() && TriState(m_pScriptSpaceCB->IsChecked()) != m_pScriptSpaceCB->GetSavedValue())
     {
         SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
             pPool->GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone();
@@ -2160,7 +2160,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
         delete pNewItem;
         bRet = sal_True;
     }
-    if (m_pHangingPunctCB->IsEnabled() && m_pHangingPunctCB->IsChecked() != m_pHangingPunctCB->GetSavedValue())
+    if (m_pHangingPunctCB->IsEnabled() && TriState(m_pHangingPunctCB->IsChecked()) != m_pHangingPunctCB->GetSavedValue())
     {
         SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
             pPool->GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone();
@@ -2169,7 +2169,7 @@ sal_Bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet )
         delete pNewItem;
         bRet = sal_True;
     }
-    if (m_pForbiddenRulesCB->IsEnabled() && m_pForbiddenRulesCB->IsChecked() != m_pForbiddenRulesCB->GetSavedValue())
+    if (m_pForbiddenRulesCB->IsEnabled() && TriState(m_pForbiddenRulesCB->IsChecked()) != m_pForbiddenRulesCB->GetSavedValue())
     {
         SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get(
             pPool->GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone();
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index bacecec08055..464ed484a210 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -814,7 +814,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
                     bModified = true;
                 }
             }
-            if(m_pHoriMirrorCB->IsEnabled() && m_pHoriMirrorCB->IsChecked() != m_pHoriMirrorCB->GetSavedValue())
+            if(m_pHoriMirrorCB->IsEnabled() && TriState(m_pHoriMirrorCB->IsChecked()) != m_pHoriMirrorCB->GetSavedValue())
                 bModified |= 0 != rSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked()));
 
             if ( m_pVMap )
@@ -851,7 +851,7 @@ sal_Bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet)
             }
 
             // #i18732#
-            if(m_pFollowCB->IsChecked() != m_pFollowCB->GetSavedValue())
+            if(TriState(m_pFollowCB->IsChecked()) != m_pFollowCB->GetSavedValue())
             {
                 //Writer internal type - based on SfxBoolItem
                 const SfxPoolItem* pItem = GetItem( rOldSet, SID_SW_FOLLOW_TEXT_FLOW);