diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-19 12:30:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-19 12:47:07 +0100 |
| commit | 973b47a336b239cc92f1789013d28e5bd55f859f (patch) | |
| tree | 6481f2803208409896aecf6745239cf07953baab | |
| parent | 9ad3fc29dd98167c35fcb599da0b4e764ddf04dd (diff) | |
unotools: sal_Bool -> bool
Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97
130 files changed, 1306 insertions, 1306 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index b7b36682dcff..8c7e7b3e13c5 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -150,7 +150,7 @@ xmlDocPtr Chart2ExportTest::parseExport(const OUString& rDir, const OUString& rF uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), pTempFile->GetURL()); uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(findChartFile(rDir, xNameAccess)), uno::UNO_QUERY); CPPUNIT_ASSERT(xInputStream.is()); - boost::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, sal_True)); + boost::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); pStream->Seek(STREAM_SEEK_TO_END); sal_Size nSize = pStream->Tell(); pStream->Seek(0); 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); diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 8daf83df5dec..8f480f81cce0 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -435,7 +435,7 @@ SubstitutePathVariables_Impl::SubstitutePathVariables_Impl( const Link& aNotifyL // We need it to get information about changes outside these class on our configuration branch Sequence< OUString > aNotifySeq( 1 ); aNotifySeq[0] = "SharePoints"; - EnableNotification( aNotifySeq, sal_True ); + EnableNotification( aNotifySeq, true ); } SubstitutePathVariables_Impl::~SubstitutePathVariables_Impl() diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index ed3d8574a0b5..09dd3827d275 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -44,7 +44,7 @@ public: sal_Bool GetIsAllowAnimatedGraphics() const; sal_Bool GetIsAllowAnimatedText() const; sal_Bool GetIsAutomaticFontColor() const; - sal_Bool GetIsSystemFont() const; + bool GetIsSystemFont() const; sal_Int16 GetHelpTipSeconds() const; sal_Bool IsSelectionInReadonly() const; sal_Bool GetAutoDetectSystemHC() const; diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx index fe328cd95d5a..e8e4d2e7e5ed 100644 --- a/include/svtools/optionsdrawinglayer.hxx +++ b/include/svtools/optionsdrawinglayer.hxx @@ -136,7 +136,7 @@ class SVT_DLLPUBLIC SvtOptionsDrawinglayer sal_Bool IsAAPossibleOnThisSystem() const; // primitives - sal_Bool IsAntiAliasing() const; + bool IsAntiAliasing() const; sal_Bool IsSnapHorVerLinesToDiscrete() const; sal_Bool IsSolidDragCreate() const; sal_Bool IsRenderDecoratedTextDirect() const; diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx index 617fc421d5e1..7a64584024de 100644 --- a/include/unotools/atom.hxx +++ b/include/unotools/atom.hxx @@ -47,7 +47,7 @@ namespace utl { AtomProvider(); ~AtomProvider(); - int getAtom( const OUString&, sal_Bool bCreate = sal_False ); + int getAtom( const OUString&, bool bCreate = false ); const OUString& getString( int ) const; }; @@ -59,7 +59,7 @@ namespace utl { MultiAtomProvider(); ~MultiAtomProvider(); - int getAtom( int atomClass, const OUString& rString, sal_Bool bCreate = sal_False ); + int getAtom( int atomClass, const OUString& rString, bool bCreate = false ); const OUString& getString( int atomClass, int atom ) const; }; diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx index 43b85a2a7e3b..a8bfba2fe7d0 100644 --- a/include/unotools/cmdoptions.hxx +++ b/include/unotools/cmdoptions.hxx @@ -95,7 +95,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: @onerror We return an empty list. *//*-*****************************************************************************************************/ - sal_Bool HasEntries( CmdOption eOption ) const; + bool HasEntries( CmdOption eOption ) const; /*-****************************************************************************************************//** @short Lookup if a command URL is inside a given list @@ -110,7 +110,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail: @onerror - *//*-*****************************************************************************************************/ - sal_Bool Lookup( CmdOption eOption, const OUString& aCommandURL ) const; + bool Lookup( CmdOption eOption, const OUString& aCommandURL ) const; /*-****************************************************************************************************//** @short register an office frame, which must update its dispatches if diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx index 9f3c86cc2fab..d278ccba6b7c 100644 --- a/include/unotools/configitem.hxx +++ b/include/unotools/configitem.hxx @@ -117,7 +117,7 @@ namespace utl com::sun::star::uno::Sequence< sal_Bool > GetReadOnlyStates(const com::sun::star::uno::Sequence< OUString >& rNames); - sal_Bool PutProperties( + bool PutProperties( const com::sun::star::uno::Sequence< OUString >& rNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any>& rValues); @@ -129,15 +129,15 @@ namespace utl @see Notify @see DisableNotification */ - sal_Bool EnableNotification(const com::sun::star::uno::Sequence< OUString >& rNames, - sal_Bool bEnableInternalNotification = sal_False); + bool EnableNotification(const com::sun::star::uno::Sequence< OUString >& rNames, + bool bEnableInternalNotification = false); /** disables notifications about changes on sub nodes/values, which previosly had been enabled with EnableNotification @see Notify @see EnableNotification */ void DisableNotification(); - sal_Bool IsInternalNotification()const {return IsInValueChange();} + bool IsInternalNotification()const {return IsInValueChange();} //returns all members of a node in a specific format com::sun::star::uno::Sequence< OUString > @@ -146,16 +146,16 @@ namespace utl com::sun::star::uno::Sequence< OUString > GetNodeNames(const OUString& rNode, ConfigNameFormat eFormat); // remove all members of a set - sal_Bool ClearNodeSet(const OUString& rNode); + bool ClearNodeSet(const OUString& rNode); // remove selected members of a set - sal_Bool ClearNodeElements(const OUString& rNode, + bool ClearNodeElements(const OUString& rNode, com::sun::star::uno::Sequence< OUString >& rElements); // change or add members to a set - sal_Bool SetSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues); + bool SetSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues); // remove, change or add members of a set - sal_Bool ReplaceSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues); + bool ReplaceSetProperties(const OUString& rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues); // add a new node without setting any properties - sal_Bool AddNode(const OUString& rNode, const OUString& rNewNode); + bool AddNode(const OUString& rNode, const OUString& rNewNode); public: virtual ~ConfigItem(); diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 32c7706be4ec..295569de4c1b 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -59,7 +59,7 @@ namespace utl m_xContainerAccess; /// modifying set nodes (optional interface of our UNO object) ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDummy; - sal_Bool m_bEscapeNames; /// escape names before accessing children ? + bool m_bEscapeNames; /// escape names before accessing children ? OUString m_sCompletePath; @@ -77,7 +77,7 @@ namespace utl public: /// constructs an empty and invalid node object - OConfigurationNode() :m_bEscapeNames(sal_False) { } + OConfigurationNode() :m_bEscapeNames(false) { } /// copy ctor OConfigurationNode(const OConfigurationNode& _rSource); @@ -123,9 +123,9 @@ namespace utl If the object represents a set node, this method may be used to delete an existent child. For non-set-nodes, the method will fail. */ - sal_Bool removeNode(const OUString& _rName) const throw(); + bool removeNode(const OUString& _rName) const throw(); - sal_Bool removeNode( const sal_Char* _pAsciiName ) const + bool removeNode( const sal_Char* _pAsciiName ) const { return removeNode( OUString::createFromAscii( _pAsciiName ) ); } @@ -152,9 +152,9 @@ namespace utl node. @return sal_True if and only if the write was successful. */ - sal_Bool setNodeValue(const OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); + bool setNodeValue(const OUString& _rPath, const ::com::sun::star::uno::Any& _rValue) const throw(); - sal_Bool setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const + bool setNodeValue( const sal_Char* _pAsciiPath, const ::com::sun::star::uno::Any& _rValue ) const { return setNodeValue( OUString::createFromAscii( _pAsciiPath ), _rValue ); } @@ -169,11 +169,11 @@ namespace utl escaping for such names may not be supported by the underlying API objects. @see getEscape */ - void setEscape(sal_Bool _bEnable = sal_True); + void setEscape(bool _bEnable = true); /** get the flag specifying the current escape behaviour @see setEscape */ - sal_Bool getEscape() const { return m_bEscapeNames; } + bool getEscape() const { return m_bEscapeNames; } /// invalidate the object virtual void clear() throw(); @@ -182,21 +182,21 @@ namespace utl // meta information about the node /// checks whether or not the object represents a set node. - sal_Bool isSetNode() const; + bool isSetNode() const; /// checks whether or not a direct child with a given name exists - sal_Bool hasByName(const OUString& _rName) const throw(); - sal_Bool hasByName( const sal_Char* _pAsciiName ) const { return hasByName( OUString::createFromAscii( _pAsciiName ) ); } + bool hasByName(const OUString& _rName) const throw(); + bool hasByName( const sal_Char* _pAsciiName ) const { return hasByName( OUString::createFromAscii( _pAsciiName ) ); } /// checks whether or not a descendent (no matter if direct or indirect) with the given name exists - sal_Bool hasByHierarchicalName( const OUString& _rName ) const throw(); - sal_Bool hasByHierarchicalName( const sal_Char* _pAsciiName ) const { return hasByHierarchicalName( OUString::createFromAscii( _pAsciiName ) ); } + bool hasByHierarchicalName( const OUString& _rName ) const throw(); + bool hasByHierarchicalName( const sal_Char* _pAsciiName ) const { return hasByHierarchicalName( OUString::createFromAscii( _pAsciiName ) ); } /// check if the objects represents a valid configuration node - sal_Bool isValid() const { return m_xHierarchyAccess.is(); } + bool isValid() const { return m_xHierarchyAccess.is(); } /// check whether the object is read-only of updatable - sal_Bool isReadonly() const { return !m_xReplaceAccess.is(); } + bool isReadonly() const { return !m_xReplaceAccess.is(); } protected: // OEventListenerAdapter @@ -278,7 +278,7 @@ namespace utl const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, - sal_Bool _bLazyWrite = sal_True + bool _bLazyWrite = true ); /** open a new top-level configuration node<p/> @@ -294,7 +294,7 @@ namespace utl @param _eMode specifies which privileges should be applied when retrieving the node */ static OConfigurationTreeRoot createWithComponentContext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, - const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True); + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, bool _bLazyWrite = true); /** tolerant version of the <member>createWithServiceFactory</member> @@ -303,14 +303,14 @@ namespace utl given node path does not exist) are still asserted.</p> */ static OConfigurationTreeRoot tryCreateWithComponentContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, - const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, sal_Bool _bLazyWrite = sal_True ); + const OUString& _rPath, sal_Int32 _nDepth = -1, CREATION_MODE _eMode = CM_UPDATABLE, bool _bLazyWrite = true ); /** commit all changes made on the subtree the object is the root for<p/> All changes made on any OConfigurationNode object retrieved (maybe indirect) from this root object are committed when calling this method. @return sal_True if and only if the commit was successful */ - sal_Bool commit() const throw(); + bool commit() const throw(); /// invalidate the object virtual void clear() throw(); diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx index 20f3a20e3de6..c8a1f1b3b8a2 100644 --- a/include/unotools/configpaths.hxx +++ b/include/unotools/configpaths.hxx @@ -52,7 +52,7 @@ namespace utl <FALSE/>, if the path was a one-level path or an invalid path */ - UNOTOOLS_DLLPUBLIC sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, + UNOTOOLS_DLLPUBLIC bool splitLastFromConfigurationPath(OUString const& _sInPath, OUString& _rsOutPath, OUString& _rsLocalName); @@ -98,7 +98,7 @@ namespace utl If both paths are equal <TRUE/> is returned. */ - sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, + bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath); //---------------------------------------------------------------------------- diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx index b095d239fe6b..5e3b738f2e2b 100644 --- a/include/unotools/configvaluecontainer.hxx +++ b/include/unotools/configvaluecontainer.hxx @@ -145,7 +145,7 @@ namespace utl @see read @see commit */ - void write( sal_Bool _bCommit = sal_True ); + void write( bool _bCommit = true ); /** commits any changes done @@ -160,7 +160,7 @@ namespace utl If <FALSE/>, only the current values in the config nodes (as present since the last call to <method>write</method>) are committed. */ - void commit( sal_Bool _bWrite = sal_True ); + void commit( bool _bWrite = true ); private: /// implements the ctors diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index d2288659ea70..765c38d6af92 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -80,9 +80,9 @@ public: void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); - ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); + bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); OUString GetEventName( sal_Int32 nID ); }; diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx index 39331232fe27..f2467835b104 100644 --- a/include/unotools/fltrcfg.hxx +++ b/include/unotools/fltrcfg.hxx @@ -38,53 +38,53 @@ public: virtual void Commit(); void Load(); - void SetLoadWordBasicCode( sal_Bool bFlag ); - sal_Bool IsLoadWordBasicCode() const; - void SetLoadWordBasicExecutable( sal_Bool bFlag ); - sal_Bool IsLoadWordBasicExecutable() const; - void SetLoadWordBasicStorage( sal_Bool bFlag ); - sal_Bool IsLoadWordBasicStorage() const; - - void SetLoadExcelBasicCode( sal_Bool bFlag ); - sal_Bool IsLoadExcelBasicCode() const; - void SetLoadExcelBasicExecutable( sal_Bool bFlag ); - sal_Bool IsLoadExcelBasicExecutable() const; - void SetLoadExcelBasicStorage( sal_Bool bFlag ); - sal_Bool IsLoadExcelBasicStorage() const; - - void SetLoadPPointBasicCode( sal_Bool bFlag ); - sal_Bool IsLoadPPointBasicCode() const; - void SetLoadPPointBasicStorage( sal_Bool bFlag ); - sal_Bool IsLoadPPointBasicStorage() const; - - sal_Bool IsMathType2Math() const; - void SetMathType2Math( sal_Bool bFlag ); - sal_Bool IsMath2MathType() const; - void SetMath2MathType( sal_Bool bFlag ); - - sal_Bool IsWinWord2Writer() const; - void SetWinWord2Writer( sal_Bool bFlag ); - sal_Bool IsWriter2WinWord() const; - void SetWriter2WinWord( sal_Bool bFlag ); - - sal_Bool IsUseEnhancedFields() const; - - sal_Bool IsExcel2Calc() const; - void SetExcel2Calc( sal_Bool bFlag ); - sal_Bool IsCalc2Excel() const; - void SetCalc2Excel( sal_Bool bFlag ); - - sal_Bool IsPowerPoint2Impress() const; - void SetPowerPoint2Impress( sal_Bool bFlag ); - sal_Bool IsImpress2PowerPoint() const; - void SetImpress2PowerPoint( sal_Bool bFlag ); - - sal_Bool IsSmartArt2Shape() const; - void SetSmartArt2Shape( sal_Bool bFlag ); - - sal_Bool IsEnablePPTPreview() const; - sal_Bool IsEnableCalcPreview() const; - sal_Bool IsEnableWordPreview() const; + void SetLoadWordBasicCode( bool bFlag ); + bool IsLoadWordBasicCode() const; + void SetLoadWordBasicExecutable( bool bFlag ); + bool IsLoadWordBasicExecutable() const; + void SetLoadWordBasicStorage( bool bFlag ); + bool IsLoadWordBasicStorage() const; + + void SetLoadExcelBasicCode( bool bFlag ); + bool IsLoadExcelBasicCode() const; + void SetLoadExcelBasicExecutable( bool bFlag ); + bool IsLoadExcelBasicExecutable() const; + void SetLoadExcelBasicStorage( bool bFlag ); + bool IsLoadExcelBasicStorage() const; + + void SetLoadPPointBasicCode( bool bFlag ); + bool IsLoadPPointBasicCode() const; + void SetLoadPPointBasicStorage( bool bFlag ); + bool IsLoadPPointBasicStorage() const; + + bool IsMathType2Math() const; + void SetMathType2Math( bool bFlag ); + bool IsMath2MathType() const; + void SetMath2MathType( bool bFlag ); + + bool IsWinWord2Writer() const; + void SetWinWord2Writer( bool bFlag ); + bool IsWriter2WinWord() const; + void SetWriter2WinWord( bool bFlag ); + + bool IsUseEnhancedFields() const; + + bool IsExcel2Calc() const; + void SetExcel2Calc( bool bFlag ); + bool IsCalc2Excel() const; + void SetCalc2Excel( bool bFlag ); + + bool IsPowerPoint2Impress() const; + void SetPowerPoint2Impress( bool bFlag ); + bool IsImpress2PowerPoint() const; + void SetImpress2PowerPoint( bool bFlag ); + + bool IsSmartArt2Shape() const; + void SetSmartArt2Shape( bool bFlag ); + + bool IsEnablePPTPreview() const; + bool IsEnableCalcPreview() const; + bool IsEnableWordPreview() const; static SvtFilterOptions& Get(); }; diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx index 8a6f21e0485c..39c881f1dc88 100644 --- a/include/unotools/fontoptions.hxx +++ b/include/unotools/fontoptions.hxx @@ -88,11 +88,11 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Op @onerror No error should occur! *//*-*****************************************************************************************************/ - sal_Bool IsFontHistoryEnabled ( ) const ; - void EnableFontHistory ( sal_Bool bState ) ; + bool IsFontHistoryEnabled ( ) const ; + void EnableFontHistory ( bool bState ) ; - sal_Bool IsFontWYSIWYGEnabled ( ) const ; - void EnableFontWYSIWYG ( sal_Bool bState ) ; + bool IsFontWYSIWYGEnabled ( ) const ; + void EnableFontWYSIWYG ( bool bState ) ; private: /*-****************************************************************************************************//** diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx index 6df81e901161..a28598c6a35f 100644 --- a/include/unotools/intlwrapper.hxx +++ b/include/unotools/intlwrapper.hxx @@ -56,7 +56,7 @@ private: CollatorWrapper* pCaseCollator; void ImplNewLocaleData() const; - void ImplNewCollator( sal_Bool bCaseSensitive ) const; + void ImplNewCollator( bool bCaseSensitive ) const; public: @@ -81,14 +81,14 @@ public: const CollatorWrapper* getCollator() const { if ( !pCollator ) - ImplNewCollator( sal_False ); + ImplNewCollator( false ); return pCollator; } /// case sensitive collator const CollatorWrapper* getCaseCollator() const { if ( !pCaseCollator ) - ImplNewCollator( sal_True ); + ImplNewCollator( true ); return pCaseCollator; } }; diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index eb9c99df1d06..8ce4961c472c 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -40,15 +40,15 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions ::com::sun::star::uno::Sequence< OUString > aActiveDics; ::com::sun::star::uno::Sequence< OUString > aActiveConvDics; - sal_Bool bROActiveDics; - sal_Bool bROActiveConvDics; + bool bROActiveDics; + bool bROActiveConvDics; // Hyphenator service specific options sal_Int16 nHyphMinLeading, nHyphMinTrailing, nHyphMinWordLength; - sal_Bool bROHyphMinLeading, + bool bROHyphMinLeading, bROHyphMinTrailing, bROHyphMinWordLength; @@ -57,72 +57,72 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguOptions sal_Int16 nDefaultLanguage_CJK; sal_Int16 nDefaultLanguage_CTL; - sal_Bool bRODefaultLanguage; - sal_Bool bRODefaultLanguage_CJK; - sal_Bool bRODefaultLanguage_CTL; + bool bRODefaultLanguage; + bool bRODefaultLanguage_CJK; + bool bRODefaultLanguage_CTL; // spelling options (non-service specific) - sal_Bool bIsSpellSpecial; - sal_Bool bIsSpellAuto; - sal_Bool bIsSpellReverse; + bool bIsSpellSpecial; + bool bIsSpellAuto; + bool bIsSpellReverse; - sal_Bool bROIsSpellSpecial; - sal_Bool bROIsSpellAuto; - sal_Bool bROIsSpellReverse; + bool bROIsSpellSpecial; + bool bROIsSpellAuto; + bool bROIsSpellReverse; // hyphenation options (non-service specific) - sal_Bool bIsHyphSpecial; - sal_Bool bIsHyphAuto; + bool bIsHyphSpecial; + bool bIsHyphAuto; - sal_Bool bROIsHyphSpecial; - sal_Bool bROIsHyphAuto; + bool bROIsHyphSpecial; + bool bROIsHyphAuto; // common to SpellChecker, Hyphenator and Thesaurus service - sal_Bool bIsUseDictionaryList; - sal_Bool bIsIgnoreControlCharacters; + bool bIsUseDictionaryList; + bool bIsIgnoreControlCharacters; - sal_Bool bROIsUseDictionaryList; - sal_Bool bROIsIgnoreControlCharacters; + bool bROIsUseDictionaryList; + bool bROIsIgnoreControlCharacters; // SpellChecker service specific options - sal_Bool bIsSpellWithDigits, + bool bIsSpellWithDigits, bIsSpellUpperCase, bIsSpellCapitalization; - sal_Bool bROIsSpellWithDigits, + bool bROIsSpellWithDigits, bROIsSpellUpperCase, bROIsSpellCapitalization; // text conversion specific options - sal_Bool bIsIgnorePostPositionalWord; - sal_Bool bIsAutoCloseDialog; - sal_Bool bIsShowEntriesRecentlyUsedFirst; - sal_Bool bIsAutoReplaceUniqueEntries; - sal_Bool bIsDirectionToSimplified; - sal_Bool bIsUseCharacterVariants; - sal_Bool bIsTranslateCommonTerms; - sal_Bool bIsReverseMapping; - - sal_Bool bROIsIgnorePostPositionalWord; - sal_Bool bROIsAutoCloseDialog; - sal_Bool bROIsShowEntriesRecentlyUsedFirst; - sal_Bool bROIsAutoReplaceUniqueEntries; - sal_Bool bROIsDirectionToSimplified; - sal_Bool bROIsUseCharacterVariants; - sal_Bool bROIsTranslateCommonTerms; - sal_Bool bROIsReverseMapping; + bool bIsIgnorePostPositionalWord; + bool bIsAutoCloseDialog; + bool bIsShowEntriesRecentlyUsedFirst; + bool bIsAutoReplaceUniqueEntries; + bool bIsDirectionToSimplified; + bool bIsUseCharacterVariants; + bool bIsTranslateCommonTerms; + bool bIsReverseMapping; + + bool bROIsIgnorePostPositionalWord; + bool bROIsAutoCloseDialog; + bool bROIsShowEntriesRecentlyUsedFirst; + bool bROIsAutoReplaceUniqueEntries; + bool bROIsDirectionToSimplified; + bool bROIsUseCharacterVariants; + bool bROIsTranslateCommonTerms; + bool bROIsReverseMapping; // check value need to determine if the configuration needs to updatet // or not (used for a quick check if data files have been changed/added // or deleted sal_Int32 nDataFilesChangedCheckValue; - sal_Bool bRODataFilesChangedCheckValue; + bool bRODataFilesChangedCheckValue; - sal_Bool bIsGrammarAuto; - sal_Bool bIsGrammarInteractive; + bool bIsGrammarAuto; + bool bIsGrammarInteractive; - sal_Bool bROIsGrammarAuto; - sal_Bool bROIsGrammarInteractive; + bool bROIsGrammarAuto; + bool bROIsGrammarInteractive; SvtLinguOptions(); }; @@ -172,7 +172,7 @@ public: GetProperties( const com::sun::star::uno::Sequence< OUString > &rNames ); // - sal_Bool + bool ReplaceSetProperties( const OUString &rNode, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > rValues ); @@ -182,24 +182,24 @@ public: com::sun::star::uno::Any GetProperty( sal_Int32 nPropertyHandle ) const; - sal_Bool SetProperty( const OUString &rPropertyName, + bool SetProperty( const OUString &rPropertyName, const com::sun::star::uno::Any &rValue ); - sal_Bool SetProperty( sal_Int32 nPropertyHandle, + bool SetProperty( sal_Int32 nPropertyHandle, const com::sun::star::uno::Any &rValue ); - sal_Bool GetOptions( SvtLinguOptions &rOptions ) const; + bool GetOptions( SvtLinguOptions &rOptions ) const; - sal_Bool IsReadOnly( const OUString &rPropertyName ) const; + bool IsReadOnly( const OUString &rPropertyName ) const; //! //! the following functions work on the 'ServiceManager' sub node of the //! linguistic configuration only //! - sal_Bool GetElementNamesFor( const OUString &rNodeName, com::sun::star::uno::Sequence< OUString > &rElementNames ) const; + bool GetElementNamesFor( const OUString &rNodeName, com::sun::star::uno::Sequence< OUString > &rElementNames ) const; // - sal_Bool GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, com::sun::star::uno::Sequence< OUString > &rFormatList ) const; + bool GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, com::sun::star::uno::Sequence< OUString > &rFormatList ) const; - sal_Bool GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; + bool GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const; com::sun::star::uno::Sequence< OUString > GetDisabledDictionaries() const; diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 3f206f4cafe6..17050d758ae5 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -75,8 +75,8 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable sal_uInt16 nCurrPositiveFormat; sal_uInt16 nCurrNegativeFormat; sal_uInt16 nCurrDigits; - sal_Bool bLocaleDataItemValid; - sal_Bool bReservedWordValid; + bool bLocaleDataItemValid; + bool bReservedWordValid; mutable ::utl::ReadWriteMutex aMutex; // dummies, to be implemented or provided by XML locale data @@ -106,7 +106,7 @@ class UNOTOOLS_DLLPUBLIC LocaleDataWrapper : private boost::noncopyable sal_Unicode* ImplAddFormatNum( sal_Unicode* pBuf, sal_Int64 nNumber, sal_uInt16 nDecimals, - sal_Bool bUseThousandSep, sal_Bool bTrailingZeros ) const; + bool bUseThousandSep, bool bTrailingZeros ) const; void getDigitGroupingImpl(); @@ -245,10 +245,10 @@ public: DateFormat getLongDateFormat() const; /// only numerical values of Gregorian calendar OUString getDate( const Date& rDate ) const; - OUString getTime( const Time& rTime, sal_Bool bSec = sal_True, - sal_Bool b100Sec = sal_False ) const; + OUString getTime( const Time& rTime, bool bSec = true, + bool b100Sec = false ) const; OUString getDuration( const Time& rTime, - sal_Bool bSec = sal_True, sal_Bool b100Sec = sal_False ) const; + bool bSec = true, bool b100Sec = false ) const; /** The CalendarWrapper already <b>MUST</b> have loaded a calendar. @@ -268,9 +268,9 @@ public: OUString getLongDate( const Date& rDate, CalendarWrapper& rCal, sal_Int16 nDisplayDayOfWeek = 1, - sal_Bool bDayOfMonthWithLeadingZero = sal_False, + bool bDayOfMonthWithLeadingZero = false, sal_Int16 nDisplayMonth = 1, - sal_Bool bTwoDigitYear = sal_False + bool bTwoDigitYear = false ) const; /** Simple number formatting @@ -283,31 +283,31 @@ public: if the value is not an integer value. */ OUString getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, - sal_Bool bUseThousandSep = sal_True, - sal_Bool bTrailingZeros = sal_True ) const; + bool bUseThousandSep = true, + bool bTrailingZeros = true ) const; /// "Secure" currency formatted string. OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, const OUString& rCurrencySymbol, - sal_Bool bUseThousandSep = sal_True ) const; + bool bUseThousandSep = true ) const; /** Default currency formatted string, use with care as default currency may change in any locale, for example, DEM -> EUR */ OUString getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, - sal_Bool bUseThousandSep = sal_True ) const + bool bUseThousandSep = true ) const { return getCurr( nNumber, nDecimals, getCurrSymbol(), bUseThousandSep ); } // dummy returns, to be implemented inline sal_Unicode getCurrZeroChar() const { return cCurrZeroChar; } - inline sal_Bool isNumLeadingZero() const - { return sal_True; } + inline bool isNumLeadingZero() const + { return true; } /// standard decimal places inline sal_uInt16 getNumDigits() const { return 2; } - inline sal_Bool isNumTrailingZeros() const - { return sal_True; } + inline bool isNumTrailingZeros() const + { return true; } // reserved words diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx index a059e5e49f19..6f695800dfa9 100644 --- a/include/unotools/localfilehelper.hxx +++ b/include/unotools/localfilehelper.hxx @@ -35,7 +35,7 @@ namespace utl Returning sal_True and an empty URL means that the URL doesn't point to a local file. */ static bool ConvertPhysicalNameToURL(const OUString& rName, OUString& rReturn); - static sal_Bool ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn ); + static bool ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn ); /** Converts a "UCB compatible" URL into a "physical" file name. @@ -44,13 +44,13 @@ namespace utl file system is present ( watch: this doesn't mean that this file really exists! ) */ static bool ConvertURLToPhysicalName( const OUString& rName, OUString& rReturn ); - static sal_Bool ConvertURLToSystemPath( const OUString& rName, OUString& rReturn ); + static bool ConvertURLToSystemPath( const OUString& rName, OUString& rReturn ); - static sal_Bool IsLocalFile(const OUString& rName); - static sal_Bool IsFileContent(const OUString& rName); + static bool IsLocalFile(const OUString& rName); + static bool IsFileContent(const OUString& rName); static ::com::sun::star::uno::Sequence< OUString > - GetFolderContents( const OUString& rFolder, sal_Bool bFolder ); + GetFolderContents( const OUString& rFolder, bool bFolder ); }; } diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx index ccc1fb649571..d359c374ee19 100644 --- a/include/unotools/localisationoptions.hxx +++ b/include/unotools/localisationoptions.hxx @@ -77,7 +77,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::de @onerror No error should occur! *//*-*****************************************************************************************************/ - sal_Bool IsAutoMnemonic ( ) const ; + bool IsAutoMnemonic ( ) const ; /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/View/Localisation/DialogScale" diff --git a/include/unotools/mediadescriptor.hxx b/include/unotools/mediadescriptor.hxx index 1eb6b7a6b0fe..1cd206387160 100644 --- a/include/unotools/mediadescriptor.hxx +++ b/include/unotools/mediadescriptor.hxx @@ -131,7 +131,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @return TRUE, if the stream was already part of the descriptor or could be created as new item. FALSE otherwise. */ - sal_Bool addInputStream(); + bool addInputStream(); //--------------------------------------- /** @short it checks if the descriptor already has a valid @@ -150,7 +150,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @return TRUE, if the stream was already part of the descriptor or could be created as new item. FALSE otherwise. */ - sal_Bool addInputStreamOwnLock(); + bool addInputStreamOwnLock(); //--------------------------------------- /** @short it checks if the descriptor describes a readonly stream. @@ -170,7 +170,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @return TRUE, if the stream must be interpreted as readonly ... FALSE otherwise. */ - sal_Bool isStreamReadOnly() const; + bool isStreamReadOnly() const; //--------------------------------------- /** Returns a value from the sequence contained in the property @@ -291,7 +291,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @throw [css::lang::IllegalArgumentException] if the given PostData stream is <NULL/>. */ - SAL_DLLPRIVATE sal_Bool impl_openStreamWithPostData( + SAL_DLLPRIVATE bool impl_openStreamWithPostData( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& _rxPostData ) throw(::com::sun::star::uno::RuntimeException); @@ -317,9 +317,9 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @throw [css::uno::RuntimeException] if the MediaDescriptor seems to be invalid! */ - SAL_DLLPRIVATE sal_Bool impl_openStreamWithURL( + SAL_DLLPRIVATE bool impl_openStreamWithURL( const OUString& sURL, - sal_Bool bLockFile + bool bLockFile ) throw(::com::sun::star::uno::RuntimeException); //--------------------------------------- @@ -339,7 +339,7 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public comphelper::SequenceAsHashMap @return TRUE, if the stream was already part of the descriptor or could be created as new item. FALSE otherwise. */ - SAL_DLLPRIVATE sal_Bool impl_addInputStream( sal_Bool bLockFile ); + SAL_DLLPRIVATE bool impl_addInputStream( bool bLockFile ); }; } diff --git a/include/unotools/misccfg.hxx b/include/unotools/misccfg.hxx index 5cdfadef41a8..30c52ef3bdce 100644 --- a/include/unotools/misccfg.hxx +++ b/include/unotools/misccfg.hxx @@ -34,14 +34,14 @@ public: MiscCfg( ); virtual ~MiscCfg( ); - sal_Bool IsNotFoundWarning() const; - void SetNotFoundWarning( sal_Bool bSet); + bool IsNotFoundWarning() const; + void SetNotFoundWarning( bool bSet); - sal_Bool IsPaperSizeWarning() const; - void SetPaperSizeWarning(sal_Bool bSet); + bool IsPaperSizeWarning() const; + void SetPaperSizeWarning(bool bSet); - sal_Bool IsPaperOrientationWarning() const; - void SetPaperOrientationWarning( sal_Bool bSet); + bool IsPaperOrientationWarning() const; + void SetPaperOrientationWarning( bool bSet); // 0 ... 99 sal_Int32 GetYear2000() const; diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 6ea2a3f7cc4f..4ef1236633ba 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -103,15 +103,15 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: SvtModuleOptions(); virtual ~SvtModuleOptions(); - sal_Bool IsModuleInstalled ( EModule eModule ) const; + bool IsModuleInstalled ( EModule eModule ) const; OUString GetModuleName ( EModule eModule ) const; OUString GetFactoryName ( EFactory eFactory ) const; OUString GetFactoryStandardTemplate( EFactory eFactory ) const; OUString GetFactoryEmptyDocumentURL( EFactory eFactory ) const; OUString GetFactoryDefaultFilter ( EFactory eFactory ) const; - sal_Bool IsDefaultFilterReadonly ( EFactory eFactory ) const; + bool IsDefaultFilterReadonly ( EFactory eFactory ) const; sal_Int32 GetFactoryIcon ( EFactory eFactory ) const; - static sal_Bool ClassifyFactoryByName ( const OUString& sName , + static bool ClassifyFactoryByName ( const OUString& sName , EFactory& eFactory ); void SetFactoryStandardTemplate( EFactory eFactory , const OUString& sTemplate ); @@ -176,14 +176,14 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail:: OUString GetDefaultModuleName(); - sal_Bool IsMath () const; - sal_Bool IsChart () const; - sal_Bool IsCalc () const; - sal_Bool IsDraw () const; - sal_Bool IsWriter () const; - sal_Bool IsImpress () const; - sal_Bool IsBasicIDE () const; - sal_Bool IsDataBase () const; + bool IsMath () const; + bool IsChart () const; + bool IsCalc () const; + bool IsDraw () const; + bool IsWriter () const; + bool IsImpress () const; + bool IsBasicIDE () const; + bool IsDataBase () const; ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames(); diff --git a/include/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx index ec6f2ed6f7f5..aae2cf0a1542 100644 --- a/include/unotools/optionsdlg.hxx +++ b/include/unotools/optionsdlg.hxx @@ -34,10 +34,10 @@ public: SvtOptionsDialogOptions(); virtual ~SvtOptionsDialogOptions(); - sal_Bool IsGroupHidden ( const OUString& _rGroup ) const; - sal_Bool IsPageHidden ( const OUString& _rPage, + bool IsGroupHidden ( const OUString& _rGroup ) const; + bool IsPageHidden ( const OUString& _rPage, const OUString& _rGroup ) const; - sal_Bool IsOptionHidden ( const OUString& _rOption, + bool IsOptionHidden ( const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const; }; diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx index 8a2835f70717..c83a1ed63260 100644 --- a/include/unotools/printwarningoptions.hxx +++ b/include/unotools/printwarningoptions.hxx @@ -74,15 +74,15 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtPrintWarningOptions : public utl::de @seealso configuration package "org.openoffice.Office.Common/_3D-Engine" *//*-*****************************************************************************************************/ - sal_Bool IsPaperSize() const; - sal_Bool IsPaperOrientation() const; - sal_Bool IsTransparency() const; - sal_Bool IsModifyDocumentOnPrintingAllowed() const; - - void SetPaperSize( sal_Bool bState ); - void SetPaperOrientation( sal_Bool bState ); - void SetTransparency( sal_Bool bState ); - void SetModifyDocumentOnPrintingAllowed( sal_Bool bState ); + bool IsPaperSize() const; + bool IsPaperOrientation() const; + bool IsTransparency() const; + bool IsModifyDocumentOnPrintingAllowed() const; + + void SetPaperSize( bool bState ); + void SetPaperOrientation( bool bState ); + void SetTransparency( bool bState ); + void SetModifyDocumentOnPrintingAllowed( bool bState ); private: diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx index 5e7a9c205efc..8247e4b277f8 100644 --- a/include/unotools/saveopt.hxx +++ b/include/unotools/saveopt.hxx @@ -70,58 +70,58 @@ public: void SetAutoSaveTime( sal_Int32 n ); sal_Int32 GetAutoSaveTime() const; - void SetUseUserData( sal_Bool b ); - sal_Bool IsUseUserData() const; + void SetUseUserData( bool b ); + bool IsUseUserData() const; - void SetBackup( sal_Bool b ); - sal_Bool IsBackup() const; + void SetBackup( bool b ); + bool IsBackup() const; - void SetAutoSave( sal_Bool b ); - sal_Bool IsAutoSave() const; + void SetAutoSave( bool b ); + bool IsAutoSave() const; - void SetAutoSavePrompt( sal_Bool b ); - sal_Bool IsAutoSavePrompt() const; + void SetAutoSavePrompt( bool b ); + bool IsAutoSavePrompt() const; - void SetUserAutoSave( sal_Bool b ); - sal_Bool IsUserAutoSave() const; + void SetUserAutoSave( bool b ); + bool IsUserAutoSave() const; - void SetDocInfoSave(sal_Bool b); - sal_Bool IsDocInfoSave() const; + void SetDocInfoSave(bool b); + bool IsDocInfoSave() const; - void SetSaveWorkingSet( sal_Bool b ); - sal_Bool IsSaveWorkingSet() const; + void SetSaveWorkingSet( bool b ); + bool IsSaveWorkingSet() const; - void SetSaveDocView( sal_Bool b ); - sal_Bool IsSaveDocView() const; + void SetSaveDocView( bool b ); + bool IsSaveDocView() const; - void SetSaveRelINet( sal_Bool b ); - sal_Bool IsSaveRelINet() const; + void SetSaveRelINet( bool b ); + bool IsSaveRelINet() const; - void SetSaveRelFSys( sal_Bool b ); - sal_Bool IsSaveRelFSys() const; + void SetSaveRelFSys( bool b ); + bool IsSaveRelFSys() const; - sal_Bool IsSaveUnpacked() const; + bool IsSaveUnpacked() const; - void SetLoadUserSettings(sal_Bool b); - sal_Bool IsLoadUserSettings() const; + void SetLoadUserSettings(bool b); + bool IsLoadUserSettings() const; - void SetPrettyPrinting( sal_Bool _bEnable ); - sal_Bool IsPrettyPrinting( ) const; + void SetPrettyPrinting( bool _bEnable ); + bool IsPrettyPrinting( ) const; - void SetWarnAlienFormat( sal_Bool _bEnable ); - sal_Bool IsWarnAlienFormat( ) const; + void SetWarnAlienFormat( bool _bEnable ); + bool IsWarnAlienFormat( ) const; - void SetLoadDocumentPrinter( sal_Bool _bEnable ); - sal_Bool IsLoadDocumentPrinter( ) const; + void SetLoadDocumentPrinter( bool _bEnable ); + bool IsLoadDocumentPrinter( ) const; void SetODFDefaultVersion( ODFDefaultVersion eVersion ); ODFDefaultVersion GetODFDefaultVersion() const; - sal_Bool IsUseSHA1InODF12() const; + bool IsUseSHA1InODF12() const; - sal_Bool IsUseBlowfishInODF12() const; + bool IsUseBlowfishInODF12() const; - sal_Bool IsReadOnly( EOption eOption ) const; + bool IsReadOnly( EOption eOption ) const; }; #endif diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx index d76a02fba341..6b05a2c6bbd0 100644 --- a/include/unotools/searchopt.hxx +++ b/include/unotools/searchopt.hxx @@ -44,66 +44,66 @@ public: // General Options // - sal_Bool IsWholeWordsOnly() const; - sal_Bool IsBackwards() const; - sal_Bool IsUseRegularExpression() const; - sal_Bool IsSimilaritySearch() const; - sal_Bool IsUseAsianOptions() const; - sal_Bool IsMatchCase() const; // also Japanese search option - sal_Bool IsNotes() const; - - void SetWholeWordsOnly( sal_Bool bVal ); - void SetBackwards( sal_Bool bVal ); - void SetUseRegularExpression( sal_Bool bVal ); - void SetSearchForStyles( sal_Bool bVal ); - void SetSimilaritySearch( sal_Bool bVal ); - void SetUseAsianOptions( sal_Bool bVal ); - void SetMatchCase( sal_Bool bVal ); // also Japanese search option - void SetNotes( sal_Bool bVal); + bool IsWholeWordsOnly() const; + bool IsBackwards() const; + bool IsUseRegularExpression() const; + bool IsSimilaritySearch() const; + bool IsUseAsianOptions() const; + bool IsMatchCase() const; // also Japanese search option + bool IsNotes() const; + + void SetWholeWordsOnly( bool bVal ); + void SetBackwards( bool bVal ); + void SetUseRegularExpression( bool bVal ); + void SetSearchForStyles( bool bVal ); + void SetSimilaritySearch( bool bVal ); + void SetUseAsianOptions( bool bVal ); + void SetMatchCase( bool bVal ); // also Japanese search option + void SetNotes( bool bVal); // // Japanese search options // - sal_Bool IsMatchFullHalfWidthForms() const; - sal_Bool IsMatchHiraganaKatakana() const; - sal_Bool IsMatchContractions() const; - sal_Bool IsMatchMinusDashChoon() const; - sal_Bool IsMatchRepeatCharMarks() const; - sal_Bool IsMatchVariantFormKanji() const; - sal_Bool IsMatchOldKanaForms() const; - sal_Bool IsMatchDiziDuzu() const; - sal_Bool IsMatchBavaHafa() const; - sal_Bool IsMatchTsithichiDhizi() const; - sal_Bool IsMatchHyuiyuByuvyu() const; - sal_Bool IsMatchSesheZeje() const; - sal_Bool IsMatchIaiya() const; - sal_Bool IsMatchKiku() const; - sal_Bool IsIgnorePunctuation() const; - sal_Bool IsIgnoreWhitespace() const; - sal_Bool IsIgnoreProlongedSoundMark() const; - sal_Bool IsIgnoreMiddleDot() const; - sal_Bool IsIgnoreDiacritics_CTL() const; - - void SetMatchFullHalfWidthForms( sal_Bool bVal ); - void SetMatchHiraganaKatakana( sal_Bool bVal ); - void SetMatchContractions( sal_Bool bVal ); - void SetMatchMinusDashChoon( sal_Bool bVal ); - void SetMatchRepeatCharMarks( sal_Bool bVal ); - void SetMatchVariantFormKanji( sal_Bool bVal ); - void SetMatchOldKanaForms( sal_Bool bVal ); - void SetMatchDiziDuzu( sal_Bool bVal ); - void SetMatchBavaHafa( sal_Bool bVal ); - void SetMatchTsithichiDhizi( sal_Bool bVal ); - void SetMatchHyuiyuByuvyu( sal_Bool bVal ); - void SetMatchSesheZeje( sal_Bool bVal ); - void SetMatchIaiya( sal_Bool bVal ); - void SetMatchKiku( sal_Bool bVal ); - void SetIgnorePunctuation( sal_Bool bVal ); - void SetIgnoreWhitespace( sal_Bool bVal ); - void SetIgnoreProlongedSoundMark( sal_Bool bVal ); - void SetIgnoreMiddleDot( sal_Bool bVal ); - void SetIgnoreDiacritics_CTL( sal_Bool bVal ); + bool IsMatchFullHalfWidthForms() const; + bool IsMatchHiraganaKatakana() const; + bool IsMatchContractions() const; + bool IsMatchMinusDashChoon() const; + bool IsMatchRepeatCharMarks() const; + bool IsMatchVariantFormKanji() const; + bool IsMatchOldKanaForms() const; + bool IsMatchDiziDuzu() const; + bool IsMatchBavaHafa() const; + bool IsMatchTsithichiDhizi() const; + bool IsMatchHyuiyuByuvyu() const; + bool IsMatchSesheZeje() const; + bool IsMatchIaiya() const; + bool IsMatchKiku() const; + bool IsIgnorePunctuation() const; + bool IsIgnoreWhitespace() const; + bool IsIgnoreProlongedSoundMark() const; + bool IsIgnoreMiddleDot() const; + bool IsIgnoreDiacritics_CTL() const; + + void SetMatchFullHalfWidthForms( bool bVal ); + void SetMatchHiraganaKatakana( bool bVal ); + void SetMatchContractions( bool bVal ); + void SetMatchMinusDashChoon( bool bVal ); + void SetMatchRepeatCharMarks( bool bVal ); + void SetMatchVariantFormKanji( bool bVal ); + void SetMatchOldKanaForms( bool bVal ); + void SetMatchDiziDuzu( bool bVal ); + void SetMatchBavaHafa( bool bVal ); + void SetMatchTsithichiDhizi( bool bVal ); + void SetMatchHyuiyuByuvyu( bool bVal ); + void SetMatchSesheZeje( bool bVal ); + void SetMatchIaiya( bool bVal ); + void SetMatchKiku( bool bVal ); + void SetIgnorePunctuation( bool bVal ); + void SetIgnoreWhitespace( bool bVal ); + void SetIgnoreProlongedSoundMark( bool bVal ); + void SetIgnoreMiddleDot( bool bVal ); + void SetIgnoreDiacritics_CTL( bool bVal ); }; diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx index 33043548a301..3e906b2c9624 100644 --- a/include/unotools/securityoptions.hxx +++ b/include/unotools/securityoptions.hxx @@ -133,7 +133,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail @onerror No error should occur! *//*-*****************************************************************************************************/ - sal_Bool IsReadOnly( EOption eOption ) const ; + bool IsReadOnly( EOption eOption ) const ; /*-****************************************************************************************************//** @short interface methods to get and set value of config key "org.openoffice.Office.Common/Security/Scripting/SecureURL" @@ -180,7 +180,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail sal_Int32 GetMacroSecurityLevel ( ) const ; void SetMacroSecurityLevel ( sal_Int32 _nLevel ) ; - sal_Bool IsMacroDisabled ( ) const ; + bool IsMacroDisabled ( ) const ; /** Check whether the given uri is either no dangerous macro-execution @@ -209,14 +209,14 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail bool IsOptionEnabled ( EOption eOption ) const ; // xmlsec05 deprecated methods - sal_Bool IsExecutePlugins() const; - void SetExecutePlugins( sal_Bool bSet ); + bool IsExecutePlugins() const; + void SetExecutePlugins( bool bSet ); EBasicSecurityMode GetBasicMode( ) const ; void SetBasicMode( EBasicSecurityMode eMode ) ; - sal_Bool IsWarningEnabled() const; - void SetWarningEnabled( sal_Bool bSet ); - sal_Bool IsConfirmationEnabled() const; - void SetConfirmationEnabled( sal_Bool bSet ); + bool IsWarningEnabled() const; + void SetWarningEnabled( bool bSet ); + bool IsConfirmationEnabled() const; + void SetConfirmationEnabled( bool bSet ); //------------------------------------------------------------------------------------------------------------- // private methods diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index 7060742afba9..7b9864694570 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -49,15 +49,15 @@ class UNOTOOLS_DLLPUBLIC OInputStreamWrapper : public InputStreamWrapper_Base protected: ::osl::Mutex m_aMutex; SvStream* m_pSvStream; - sal_Bool m_bSvStreamOwner : 1; + bool m_bSvStreamOwner : 1; OInputStreamWrapper() - { m_pSvStream = 0; m_bSvStreamOwner = sal_False; } - void SetStream(SvStream* _pStream, sal_Bool bOwner ) + { m_pSvStream = 0; m_bSvStreamOwner = false; } + void SetStream(SvStream* _pStream, bool bOwner ) { m_pSvStream = _pStream; m_bSvStreamOwner = bOwner; } public: OInputStreamWrapper(SvStream& _rStream); - OInputStreamWrapper(SvStream* pStream, sal_Bool bOwner=sal_False); + OInputStreamWrapper(SvStream* pStream, bool bOwner=false); virtual ~OInputStreamWrapper(); // stario::XInputStream @@ -88,7 +88,7 @@ protected: OSeekableInputStreamWrapper() {} public: OSeekableInputStreamWrapper(SvStream& _rStream); - OSeekableInputStreamWrapper(SvStream* _pStream, sal_Bool _bOwner = sal_False); + OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner = false); // XSeekable virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx index def98536354e..b6c3a1c42ada 100644 --- a/include/unotools/ucbstreamhelper.hxx +++ b/include/unotools/ucbstreamhelper.hxx @@ -62,8 +62,8 @@ namespace utl UcbLockBytesHandler* pHandler=0 ); static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream ); static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream ); - static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream, sal_Bool bCloseStream ); - static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream, sal_Bool bCloseStream ); + static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xStream, bool bCloseStream ); + static SvStream* CreateStream( ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream > xStream, bool bCloseStream ); }; } diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx index e61394a37dd0..5a32cc02077f 100644 --- a/include/unotools/useroptions.hxx +++ b/include/unotools/useroptions.hxx @@ -80,7 +80,7 @@ public: // set the address token void SetCustomerNumber (OUString const&); - sal_Bool IsTokenReadonly (sal_uInt16 nToken) const; + bool IsTokenReadonly (sal_uInt16 nToken) const; OUString GetToken (sal_uInt16 nToken) const; void SetToken (sal_uInt16 nToken, OUString const& rNewToken); diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index a262648d896c..89d2d20111e6 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -165,7 +165,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror No error should occur. *//*-*****************************************************************************************************/ - sal_Bool Exists() const; + bool Exists() const; /*-****************************************************************************************************//** @short use it to delete an entry of dynamic view set @@ -181,7 +181,7 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror We return sal_False. *//*-*****************************************************************************************************/ - sal_Bool Delete(); + bool Delete(); /*-****************************************************************************************************//** @short use it to set/get the window state of your view @@ -222,8 +222,8 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op @onerror An assertion is thrown in debug version. Otherwise we do nothing! *//*-*****************************************************************************************************/ - sal_Bool IsVisible ( ) const; - void SetVisible( sal_Bool bState ); + bool IsVisible ( ) const; + void SetVisible( bool bState ); /** Return true if the "Visible" property actually has a non-nil value diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx index eac33424844f..25fea269d33d 100644 --- a/include/unotools/xmlaccelcfg.hxx +++ b/include/unotools/xmlaccelcfg.hxx @@ -40,8 +40,8 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume public: OReadAccelatorDocumentHandler( SvtAcceleratorItemList& aNewAcceleratorItemList ) : m_nElementDepth( 0 ), - m_bAcceleratorMode( sal_False ), - m_bItemCloseExpected( sal_False ), + m_bAcceleratorMode( false ), + m_bItemCloseExpected( false ), m_xLocator( 0 ), m_aReadAcceleratorList( aNewAcceleratorItemList ) {} virtual ~OReadAccelatorDocumentHandler() {} @@ -79,8 +79,8 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume OUString getErrorLineString(); int m_nElementDepth; - sal_Bool m_bAcceleratorMode; - sal_Bool m_bItemCloseExpected; + bool m_bAcceleratorMode; + bool m_bItemCloseExpected; ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > m_xLocator; SvtAcceleratorItemList& m_aReadAcceleratorList; }; diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 17a2228eaf55..fae2d1d1a74c 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -480,7 +480,7 @@ public: TriState GetState() const { return meState; } void Check( sal_Bool bCheck = sal_True ); - sal_Bool IsChecked() const; + bool IsChecked() const; void EnableTriState( sal_Bool bTriState = sal_True ); sal_Bool IsTriStateEnabled() const { return mbTriState; } @@ -506,7 +506,7 @@ inline void CheckBox::Check( sal_Bool bCheck ) SetState( (bCheck) ? STATE_CHECK : STATE_NOCHECK ); } -inline sal_Bool CheckBox::IsChecked() const +inline bool CheckBox::IsChecked() const { return (GetState() == STATE_CHECK); } diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 623253b8bfd0..158c99efb031 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -309,7 +309,7 @@ void ConvDicNameContainer::AddConvDics( const OUString &rExtension ) { const Sequence< OUString > aDirCnt( - utl::LocalFileHelper::GetFolderContents( rSearchDirPathURL, sal_False ) ); + utl::LocalFileHelper::GetFolderContents( rSearchDirPathURL, false ) ); const OUString *pDirCnt = aDirCnt.getConstArray(); sal_Int32 nEntries = aDirCnt.getLength(); diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 9e2d8d8710fb..b398ed8e88d0 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -308,7 +308,7 @@ void DicList::SearchForDictionaries( osl::MutexGuard aGuard( GetLinguMutex() ); const uno::Sequence< OUString > aDirCnt( utl::LocalFileHelper:: - GetFolderContents( rDicDirURL, sal_False ) ); + GetFolderContents( rDicDirURL, false ) ); const OUString *pDirCnt = aDirCnt.getConstArray(); sal_Int32 nEntries = aDirCnt.getLength(); diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 10bde8ec5729..96052cf52581 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -1737,7 +1737,7 @@ sal_Bool LngSvcMgr::SaveCfgSvcs( const OUString &rServiceName ) { SAL_INFO( "linguistic", "linguistic: LngSvcMgr::SaveCfgSvcs" ); - sal_Bool bRes = sal_False; + bool bRes = false; LinguDispatcher *pDsp = 0; uno::Sequence< lang::Locale > aLocales; diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index c33db9f517ef..bc319b98050d 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -730,7 +730,7 @@ IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl) maPreviewLine[i] = OUString(); mpTableBox->Execute( CSVCMD_SETLINECOUNT, mnRowPosCount); - bool bMergeSep = (pCkbAsOnce->IsChecked() == sal_True); + bool bMergeSep = pCkbAsOnce->IsChecked(); mpTableBox->SetUniStrings( maPreviewLine, maFieldSeparators, mcTextSep, bMergeSep); return 0; diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 0c9564133210..a07018403e0d 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -98,9 +98,9 @@ sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); - bool bSkipEmptyChanged = ( m_pSkipEmptyPagesCB->GetSavedValue() != m_pSkipEmptyPagesCB->IsChecked() ); - bool bSelectedSheetsChanged = ( m_pSelectedSheetsCB->GetSavedValue() != m_pSelectedSheetsCB->IsChecked() ); - bool bForceBreaksChanged = ( m_pForceBreaksCB->GetSavedValue() != m_pForceBreaksCB->IsChecked() ); + bool bSkipEmptyChanged = ( m_pSkipEmptyPagesCB->GetSavedValue() != TriState(m_pSkipEmptyPagesCB->IsChecked()) ); + bool bSelectedSheetsChanged = ( m_pSelectedSheetsCB->GetSavedValue() != TriState(m_pSelectedSheetsCB->IsChecked()) ); + bool bForceBreaksChanged = ( m_pForceBreaksCB->GetSavedValue() != TriState(m_pForceBreaksCB->IsChecked()) ); if ( bSkipEmptyChanged || bSelectedSheetsChanged || bForceBreaksChanged ) { diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 5a944ad51fe1..1180bdcb1b91 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -116,36 +116,36 @@ SfxTabPage* ScTpContentOptions::Create( Window* pParent, sal_Bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) { sal_Bool bRet = false; - if( pFormulaCB ->GetSavedValue() != pFormulaCB ->IsChecked() || - pNilCB ->GetSavedValue() != pNilCB ->IsChecked() || - pAnnotCB ->GetSavedValue() != pAnnotCB ->IsChecked() || - pValueCB ->GetSavedValue() != pValueCB ->IsChecked() || - pAnchorCB ->GetSavedValue() != pAnchorCB ->IsChecked() || - pClipMarkCB->GetSavedValue() != pClipMarkCB->IsChecked() || + if( pFormulaCB ->GetSavedValue() != TriState(pFormulaCB ->IsChecked()) || + pNilCB ->GetSavedValue() != TriState(pNilCB ->IsChecked()) || + pAnnotCB ->GetSavedValue() != TriState(pAnnotCB ->IsChecked()) || + pValueCB ->GetSavedValue() != TriState(pValueCB ->IsChecked()) || + pAnchorCB ->GetSavedValue() != TriState(pAnchorCB ->IsChecked()) || + pClipMarkCB->GetSavedValue() != TriState(pClipMarkCB->IsChecked()) || pObjGrfLB ->GetSavedValue() != pObjGrfLB ->GetSelectEntryPos() || pDiagramLB ->GetSavedValue() != pDiagramLB ->GetSelectEntryPos() || pDrawLB ->GetSavedValue() != pDrawLB ->GetSelectEntryPos() || pGridLB ->GetSavedValue() != pGridLB->GetSelectEntryPos() || - pRowColHeaderCB->GetSavedValue() != pRowColHeaderCB->IsChecked() || - pHScrollCB ->GetSavedValue() != pHScrollCB ->IsChecked() || - pVScrollCB ->GetSavedValue() != pVScrollCB ->IsChecked() || - pTblRegCB ->GetSavedValue() != pTblRegCB ->IsChecked() || - pOutlineCB ->GetSavedValue() != pOutlineCB ->IsChecked() || + pRowColHeaderCB->GetSavedValue() != TriState(pRowColHeaderCB->IsChecked()) || + pHScrollCB ->GetSavedValue() != TriState(pHScrollCB ->IsChecked()) || + pVScrollCB ->GetSavedValue() != TriState(pVScrollCB ->IsChecked()) || + pTblRegCB ->GetSavedValue() != TriState(pTblRegCB ->IsChecked()) || + pOutlineCB ->GetSavedValue() != TriState(pOutlineCB ->IsChecked()) || pColorLB ->GetSavedValue() != pColorLB ->GetSelectEntryPos() || - pBreakCB ->GetSavedValue() != pBreakCB ->IsChecked() || - pGuideLineCB ->GetSavedValue() != pGuideLineCB ->IsChecked()) + pBreakCB ->GetSavedValue() != TriState(pBreakCB ->IsChecked()) || + pGuideLineCB ->GetSavedValue() != TriState(pGuideLineCB ->IsChecked())) { pLocalOptions->SetGridColor( pColorLB->GetSelectEntryColor(), pColorLB->GetSelectEntry() ); rCoreSet.Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions)); bRet = sal_True; } - if(pRangeFindCB->GetSavedValue() != pRangeFindCB->IsChecked()) + if(pRangeFindCB->GetSavedValue() != TriState(pRangeFindCB->IsChecked())) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, pRangeFindCB->IsChecked())); bRet = sal_True; } - if(pSyncZoomCB->GetSavedValue() != pSyncZoomCB->IsChecked()) + if(pSyncZoomCB->GetSavedValue() != TriState(pSyncZoomCB->IsChecked())) { rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, pSyncZoomCB->IsChecked())); bRet = sal_True; @@ -472,7 +472,7 @@ sal_Bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) SC_MOD()->SetAppOptions(aAppOptions); bRet = sal_True; } - if(m_pAlignCB->GetSavedValue() != m_pAlignCB->IsChecked()) + if(m_pAlignCB->GetSavedValue() != TriState(m_pAlignCB->IsChecked())) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, m_pAlignCB->IsChecked())); bRet = sal_True; @@ -484,44 +484,44 @@ sal_Bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) bRet = sal_True; } - if(m_pEditModeCB->GetSavedValue() != m_pEditModeCB->IsChecked()) + if(m_pEditModeCB->GetSavedValue() != TriState(m_pEditModeCB->IsChecked())) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, m_pEditModeCB->IsChecked())); bRet = sal_True; } - if(m_pFormatCB->GetSavedValue() != m_pFormatCB->IsChecked()) + if(m_pFormatCB->GetSavedValue() != TriState(m_pFormatCB->IsChecked())) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, m_pFormatCB->IsChecked())); bRet = sal_True; } - if(m_pExpRefCB->GetSavedValue() != m_pExpRefCB->IsChecked()) + if(m_pExpRefCB->GetSavedValue() != TriState(m_pExpRefCB->IsChecked())) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked())); bRet = sal_True; } - if(m_pMarkHdrCB->GetSavedValue() != m_pMarkHdrCB->IsChecked()) + if(m_pMarkHdrCB->GetSavedValue() != TriState(m_pMarkHdrCB->IsChecked())) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, m_pMarkHdrCB->IsChecked())); bRet = sal_True; } - if(m_pTextFmtCB->GetSavedValue() != m_pTextFmtCB->IsChecked()) + if(m_pTextFmtCB->GetSavedValue() != TriState(m_pTextFmtCB->IsChecked())) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, m_pTextFmtCB->IsChecked())); bRet = sal_True; } - if( m_pReplWarnCB->GetSavedValue() != m_pReplWarnCB->IsChecked() ) + if( m_pReplWarnCB->GetSavedValue() != TriState(m_pReplWarnCB->IsChecked()) ) { rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, m_pReplWarnCB->IsChecked() ) ); bRet = sal_True; } - if( m_pLegacyCellSelectionCB->GetSavedValue() != m_pLegacyCellSelectionCB->IsChecked() ) + if( m_pLegacyCellSelectionCB->GetSavedValue() != TriState(m_pLegacyCellSelectionCB->IsChecked()) ) { rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, m_pLegacyCellSelectionCB->IsChecked() ) ); bRet = sal_True; diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index 988302774e6f..731a196af4c8 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -245,7 +245,7 @@ Reference< XAnimationNode > implImportEffects( const Reference< XMultiServiceFac { // create stream SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ ); - Reference<XInputStream> xInputStream( new utl::OInputStreamWrapper( pIStm, sal_True ) ); + Reference<XInputStream> xInputStream( new utl::OInputStreamWrapper( pIStm, true ) ); // prepare ParserInputSrouce xml::sax::InputSource aParserInput; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 4f58c96f0d4f..c47da151a5bc 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -226,7 +226,7 @@ public: ::std::auto_ptr<WindowUpdater> mpWindowUpdater; - sal_Bool mbPreview; + bool mbPreview; sal_uInt16 mnShowPage; sal_Bool mbDocPreview; @@ -356,7 +356,7 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink, mbUserDataDirty(sal_False), xDocShell (NULL), mpWindowUpdater (new WindowUpdater()), - mbPreview(sal_True), + mbPreview(true), mnShowPage(0), mbDocPreview(sal_False), maAssistentFunc(5), diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index c67e42982d3a..fda191ea047d 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -82,20 +82,20 @@ SdPrintOptions::~SdPrintOptions() sal_Bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) { - if( m_pCbxDraw->GetSavedValue() != m_pCbxDraw->IsChecked() || - m_pCbxNotes->GetSavedValue() != m_pCbxNotes->IsChecked() || - m_pCbxHandout->GetSavedValue() != m_pCbxHandout->IsChecked() || - m_pCbxOutline->GetSavedValue() != m_pCbxOutline->IsChecked() || - m_pCbxDate->GetSavedValue() != m_pCbxDate->IsChecked() || - m_pCbxTime->GetSavedValue() != m_pCbxTime->IsChecked() || - m_pCbxPagename->GetSavedValue() != m_pCbxPagename->IsChecked() || - m_pCbxHiddenPages->GetSavedValue() != m_pCbxHiddenPages->IsChecked() || + if( m_pCbxDraw->GetSavedValue() != TriState(m_pCbxDraw->IsChecked()) || + m_pCbxNotes->GetSavedValue() != TriState(m_pCbxNotes->IsChecked()) || + m_pCbxHandout->GetSavedValue() != TriState(m_pCbxHandout->IsChecked()) || + m_pCbxOutline->GetSavedValue() != TriState(m_pCbxOutline->IsChecked()) || + m_pCbxDate->GetSavedValue() != TriState(m_pCbxDate->IsChecked()) || + m_pCbxTime->GetSavedValue() != TriState(m_pCbxTime->IsChecked()) || + m_pCbxPagename->GetSavedValue() != TriState(m_pCbxPagename->IsChecked()) || + m_pCbxHiddenPages->GetSavedValue() != TriState(m_pCbxHiddenPages->IsChecked()) || m_pRbtPagesize->GetSavedValue() != m_pRbtPagesize->IsChecked() || m_pRbtPagetile->GetSavedValue() != m_pRbtPagetile->IsChecked() || m_pRbtBooklet->GetSavedValue() != m_pRbtBooklet->IsChecked() || - m_pCbxFront->GetSavedValue() != m_pCbxFront->IsChecked() || - m_pCbxBack->GetSavedValue() != m_pCbxBack->IsChecked() || - m_pCbxPaperbin->GetSavedValue() != m_pCbxPaperbin->IsChecked() || + m_pCbxFront->GetSavedValue() != TriState(m_pCbxFront->IsChecked()) || + m_pCbxBack->GetSavedValue() != TriState(m_pCbxBack->IsChecked()) || + m_pCbxPaperbin->GetSavedValue() != TriState(m_pCbxPaperbin->IsChecked()) || m_pRbtColor->GetSavedValue() != m_pRbtColor->IsChecked() || m_pRbtGrayscale->GetSavedValue() != m_pRbtGrayscale->IsChecked() || m_pRbtBlackWhite->GetSavedValue() != m_pRbtBlackWhite->IsChecked() ) diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 55ba52b06ec4..95ef3be9d7f8 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -141,10 +141,10 @@ sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) { sal_Bool bModified = sal_False; - if( m_pCbxRuler->GetSavedValue() != m_pCbxRuler->IsChecked() || - m_pCbxMoveOutline->GetSavedValue() != m_pCbxMoveOutline->IsChecked() || - m_pCbxDragStripes->GetSavedValue() != m_pCbxDragStripes->IsChecked() || - m_pCbxHandlesBezier->GetSavedValue() != m_pCbxHandlesBezier->IsChecked() ) + if( m_pCbxRuler->GetSavedValue() != TriState(m_pCbxRuler->IsChecked()) || + m_pCbxMoveOutline->GetSavedValue() != TriState(m_pCbxMoveOutline->IsChecked()) || + m_pCbxDragStripes->GetSavedValue() != TriState(m_pCbxDragStripes->IsChecked()) || + m_pCbxHandlesBezier->GetSavedValue() != TriState(m_pCbxHandlesBezier->IsChecked()) ) { SdOptionsLayoutItem aOptsItem( ATTR_OPTIONS_LAYOUT ); @@ -369,16 +369,16 @@ sal_Bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { sal_Bool bModified = sal_False; - if( m_pCbxStartWithTemplate->GetSavedValue() != m_pCbxStartWithTemplate->IsChecked() || - m_pCbxMarkedHitMovesAlways->GetSavedValue()!= m_pCbxMarkedHitMovesAlways->IsChecked() || - m_pCbxQuickEdit->GetSavedValue() != m_pCbxQuickEdit->IsChecked() || - m_pCbxPickThrough->GetSavedValue() != m_pCbxPickThrough->IsChecked() || - m_pCbxMasterPageCache->GetSavedValue() != m_pCbxMasterPageCache->IsChecked() || - m_pCbxCopy->GetSavedValue() != m_pCbxCopy->IsChecked() || - m_pCbxEnableSdremote->GetSavedValue() != m_pCbxEnableSdremote->IsChecked() || - m_pCbxEnablePresenterScreen->GetSavedValue()!= m_pCbxEnablePresenterScreen->IsChecked() || - m_pCbxCompatibility->GetSavedValue() != m_pCbxCompatibility->IsChecked() || - m_pCbxUsePrinterMetrics->GetSavedValue() != m_pCbxUsePrinterMetrics->IsChecked() ) + if( m_pCbxStartWithTemplate->GetSavedValue() != TriState(m_pCbxStartWithTemplate->IsChecked()) || + m_pCbxMarkedHitMovesAlways->GetSavedValue()!= TriState(m_pCbxMarkedHitMovesAlways->IsChecked()) || + m_pCbxQuickEdit->GetSavedValue() != TriState(m_pCbxQuickEdit->IsChecked()) || + m_pCbxPickThrough->GetSavedValue() != TriState(m_pCbxPickThrough->IsChecked()) || + m_pCbxMasterPageCache->GetSavedValue() != TriState(m_pCbxMasterPageCache->IsChecked()) || + m_pCbxCopy->GetSavedValue() != TriState(m_pCbxCopy->IsChecked()) || + m_pCbxEnableSdremote->GetSavedValue() != TriState(m_pCbxEnableSdremote->IsChecked()) || + m_pCbxEnablePresenterScreen->GetSavedValue()!= TriState(m_pCbxEnablePresenterScreen->IsChecked()) || + m_pCbxCompatibility->GetSavedValue() != TriState(m_pCbxCompatibility->IsChecked()) || + m_pCbxUsePrinterMetrics->GetSavedValue() != TriState(m_pCbxUsePrinterMetrics->IsChecked()) ) { SdOptionsMiscItem aOptsItem( ATTR_OPTIONS_MISC ); diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 813aa06c68a3..25341b1c636e 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -1482,7 +1482,7 @@ private: } if (mpOptions->IsTime()) - aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), sal_False, sal_False ); + aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getTime( Time( Time::SYSTEM ), false, false ); aInfo.maPrintSize = aInfo.mpPrinter->GetOutputSize(); maPrintSize = awt::Size( aInfo.mpPrinter->GetPaperSize().Width(), diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx index c041d58731e4..ab6a923a13cd 100644 --- a/sfx2/source/dialog/alienwarn.cxx +++ b/sfx2/source/dialog/alienwarn.cxx @@ -46,14 +46,14 @@ SfxAlienWarningDialog::SfxAlienWarningDialog(Window* pParent, const OUString& _r m_pKeepCurrentBtn->SetText( sInfoText ); // load value of "warning on" checkbox from save options - m_pWarningOnBox->Check( SvtSaveOptions().IsWarnAlienFormat() == sal_True ); + m_pWarningOnBox->Check( SvtSaveOptions().IsWarnAlienFormat() ); } SfxAlienWarningDialog::~SfxAlienWarningDialog() { // save value of "warning off" checkbox, if necessary SvtSaveOptions aSaveOpt; - sal_Bool bChecked = m_pWarningOnBox->IsChecked(); + bool bChecked = m_pWarningOnBox->IsChecked(); if ( aSaveOpt.IsWarnAlienFormat() != bChecked ) aSaveOpt.SetWarnAlienFormat( bChecked ); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 57c664243f95..6d078f072a2d 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -181,7 +181,7 @@ OUString ConvertDateTime_Impl( const OUString& rName, const OUString pDelim ( ", " ); OUString aStr( rWrapper.getDate( aD ) ); aStr += pDelim; - aStr += rWrapper.getTime( aT, sal_True, sal_False ); + aStr += rWrapper.getTime( aT, true, false ); OUString aAuthor = comphelper::string::stripStart(rName, ' '); if (!aAuthor.isEmpty()) { diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index b340f34cdcb1..14ec6760109d 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -389,7 +389,7 @@ sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) pStyle->SetMask( nMask ); } if(m_pAutoCB->IsVisible() && - m_pAutoCB->IsChecked() != m_pAutoCB->GetSavedValue()) + TriState(m_pAutoCB->IsChecked()) != m_pAutoCB->GetSavedValue()) { rSet.Put(SfxBoolItem(SID_ATTR_AUTO_STYLE_UPDATE, m_pAutoCB->IsChecked())); } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 972d81970330..dcd496c5998e 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -122,12 +122,12 @@ sal_Bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) sal_Bool bModified = sal_False; - if( m_pPaperSizeCB->IsChecked() != m_pPaperSizeCB->GetSavedValue()) + if( TriState(m_pPaperSizeCB->IsChecked()) != m_pPaperSizeCB->GetSavedValue()) aWarnOptions.SetPaperSize(m_pPaperSizeCB->IsChecked()); - if( m_pPaperOrientationCB->IsChecked() != m_pPaperOrientationCB->GetSavedValue() ) + if( TriState(m_pPaperOrientationCB->IsChecked()) != m_pPaperOrientationCB->GetSavedValue() ) aWarnOptions.SetPaperOrientation(m_pPaperOrientationCB->IsChecked()); - if( m_pTransparencyCB->IsChecked() != m_pTransparencyCB->GetSavedValue() ) + if( TriState(m_pTransparencyCB->IsChecked()) != m_pTransparencyCB->GetSavedValue() ) aWarnOptions.SetTransparency( m_pTransparencyCB->IsChecked() ); ImplSaveControls( m_pPrinterOutputRB->IsChecked() ? &maPrinterOptions : &maPrintFileOptions ); @@ -235,7 +235,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt (sal_uInt16)( (sizeof (aDPIArray) / sizeof (aDPIArray[0])) - 1 ) ) ] ); pCurrentOptions->SetReducedBitmapIncludesTransparency( m_pReduceBitmapsTransparencyCB->IsChecked() ); pCurrentOptions->SetConvertToGreyscales( m_pConvertToGreyscalesCB->IsChecked() ); - sal_Bool bOrigBackEnd = pCurrentOptions->IsPDFAsStandardPrintJobFormat(); + bool bOrigBackEnd = pCurrentOptions->IsPDFAsStandardPrintJobFormat(); if (bOrigBackEnd != m_pPDFCB->IsChecked()) { pCurrentOptions->SetPDFAsStandardPrintJobFormat( m_pPDFCB->IsChecked() ); diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 4618ac93d517..856177d7acfc 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -2031,7 +2031,7 @@ SfxDocumentMetaData::loadFromMedium(const OUString & URL, if (!URL.isEmpty()) { md[ utl::MediaDescriptor::PROP_URL() ] <<= URL; } - if (sal_True == md.addInputStream()) { + if (md.addInputStream()) { md[ utl::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn; } css::uno::Reference<css::embed::XStorage> xStorage; diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx index 84f0e1c30b7e..79b646e3600c 100644 --- a/svtools/source/config/accessibilityoptions.cxx +++ b/svtools/source/config/accessibilityoptions.cxx @@ -781,7 +781,7 @@ sal_Bool SvtAccessibilityOptions::GetIsAutomaticFontColor() const { return sm_pSingleImplConfig->GetIsAutomaticFontColor(); } -sal_Bool SvtAccessibilityOptions::GetIsSystemFont() const +bool SvtAccessibilityOptions::GetIsSystemFont() const { return sm_pSingleImplConfig->GetIsSystemFont(); } diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx index ea47930ba69e..f238686d1b86 100644 --- a/svtools/source/config/optionsdrawinglayer.cxx +++ b/svtools/source/config/optionsdrawinglayer.cxx @@ -1118,7 +1118,7 @@ sal_Bool SvtOptionsDrawinglayer::IsAAPossibleOnThisSystem() const } // primitives -sal_Bool SvtOptionsDrawinglayer::IsAntiAliasing() const +bool SvtOptionsDrawinglayer::IsAntiAliasing() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsAntiAliasing() && IsAAPossibleOnThisSystem(); diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx index 2490da8ffd7a..af24eab18539 100644 --- a/svtools/source/misc/imageresourceaccess.cxx +++ b/svtools/source/misc/imageresourceaccess.cxx @@ -183,7 +183,7 @@ namespace svt //-------------------------------------------------------------------- Reference< XInputStream > GraphicAccess::getImageXStream( const Reference< XComponentContext >& _rxContext, const OUString& _rImageResourceURL ) { - return new OSeekableInputStreamWrapper( getImageStream( _rxContext, _rImageResourceURL ), sal_True ); // take ownership + return new OSeekableInputStreamWrapper( getImageStream( _rxContext, _rImageResourceURL ), true ); // take ownership } //........................................................................ diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index f2a8b7e8719f..d3ad4ba6d803 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2369,7 +2369,7 @@ namespace svxform sPropName = PN_READONLY_EXPR; else if ( m_pCalculateCB == pBox ) sPropName = PN_CALCULATE_EXPR; - bool bIsChecked = ( pBox->IsChecked() != sal_False ); + bool bIsChecked = pBox->IsChecked(); m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp; if ( bIsChecked && sTemp.isEmpty() ) sTemp = TRUE_VALUE; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 721fa00c0f81..331b06753fcb 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -629,7 +629,7 @@ namespace svxform void SetName( const OUString& _rName ) { m_pNameED->SetText( _rName );} OUString GetURL() const { return m_pURLED->GetText(); } void SetURL( const OUString& _rURL ) { m_pURLED->SetText( _rURL );} - bool IsLinkInstance() const { return ( m_pLinkInstanceCB->IsChecked() != sal_False ); } + bool IsLinkInstance() const { return m_pLinkInstanceCB->IsChecked(); } void SetLinkInstance( bool _bLink ) { m_pLinkInstanceCB->Check( _bLink != false ); } }; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index f320e3e88156..e964cd3cbb16 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -485,7 +485,7 @@ IMPL_LINK( PosSizePropertyPanel, ClickAutoHdl, void *, EMPTYARG ) // mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog SvtViewOptions aPageOpt( E_TABPAGE, OUString::number( RID_SVXPAGE_POSITION_SIZE ) ); - aPageOpt.SetUserItem( USERITEM_NAME, ::com::sun::star::uno::makeAny( ::rtl::OUString::number( mpCbxScale->IsChecked() ) ) ); + aPageOpt.SetUserItem( USERITEM_NAME, ::com::sun::star::uno::makeAny( ::rtl::OUString::number( int(mpCbxScale->IsChecked()) ) ) ); return 0; } diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 60d913e42692..a1efb3cc184d 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -144,7 +144,7 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId ) if( bRet ) { pStm->Seek( 0 ); - mxStmWrapper = new ::utl::OInputStreamWrapper( pStm, sal_True ); + mxStmWrapper = new ::utl::OInputStreamWrapper( pStm, true ); } else delete pStm; diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index c73a05606153..022b18a08190 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem OUString sName; ///< Name of the anchor. ImageMap *pMap; ///< ClientSide images. - sal_Bool bIsServerMap; ///< A ServerSideImageMap with the URL. + bool bIsServerMap; ///< A ServerSideImageMap with the URL. SwFmtURL& operator=( const SwFmtURL& ); @@ -65,7 +65,7 @@ public: OUString GetTargetFrameName()const { return sTargetFrameName; } OUString GetURL() const { return sURL; } - sal_Bool IsServerMap() const { return bIsServerMap; } + bool IsServerMap() const { return bIsServerMap; } const ImageMap *GetMap() const { return pMap; } ImageMap *GetMap() { return pMap; } diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index fd304c00a2c3..1a83cf7b7261 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -127,7 +127,7 @@ xmlDocPtr Test::parseExport(const OUString& rStreamName) // Read the XML stream we're interested in. uno::Reference<packages::zip::XZipFileAccess2> xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), m_aTempFile.GetURL()); uno::Reference<io::XInputStream> xInputStream(xNameAccess->getByName(rStreamName), uno::UNO_QUERY); - boost::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, sal_True)); + boost::shared_ptr<SvStream> pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); pStream->Seek(STREAM_SEEK_TO_END); sal_Size nSize = pStream->Tell(); pStream->Seek(0); diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx index 5e6016c81e30..bb2b39627325 100644 --- a/sw/source/core/fields/docufld.cxx +++ b/sw/source/core/fields/docufld.cxx @@ -913,7 +913,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, lcl_GetLocalDataWrapper( nLang, &pAppLocalData, &pLocalData ); sal_Int32 dur = xDocProps->getEditingDuration(); aStr = pLocalData->getTime( Time(dur/3600, (dur%3600)/60, dur%60), - sal_False, sal_False); + false, false); } else { @@ -986,7 +986,7 @@ OUString SwDocInfoFieldType::Expand( sal_uInt16 nSub, sal_uInt32 nFormat, lcl_GetLocalDataWrapper( nLang, &pAppLocalData, &pLocalData ); aStr = pLocalData->getTime( aDate, - sal_False, sal_False); + false, false); } else { diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 7aa658201dd6..72e929256e1c 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -1632,7 +1632,7 @@ bool SwFmtAnchor::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) SwFmtURL::SwFmtURL() : SfxPoolItem( RES_URL ), pMap( 0 ), - bIsServerMap( sal_False ) + bIsServerMap( false ) { } diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 7ce6d97dbd67..97dc80086eab 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -46,7 +46,7 @@ sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >& a utl::MediaDescriptor aMediaDesc = aDescriptor; ::uno::Reference< io::XStream > xStream = aMediaDesc.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_STREAMFOROUTPUT(), uno::Reference< io::XStream >() ); - SvStream* pStream = utl::UcbStreamHelper::CreateStream( xStream, sal_True ); + SvStream* pStream = utl::UcbStreamHelper::CreateStream( xStream, true ); m_aWriter.SetStream(pStream); // get SwDoc* diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 705c6890bfdb..4d7a3d0a16b2 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -150,7 +150,7 @@ sal_Bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) m_pConfigItem->SetMailDisplayName(m_pDisplayNameED->GetText()); if(m_pAddressED->GetText() != m_pAddressED->GetSavedValue()) m_pConfigItem->SetMailAddress(m_pAddressED->GetText()); - if( m_pReplyToCB->GetSavedValue() != m_pReplyToCB->IsChecked()) + if( m_pReplyToCB->GetSavedValue() != TriState(m_pReplyToCB->IsChecked())) m_pConfigItem->SetMailReplyTo(m_pReplyToCB->IsChecked()); if(m_pReplyToED->GetText() != m_pReplyToED->GetSavedValue()) m_pConfigItem->SetMailReplyTo(m_pReplyToED->GetText()); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 57b03f38d892..9560716b4c91 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -140,8 +140,8 @@ sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) SwFldUpdateFlags eFldFlags = m_pAutoUpdateFields->IsChecked() ? m_pAutoUpdateCharts->IsChecked() ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : AUTOUPD_OFF; - if(m_pAutoUpdateFields->IsChecked() != m_pAutoUpdateFields->GetSavedValue() || - m_pAutoUpdateCharts->IsChecked() != m_pAutoUpdateCharts->GetSavedValue()) + if(TriState(m_pAutoUpdateFields->IsChecked()) != m_pAutoUpdateFields->GetSavedValue() || + TriState(m_pAutoUpdateCharts->IsChecked()) != m_pAutoUpdateCharts->GetSavedValue()) { pMod->ApplyFldUpdateFlags(eFldFlags); if(m_pWrtShell) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index e31dd1c51e1f..0856e16b25f4 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1368,10 +1368,10 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) if (m_pWrtShell) { m_pWrtShell->GetDoc()->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, m_pMathBaselineAlignmentCB->IsChecked() ); - bRet |= m_pMathBaselineAlignmentCB->IsChecked() != m_pMathBaselineAlignmentCB->GetSavedValue(); + bRet |= TriState(m_pMathBaselineAlignmentCB->IsChecked()) != m_pMathBaselineAlignmentCB->GetSavedValue(); } - if( m_pCrsrInProtCB->IsChecked() != m_pCrsrInProtCB->GetSavedValue()) + if( TriState(m_pCrsrInProtCB->IsChecked()) != m_pCrsrInProtCB->GetSavedValue()) { rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked())); bRet = true; @@ -2268,13 +2268,13 @@ sal_Bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& ) bRet = sal_True; } - if( m_pRsidCB->IsChecked() != m_pRsidCB->GetSavedValue() ) + if( TriState(m_pRsidCB->IsChecked()) != m_pRsidCB->GetSavedValue() ) { pOpt->SetUseRsid( m_pRsidCB->IsChecked() ); bRet = sal_True; } - if( m_pIgnoreCB->IsChecked() != m_pIgnoreCB->GetSavedValue() ) + if( TriState(m_pIgnoreCB->IsChecked()) != m_pIgnoreCB->GetSavedValue() ) { pOpt->SetIgnorePieces( m_pIgnoreCB->IsChecked() ); bRet = sal_True; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 224477e1c4fa..b96e3774af35 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1170,8 +1170,8 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } bool bValueModified = (m_aWidthED.IsValueModified() || m_aHeightED.IsValueModified()); - bool bCheckChanged = (m_pRelWidthCB->GetSavedValue() != m_pRelWidthCB->IsChecked() - || m_pRelHeightCB->GetSavedValue() != m_pRelHeightCB->IsChecked()); + bool bCheckChanged = (m_pRelWidthCB->GetSavedValue() != TriState(m_pRelWidthCB->IsChecked()) + || m_pRelHeightCB->GetSavedValue() != TriState(m_pRelHeightCB->IsChecked())); bool bLegalValue = !(!rOldSize.GetWidth () && !rOldSize.GetHeight() && m_aWidthED .GetValue() == m_aWidthED .GetMin() && @@ -1195,7 +1195,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) else aSz.SetHeightPercent(0); - if (m_pFixedRatioCB->IsChecked() && (m_pRelWidthCB->IsChecked() ^ m_pRelHeightCB->IsChecked())) + if (m_pFixedRatioCB->IsChecked() && (m_pRelWidthCB->IsChecked() != m_pRelHeightCB->IsChecked())) { if (m_pRelWidthCB->IsChecked()) aSz.SetHeightPercent(0xff); @@ -1207,18 +1207,18 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) { if( m_pAutoHeightCB->GetState() != m_pAutoHeightCB->GetSavedValue() ) { - SwFrmSize eFrmSize = (SwFrmSize) m_pAutoHeightCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; + SwFrmSize eFrmSize = m_pAutoHeightCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; if( eFrmSize != aSz.GetHeightSizeType() ) aSz.SetHeightSizeType(eFrmSize); } if( m_pAutoWidthCB->GetState() != m_pAutoWidthCB->GetSavedValue() ) { - SwFrmSize eFrmSize = (SwFrmSize) m_pAutoWidthCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; + SwFrmSize eFrmSize = m_pAutoWidthCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; if( eFrmSize != aSz.GetWidthSizeType() ) aSz.SetWidthSizeType( eFrmSize ); } } - if( !bFormat && m_pFixedRatioCB->GetSavedValue() != m_pFixedRatioCB->IsChecked()) + if( !bFormat && m_pFixedRatioCB->GetSavedValue() != TriState(m_pFixedRatioCB->IsChecked())) bRet |= 0 != rSet.Put(SfxBoolItem(FN_KEEP_ASPECT_RATIO, m_pFixedRatioCB->IsChecked())); pOldItem = GetOldItem(rSet, RES_FRM_SIZE); @@ -1233,7 +1233,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) bRet |= 0 != rSet.Put( aSz ); } - if(m_pFollowTextFlowCB->IsChecked() != m_pFollowTextFlowCB->GetSavedValue()) + if(TriState(m_pFollowTextFlowCB->IsChecked()) != m_pFollowTextFlowCB->GetSavedValue()) { bRet |= 0 != rSet.Put(SwFmtFollowTextFlow(m_pFollowTextFlowCB->IsChecked())); } @@ -2521,8 +2521,8 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) sal_Bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) { sal_Bool bModified = sal_False; - if ( m_pMirrorHorzBox->GetSavedValue() != m_pMirrorHorzBox->IsChecked() || - m_pMirrorVertBox->GetSavedValue() != m_pMirrorVertBox->IsChecked() || + if ( m_pMirrorHorzBox->GetSavedValue() != TriState(m_pMirrorHorzBox->IsChecked()) || + m_pMirrorVertBox->GetSavedValue() != TriState(m_pMirrorVertBox->IsChecked()) || m_pAllPagesRB->GetSavedValue() != m_pAllPagesRB->IsChecked() || m_pLeftPagesRB->GetSavedValue() != m_pLeftPagesRB->IsChecked() || m_pRightPagesRB->GetSavedValue() != m_pRightPagesRB->IsChecked()) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 89939caf7a0a..cd4aaf8234a0 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -362,7 +362,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) if ( bDrawMode ) { - sal_Bool bChecked = m_pWrapTransparentCB->IsChecked() & m_pWrapTransparentCB->IsEnabled(); + sal_Bool bChecked = m_pWrapTransparentCB->IsChecked() && m_pWrapTransparentCB->IsEnabled(); if (m_pWrapTransparentCB->GetSavedValue() != bChecked) bModified |= 0 != rSet.Put(SfxInt16Item(FN_DRAW_WRAP_DLG, bChecked ? 0 : 1)); } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 03f226ac3059..d526fdbd2f5e 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -167,12 +167,12 @@ sal_Bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) m_pTextSizeMF->GetSavedValue().toInt32() != m_pTextSizeMF->GetValue()|| m_pCharsPerLineNF->GetSavedValue().toInt32() != m_pCharsPerLineNF->GetValue()|| - m_pSnapToCharsCB->GetSavedValue() != m_pSnapToCharsCB->IsChecked() || + m_pSnapToCharsCB->GetSavedValue() != TriState(m_pSnapToCharsCB->IsChecked()) || m_pRubySizeMF->GetSavedValue().toInt32() != m_pRubySizeMF->GetValue()|| m_pCharWidthMF->GetSavedValue().toInt32() != m_pCharWidthMF->GetValue()|| - m_pRubyBelowCB->GetSavedValue() != m_pRubyBelowCB->IsChecked()|| - m_pDisplayCB->GetSavedValue() != m_pDisplayCB->IsChecked()|| - m_pPrintCB->GetSavedValue() != m_pPrintCB->IsChecked()|| + m_pRubyBelowCB->GetSavedValue() != TriState(m_pRubyBelowCB->IsChecked())|| + m_pDisplayCB->GetSavedValue() != TriState(m_pDisplayCB->IsChecked())|| + m_pPrintCB->GetSavedValue() != TriState(m_pPrintCB->IsChecked())|| m_pColorLB->GetSavedValue() != m_pColorLB->GetSelectEntryPos()) { PutGridItem(rSet); diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 9fec8f0bea1d..76ae477e78bd 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -41,7 +41,7 @@ void SwTableHeightDlg::Apply() SwTwips nHeight = static_cast< SwTwips >(m_pHeightEdit->Denormalize(m_pHeightEdit->GetValue(FUNIT_TWIP))); SwFmtFrmSize aSz(ATT_FIX_SIZE, 0, nHeight); - SwFrmSize eFrmSize = (SwFrmSize) m_pAutoHeightCB->IsChecked() ? + SwFrmSize eFrmSize = m_pAutoHeightCB->IsChecked() ? ATT_MIN_SIZE : ATT_FIX_SIZE; if(eFrmSize != aSz.GetHeightSizeType()) { diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index e53054859e89..124a5153d4dd 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1352,19 +1352,19 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) bool bModified = false; // Repeat Heading - if(m_pHeadLineCB->IsChecked() != m_pHeadLineCB->GetSavedValue() || + if(TriState(m_pHeadLineCB->IsChecked()) != m_pHeadLineCB->GetSavedValue() || OUString::number( static_cast< sal_Int32 >(m_pRepeatHeaderNF->GetValue()) ) != m_pRepeatHeaderNF->GetSavedValue() ) { bModified |= 0 != rSet.Put( SfxUInt16Item(FN_PARAM_TABLE_HEADLINE, m_pHeadLineCB->IsChecked()? sal_uInt16(m_pRepeatHeaderNF->GetValue()) : 0 )); } - if(m_pKeepCB->IsChecked() != m_pKeepCB->GetSavedValue()) + if(TriState(m_pKeepCB->IsChecked()) != m_pKeepCB->GetSavedValue()) bModified |= 0 != rSet.Put( SvxFmtKeepItem( m_pKeepCB->IsChecked(), RES_KEEP)); - if(m_pSplitCB->IsChecked() != m_pSplitCB->GetSavedValue()) + if(TriState(m_pSplitCB->IsChecked()) != m_pSplitCB->GetSavedValue()) bModified |= 0 != rSet.Put( SwFmtLayoutSplit( m_pSplitCB->IsChecked())); - if(m_pSplitRowCB->IsChecked() != m_pSplitRowCB->GetSavedValue()) + if(TriState(m_pSplitRowCB->IsChecked()) != m_pSplitRowCB->GetSavedValue()) bModified |= 0 != rSet.Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked())); diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 1b9309eda652..55e4adb9d086 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -768,7 +768,7 @@ OUString GetAppLangDateTimeString( const DateTime& rDT ) { const SvtSysLocale aSysLocale; const LocaleDataWrapper& rAppLclData = aSysLocale.GetLocaleData(); - OUString sRet = rAppLclData.getDate( rDT ) + " " + rAppLclData.getTime( rDT, sal_False, sal_False ); + OUString sRet = rAppLclData.getDate( rDT ) + " " + rAppLclData.getTime( rDT, false, false ); return sRet; } diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx index 93d984fa8767..df2f6a3cf77d 100644 --- a/unotools/source/accessibility/accessiblerelationsethelper.cxx +++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx @@ -39,7 +39,7 @@ public: AccessibleRelation getRelation( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException); - sal_Bool containsRelation( sal_Int16 aRelationType ) + bool containsRelation( sal_Int16 aRelationType ) throw (uno::RuntimeException); AccessibleRelation getRelationByType( sal_Int16 aRelationType ) throw (uno::RuntimeException); @@ -78,7 +78,7 @@ AccessibleRelation AccessibleRelationSetHelperImpl::getRelation( sal_Int32 nInde return maRelations[nIndex]; } -sal_Bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType ) +bool AccessibleRelationSetHelperImpl::containsRelation( sal_Int16 aRelationType ) throw (uno::RuntimeException) { AccessibleRelation defaultRelation; // default is INVALID @@ -91,7 +91,7 @@ AccessibleRelation AccessibleRelationSetHelperImpl::getRelationByType( sal_Int16 { sal_Int32 nCount(getRelationCount()); sal_Int32 i(0); - sal_Bool bFound(sal_False); + bool bFound(false); while ((i < nCount) && !bFound) { if (maRelations[i].RelationType == aRelationType) @@ -107,11 +107,11 @@ void AccessibleRelationSetHelperImpl::AddRelation(const AccessibleRelation& rRel { sal_Int32 nCount(getRelationCount()); sal_Int32 i(0); - sal_Bool bFound(sal_False); + bool bFound(false); while ((i < nCount) && !bFound) { if (maRelations[i].RelationType == rRelation.RelationType) - bFound = sal_True; + bFound = true; else i++; } diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx index 5a2c6ff19449..f0318fdf5c84 100644 --- a/unotools/source/accessibility/accessiblestatesethelper.cxx +++ b/unotools/source/accessibility/accessiblestatesethelper.cxx @@ -37,9 +37,9 @@ public: AccessibleStateSetHelperImpl(const AccessibleStateSetHelperImpl& rImpl); ~AccessibleStateSetHelperImpl(); - sal_Bool IsEmpty () const + bool IsEmpty () const throw (uno::RuntimeException); - sal_Bool Contains (sal_Int16 aState) const + bool Contains (sal_Int16 aState) const throw (uno::RuntimeException); uno::Sequence<sal_Int16> GetStates() const throw (uno::RuntimeException); @@ -68,13 +68,13 @@ AccessibleStateSetHelperImpl::~AccessibleStateSetHelperImpl() { } -inline sal_Bool AccessibleStateSetHelperImpl::IsEmpty () const +inline bool AccessibleStateSetHelperImpl::IsEmpty () const throw (uno::RuntimeException) { return maStates == 0; } -inline sal_Bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const +inline bool AccessibleStateSetHelperImpl::Contains (sal_Int16 aState) const throw (uno::RuntimeException) { DBG_ASSERT(aState < BITFIELDSIZE, "the statesset is too small"); @@ -210,7 +210,7 @@ sal_Bool SAL_CALL AccessibleStateSetHelper::containsAll sal_Int32 nCount(rStateSet.getLength()); const sal_Int16* pStates = rStateSet.getConstArray(); sal_Int32 i = 0; - sal_Bool bFound(sal_True); + bool bFound(true); while (i < nCount) { bFound = mpHelperImpl->Contains(pStates[i]); diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index dcd3ab4b271b..a3d57edacb21 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -113,7 +113,7 @@ namespace utl // access helper OUString getBootstrapValue(OUString const& _sName, OUString const& _sDefault) const; - sal_Bool getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const; + bool getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const; OUString getImplName() const { return m_aImplName; } @@ -595,7 +595,7 @@ OUString Bootstrap::getBuildIdData(OUString const& _sDefault) OUString sBuildId; // read buildid from version.ini (versionrc), if it doesn't exist or buildid is empty - if ( data().getVersionValue( csBuildIdItem, sBuildId, _sDefault ) != sal_True || + if ( !data().getVersionValue( csBuildIdItem, sBuildId, _sDefault ) || sBuildId.isEmpty() ) // read buildid from bootstrap.ini (bootstraprc) sBuildId = data().getBootstrapValue( csBuildIdItem, _sDefault ); @@ -779,7 +779,7 @@ OUString Bootstrap::Impl::getBootstrapValue(OUString const& _sName, OUString con } // --------------------------------------------------------------------------------------- -sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const +bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rValue, OUString const& _sDefault) const { // try to open version.ini (versionrc) OUString uri; @@ -787,11 +787,11 @@ sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa rtl::Bootstrap aData( uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ); if ( aData.getHandle() == NULL ) // version.ini (versionrc) doesn't exist - return sal_False; + return false; // read value aData.getFrom(_sName,_rValue,_sDefault); - return sal_True; + return true; } // --------------------------------------------------------------------------------------- diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx index 082bbf02f9c0..61bf2db03a50 100644 --- a/unotools/source/config/cmdoptions.cxx +++ b/unotools/source/config/cmdoptions.cxx @@ -59,12 +59,12 @@ class SvtCmdOptions m_aCommandHashMap.clear(); } - sal_Bool HasEntries() const + bool HasEntries() const { return ( m_aCommandHashMap.size() > 0 ); } - sal_Bool Lookup( const OUString& aCmd ) const + bool Lookup( const OUString& aCmd ) const { CommandHashMap::const_iterator pEntry = m_aCommandHashMap.find( aCmd ); return ( pEntry != m_aCommandHashMap.end() ); @@ -165,8 +165,8 @@ class SvtCommandOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - sal_Bool HasEntries ( SvtCommandOptions::CmdOption eOption ) const; - sal_Bool Lookup ( SvtCommandOptions::CmdOption eCmdOption, const OUString& ) const; + bool HasEntries ( SvtCommandOptions::CmdOption eOption ) const; + bool Lookup ( SvtCommandOptions::CmdOption eCmdOption, const OUString& ) const; void EstablisFrameCallback(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame); private: @@ -227,7 +227,7 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl() // We need it to get information about changes outside these class on ouer used configuration keys! */ Sequence< OUString > aNotifySeq( 1 ); aNotifySeq[0] = "Disabled"; - EnableNotification( aNotifySeq, sal_True ); + EnableNotification( aNotifySeq, true ); } //***************************************************************************************************************** @@ -295,18 +295,18 @@ void SvtCommandOptions_Impl::Commit() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) const +bool SvtCommandOptions_Impl::HasEntries( SvtCommandOptions::CmdOption eOption ) const { if ( eOption == SvtCommandOptions::CMDOPTION_DISABLED ) - return ( m_aDisabledCommands.HasEntries() > 0 ); + return m_aDisabledCommands.HasEntries(); else - return sal_False; + return false; } //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, const OUString& aCommand ) const +bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption, const OUString& aCommand ) const { switch( eCmdOption ) { @@ -318,7 +318,7 @@ sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption DBG_ASSERT( false, "SvtCommandOptions_Impl::Lookup()\nUnknown option type given!\n" ); } - return sal_False; + return false; } //***************************************************************************************************************** @@ -409,7 +409,7 @@ SvtCommandOptions::~SvtCommandOptions() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtCommandOptions::HasEntries( CmdOption eOption ) const +bool SvtCommandOptions::HasEntries( CmdOption eOption ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->HasEntries( eOption ); @@ -418,7 +418,7 @@ sal_Bool SvtCommandOptions::HasEntries( CmdOption eOption ) const //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandURL ) const +bool SvtCommandOptions::Lookup( CmdOption eCmdOption, const OUString& aCommandURL ) const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->Lookup( eCmdOption, aCommandURL ); diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index 1f5ce94f3601..818ca7454e6b 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -118,7 +118,7 @@ ConfigChangeListener_Impl::~ConfigChangeListener_Impl() { } -static sal_Bool lcl_Find( +static bool lcl_Find( const OUString& rTemp, const OUString* pCheckPropertyNames, sal_Int32 nLength) @@ -127,8 +127,8 @@ static sal_Bool lcl_Find( //i.e ...Print/Content/Graphic and .../Print for(sal_Int32 nIndex = 0; nIndex < nLength; nIndex++) if( isPrefixOfConfigurationPath(rTemp, pCheckPropertyNames[nIndex]) ) - return sal_True; - return sal_False; + return true; + return false; } //----------------------------------------------------------------------------- void ConfigChangeListener_Impl::changesOccurred( const ChangesEvent& rEvent ) throw(RuntimeException) @@ -455,13 +455,13 @@ Sequence< Any > ConfigItem::GetProperties(const Sequence< OUString >& rNames) return aRet; } -sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames, +bool ConfigItem::PutProperties( const Sequence< OUString >& rNames, const Sequence< Any>& rValues) { ValueCounter_Impl aCounter(m_nInValueChange); Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); Reference<XNameReplace> xTopNodeReplace(xHierarchyAccess, UNO_QUERY); - sal_Bool bRet = xHierarchyAccess.is() && xTopNodeReplace.is(); + bool bRet = xHierarchyAccess.is() && xTopNodeReplace.is(); if(bRet) { Sequence< OUString > lNames ; @@ -502,14 +502,14 @@ sal_Bool ConfigItem::PutProperties( const Sequence< OUString >& rNames, Reference<XNameReplace> xNodeReplace(xNodeAcc, UNO_QUERY); Reference<XNameContainer> xNodeCont (xNodeAcc, UNO_QUERY); - sal_Bool bExist = (xNodeAcc.is() && xNodeAcc->hasByName(sProperty)); + bool bExist = (xNodeAcc.is() && xNodeAcc->hasByName(sProperty)); if (bExist && xNodeReplace.is()) xNodeReplace->replaceByName(sProperty, pValues[i]); else if (!bExist && xNodeCont.is()) xNodeCont->insertByName(sProperty, pValues[i]); else - bRet = sal_False; + bRet = false; } else //direct value { @@ -535,8 +535,8 @@ void ConfigItem::DisableNotification() RemoveChangesListener(); } -sal_Bool ConfigItem::EnableNotification(const Sequence< OUString >& rNames, - sal_Bool bEnableInternalNotification ) +bool ConfigItem::EnableNotification(const Sequence< OUString >& rNames, + bool bEnableInternalNotification ) { OSL_ENSURE(0 == (m_nMode&CONFIG_MODE_RELEASE_TREE), "notification in CONFIG_MODE_RELEASE_TREE mode not possible"); @@ -544,12 +544,12 @@ sal_Bool ConfigItem::EnableNotification(const Sequence< OUString >& rNames, Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); Reference<XChangesNotifier> xChgNot(xHierarchyAccess, UNO_QUERY); if(!xChgNot.is()) - return sal_False; + return false; OSL_ENSURE(!xChangeLstnr.is(), "EnableNotification already called"); if(xChangeLstnr.is()) xChgNot->removeChangesListener( xChangeLstnr ); - sal_Bool bRet = sal_True; + bool bRet = true; try { @@ -558,7 +558,7 @@ sal_Bool ConfigItem::EnableNotification(const Sequence< OUString >& rNames, } catch (const RuntimeException&) { - bRet = sal_False; + bRet = false; } return bRet; } @@ -690,10 +690,10 @@ Sequence< OUString > ConfigItem::GetNodeNames(const OUString& rNode, ConfigNameF return aRet; } -sal_Bool ConfigItem::ClearNodeSet(const OUString& rNode) +bool ConfigItem::ClearNodeSet(const OUString& rNode) { ValueCounter_Impl aCounter(m_nInValueChange); - sal_Bool bRet = sal_False; + bool bRet = false; Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); if(xHierarchyAccess.is()) { @@ -708,7 +708,7 @@ sal_Bool ConfigItem::ClearNodeSet(const OUString& rNode) else xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY); if(!xCont.is()) - return sal_False; + return false; Sequence< OUString > aNames = xCont->getElementNames(); const OUString* pNames = aNames.getConstArray(); Reference<XChangesBatch> xBatch(xHierarchyAccess, UNO_QUERY); @@ -721,17 +721,17 @@ sal_Bool ConfigItem::ClearNodeSet(const OUString& rNode) CATCH_INFO("Exception from removeByName(): ") } xBatch->commitChanges(); - bRet = sal_True; + bRet = true; } CATCH_INFO("Exception from ClearNodeSet") } return bRet; } -sal_Bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString >& rElements) +bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString >& rElements) { ValueCounter_Impl aCounter(m_nInValueChange); - sal_Bool bRet = sal_False; + bool bRet = false; Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); if(xHierarchyAccess.is()) { @@ -747,7 +747,7 @@ sal_Bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString else xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY); if(!xCont.is()) - return sal_False; + return false; try { for(sal_Int32 nElement = 0; nElement < rElements.getLength(); nElement++) @@ -758,7 +758,7 @@ sal_Bool ConfigItem::ClearNodeElements(const OUString& rNode, Sequence< OUString xBatch->commitChanges(); } CATCH_INFO("Exception from commitChanges(): ") - bRet = sal_True; + bRet = true; } CATCH_INFO("Exception from GetNodeNames: ") } @@ -801,11 +801,11 @@ Sequence< OUString > lcl_extractSetPropertyNames( const Sequence< PropertyValue } // Add or change properties -sal_Bool ConfigItem::SetSetProperties( +bool ConfigItem::SetSetProperties( const OUString& rNode, Sequence< PropertyValue > rValues) { ValueCounter_Impl aCounter(m_nInValueChange); - sal_Bool bRet = sal_True; + bool bRet = true; Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); if(xHierarchyAccess.is()) { @@ -821,7 +821,7 @@ sal_Bool ConfigItem::SetSetProperties( else xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY); if(!xCont.is()) - return sal_False; + return false; Reference<XSingleServiceFactory> xFac(xCont, UNO_QUERY); @@ -855,7 +855,7 @@ sal_Bool ConfigItem::SetSetProperties( Sequence< Any> aSetValues(rValues.getLength()); Any* pSetValues = aSetValues.getArray(); - sal_Bool bEmptyNode = rNode.isEmpty(); + bool bEmptyNode = rNode.isEmpty(); for(sal_Int32 k = 0; k < rValues.getLength(); k++) { pSetNames[k] = pProperties[k].Name.copy( bEmptyNode ? 1 : 0); @@ -894,17 +894,17 @@ sal_Bool ConfigItem::SetSetProperties( catch (const Exception&) { #endif - bRet = sal_False; + bRet = false; } } return bRet; } -sal_Bool ConfigItem::ReplaceSetProperties( +bool ConfigItem::ReplaceSetProperties( const OUString& rNode, Sequence< PropertyValue > rValues) { ValueCounter_Impl aCounter(m_nInValueChange); - sal_Bool bRet = sal_True; + bool bRet = true; Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); if(xHierarchyAccess.is()) { @@ -920,7 +920,7 @@ sal_Bool ConfigItem::ReplaceSetProperties( else xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY); if(!xCont.is()) - return sal_False; + return false; // JB: Change: now the same name handling for sets of simple values const Sequence< OUString > aSubNodeNames = lcl_extractSetPropertyNames(rValues, rNode); @@ -937,12 +937,12 @@ sal_Bool ConfigItem::ReplaceSetProperties( for(sal_Int32 nContSub = 0; nContSub < aContainerSubNodes.getLength(); nContSub++) { - sal_Bool bFound = sal_False; + bool bFound = false; for(sal_Int32 j = 0; j < nSubNodeCount; j++) { if(pSubNodeNames[j] == pContainerSubNodes[nContSub]) { - bFound = sal_True; + bFound = true; break; } } @@ -995,7 +995,7 @@ sal_Bool ConfigItem::ReplaceSetProperties( Sequence< Any> aSetValues(rValues.getLength()); Any* pSetValues = aSetValues.getArray(); - sal_Bool bEmptyNode = rNode.isEmpty(); + bool bEmptyNode = rNode.isEmpty(); for(sal_Int32 k = 0; k < rValues.getLength(); k++) { pSetNames[k] = pProperties[k].Name.copy( bEmptyNode ? 1 : 0); @@ -1032,16 +1032,16 @@ sal_Bool ConfigItem::ReplaceSetProperties( catch (const Exception&) { #endif - bRet = sal_False; + bRet = false; } } return bRet; } -sal_Bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode) +bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode) { ValueCounter_Impl aCounter(m_nInValueChange); - sal_Bool bRet = sal_True; + bool bRet = true; Reference<XHierarchicalNameAccess> xHierarchyAccess = GetTree(); if(xHierarchyAccess.is()) { @@ -1057,7 +1057,7 @@ sal_Bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode) else xCont = Reference<XNameContainer> (xHierarchyAccess, UNO_QUERY); if(!xCont.is()) - return sal_False; + return false; Reference<XSingleServiceFactory> xFac(xCont, UNO_QUERY); @@ -1095,7 +1095,7 @@ sal_Bool ConfigItem::AddNode(const OUString& rNode, const OUString& rNewNode) catch (const Exception&) { #endif - bRet = sal_False; + bRet = false; } } return bRet; diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx index 2f6550a66e2e..ac1966491dae 100644 --- a/unotools/source/config/confignode.cxx +++ b/unotools/source/config/confignode.cxx @@ -54,7 +54,7 @@ namespace utl //======================================================================== //------------------------------------------------------------------------ OConfigurationNode::OConfigurationNode(const Reference< XInterface >& _rxNode ) - :m_bEscapeNames(sal_False) + :m_bEscapeNames(false) { OSL_ENSURE(_rxNode.is(), "OConfigurationNode::OConfigurationNode: invalid node interface!"); if (_rxNode.is()) @@ -208,7 +208,7 @@ namespace utl } //------------------------------------------------------------------------ - sal_Bool OConfigurationNode::removeNode(const OUString& _rName) const throw() + bool OConfigurationNode::removeNode(const OUString& _rName) const throw() { OSL_ENSURE(m_xContainerAccess.is(), "OConfigurationNode::removeNode: object is invalid!"); if (m_xContainerAccess.is()) @@ -217,7 +217,7 @@ namespace utl { OUString sName = normalizeName(_rName, NO_CALLER); m_xContainerAccess->removeByName(sName); - return sal_True; + return true; } catch (NoSuchElementException&) { @@ -238,7 +238,7 @@ namespace utl OSL_FAIL("OConfigurationNode::removeNode: caught a generic exception!"); } } - return sal_False; + return false; } //------------------------------------------------------------------------ OConfigurationNode OConfigurationNode::insertNode(const OUString& _rName,const Reference< XInterface >& _xNode) const throw() @@ -329,15 +329,15 @@ namespace utl } //------------------------------------------------------------------------ - void OConfigurationNode::setEscape(sal_Bool _bEnable) + void OConfigurationNode::setEscape(bool _bEnable) { m_bEscapeNames = _bEnable && Reference< XStringEscape >::query(m_xDirectAccess).is(); } //------------------------------------------------------------------------ - sal_Bool OConfigurationNode::isSetNode() const + bool OConfigurationNode::isSetNode() const { - sal_Bool bIsSet = sal_False; + bool bIsSet = false; Reference< XServiceInfo > xSI(m_xHierarchyAccess, UNO_QUERY); if (xSI.is()) { @@ -347,7 +347,7 @@ namespace utl return bIsSet; } - sal_Bool OConfigurationNode::hasByHierarchicalName( const OUString& _rName ) const throw() + bool OConfigurationNode::hasByHierarchicalName( const OUString& _rName ) const throw() { OSL_ENSURE( m_xHierarchyAccess.is(), "OConfigurationNode::hasByHierarchicalName: no hierarchy access!" ); try @@ -361,11 +361,11 @@ namespace utl catch(Exception&) { } - return sal_False; + return false; } //------------------------------------------------------------------------ - sal_Bool OConfigurationNode::hasByName(const OUString& _rName) const throw() + bool OConfigurationNode::hasByName(const OUString& _rName) const throw() { OSL_ENSURE(m_xDirectAccess.is(), "OConfigurationNode::hasByName: object is invalid!"); try @@ -377,13 +377,13 @@ namespace utl catch(Exception&) { } - return sal_False; + return false; } //------------------------------------------------------------------------ - sal_Bool OConfigurationNode::setNodeValue(const OUString& _rPath, const Any& _rValue) const throw() + bool OConfigurationNode::setNodeValue(const OUString& _rPath, const Any& _rValue) const throw() { - sal_Bool bResult = false; + bool bResult = false; OSL_ENSURE(m_xReplaceAccess.is(), "OConfigurationNode::setNodeValue: object is invalid!"); if (m_xReplaceAccess.is()) @@ -553,29 +553,29 @@ namespace utl } //------------------------------------------------------------------------ - sal_Bool OConfigurationTreeRoot::commit() const throw() + bool OConfigurationTreeRoot::commit() const throw() { OSL_ENSURE(isValid(), "OConfigurationTreeRoot::commit: object is invalid!"); if (!isValid()) - return sal_False; + return false; OSL_ENSURE(m_xCommitter.is(), "OConfigurationTreeRoot::commit: I'm a readonly node!"); if (!m_xCommitter.is()) - return sal_False; + return false; try { m_xCommitter->commitChanges(); - return sal_True; + return true; } catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } - return sal_False; + return false; } //------------------------------------------------------------------------ - OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite) + OConfigurationTreeRoot OConfigurationTreeRoot::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, bool _bLazyWrite) { Reference< XInterface > xRoot( lcl_createConfigurationRoot( _rxConfProvider, _rPath, _eMode != CM_READONLY, _nDepth, _bLazyWrite ) ); @@ -585,14 +585,14 @@ namespace utl } //------------------------------------------------------------------------ - OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, sal_Bool _bLazyWrite ) + OConfigurationTreeRoot OConfigurationTreeRoot::createWithComponentContext( const Reference< XComponentContext >& _rxContext, const OUString& _rPath, sal_Int32 _nDepth, CREATION_MODE _eMode, bool _bLazyWrite ) { return createWithProvider( lcl_getConfigProvider( _rxContext ), _rPath, _nDepth, _eMode, _bLazyWrite ); } //------------------------------------------------------------------------ OConfigurationTreeRoot OConfigurationTreeRoot::tryCreateWithComponentContext( const Reference< XComponentContext >& rxContext, - const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , sal_Bool _bLazyWrite ) + const OUString& _rPath, sal_Int32 _nDepth , CREATION_MODE _eMode , bool _bLazyWrite ) { OSL_ENSURE( rxContext.is(), "OConfigurationTreeRoot::tryCreateWithComponentContext: invalid XComponentContext!" ); try diff --git a/unotools/source/config/configpaths.cxx b/unotools/source/config/configpaths.cxx index 5dabd7f57e44..ff6875fc281f 100644 --- a/unotools/source/config/configpaths.cxx +++ b/unotools/source/config/configpaths.cxx @@ -74,7 +74,7 @@ void lcl_resolveCharEntities(OUString & aLocalString) } //---------------------------------------------------------------------------- -sal_Bool splitLastFromConfigurationPath(OUString const& _sInPath, +bool splitLastFromConfigurationPath(OUString const& _sInPath, OUString& _rsOutPath, OUString& _rsLocalName) { @@ -196,7 +196,7 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref OSL_ENSURE(nPrefixLength == 0 || _sPrefixPath[nPrefixLength-1] != '/', "Cannot handle slash-terminated prefix paths"); - sal_Bool bIsPrefix; + bool bIsPrefix; if (_sNestedPath.getLength() > nPrefixLength) { bIsPrefix = _sNestedPath[nPrefixLength] == '/' && @@ -216,7 +216,7 @@ sal_Int32 lcl_findPrefixEnd(OUString const& _sNestedPath, OUString const& _sPref } //---------------------------------------------------------------------------- -sal_Bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, +bool isPrefixOfConfigurationPath(OUString const& _sNestedPath, OUString const& _sPrefixPath) { return _sPrefixPath.isEmpty() || lcl_findPrefixEnd(_sNestedPath,_sPrefixPath) != 0; diff --git a/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx index 53bc30b035d5..d03646a5d05a 100644 --- a/unotools/source/config/configvaluecontainer.cxx +++ b/unotools/source/config/configvaluecontainer.cxx @@ -108,7 +108,7 @@ namespace utl if ( _rData.hasValue() ) { #ifdef DBG_UTIL - sal_Bool bSuccess = + bool bSuccess = #endif // assign the value uno_type_assignData( @@ -297,7 +297,7 @@ namespace utl ); } - void OConfigurationValueContainer::write( sal_Bool _bCommit ) + void OConfigurationValueContainer::write( bool _bCommit ) { // collect the current values in the exchange locations std::for_each( @@ -308,14 +308,14 @@ namespace utl // commit the changes done (if requested) if ( _bCommit ) - commit( sal_False ); + commit( false ); } - void OConfigurationValueContainer::commit( sal_Bool _bWrite ) + void OConfigurationValueContainer::commit( bool _bWrite ) { // write the current values in the exchange locations (if requested) if ( _bWrite ) - write( sal_False ); + write( false ); // commit the changes done m_pImpl->aConfigRoot.commit( ); diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index c01af9312787..b161d66b79bb 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -117,7 +117,7 @@ GlobalEventConfig_Impl::GlobalEventConfig_Impl() // We need it to get information about changes outside these class on our used configuration keys! */ Sequence< OUString > aNotifySeq( 1 ); aNotifySeq[0] = "Events"; - EnableNotification( aNotifySeq, sal_True ); + EnableNotification( aNotifySeq, true ); } //***************************************************************************************************************** @@ -284,18 +284,18 @@ Sequence< OUString > SAL_CALL GlobalEventConfig_Impl::getElementNames( ) throw return uno::Sequence< OUString >(pRet, m_supportedEvents.size()); } -sal_Bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (RuntimeException) +bool SAL_CALL GlobalEventConfig_Impl::hasByName( const OUString& aName ) throw (RuntimeException) { if ( m_eventBindingHash.find( aName ) != m_eventBindingHash.end() ) - return sal_True; + return true; // never accessed before - is it supported in general? SupportedEventsVector::const_iterator pos = ::std::find( m_supportedEvents.begin(), m_supportedEvents.end(), aName ); if ( pos != m_supportedEvents.end() ) - return sal_True; + return true; - return sal_False; + return false; } Type SAL_CALL GlobalEventConfig_Impl::getElementType( ) throw (RuntimeException) @@ -304,7 +304,7 @@ Type SAL_CALL GlobalEventConfig_Impl::getElementType( ) throw (RuntimeException return ::getCppuType((const Sequence<beans::PropertyValue>*)0); } -sal_Bool SAL_CALL GlobalEventConfig_Impl::hasElements( ) throw (RuntimeException) +bool SAL_CALL GlobalEventConfig_Impl::hasElements( ) throw (RuntimeException) { return ( m_eventBindingHash.empty() ); } diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index b6d02d37ee5e..acdf7adad215 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -132,7 +132,7 @@ class SvtExtendedSecurityOptions_Impl : public ConfigItem OUString m_aExtensionPropName; SvtExtendedSecurityOptions::OpenHyperlinkMode m_eOpenHyperlinkMode; - sal_Bool m_bROOpenHyperlinkMode; + bool m_bROOpenHyperlinkMode; ExtensionHashMap m_aExtensionHashMap; }; @@ -145,7 +145,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() , m_aSecureExtensionsSetName( SECURE_EXTENSIONS_SET ) , m_aExtensionPropName( EXTENSION_PROPNAME ) , m_eOpenHyperlinkMode(SvtExtendedSecurityOptions::OPEN_NEVER) - , m_bROOpenHyperlinkMode(sal_False) + , m_bROOpenHyperlinkMode(false) // Init member then. { // Fill the extension hash map with all secure extension strings diff --git a/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx index 09829dbcb911..cc05e1041c5a 100644 --- a/unotools/source/config/fltrcfg.cxx +++ b/unotools/source/config/fltrcfg.cxx @@ -52,27 +52,27 @@ using namespace com::sun::star::uno; class SvtAppFilterOptions_Impl : public utl::ConfigItem { - sal_Bool bLoadVBA; - sal_Bool bSaveVBA; + bool bLoadVBA; + bool bSaveVBA; public: SvtAppFilterOptions_Impl(const OUString& rRoot) : utl::ConfigItem(rRoot), - bLoadVBA(sal_False), - bSaveVBA(sal_False) {} + bLoadVBA(false), + bSaveVBA(false) {} ~SvtAppFilterOptions_Impl(); virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); void Load(); - sal_Bool IsLoad() const {return bLoadVBA;} - void SetLoad(sal_Bool bSet) + bool IsLoad() const {return bLoadVBA;} + void SetLoad(bool bSet) { if(bSet != bLoadVBA) SetModified(); bLoadVBA = bSet; } - sal_Bool IsSave() const {return bSaveVBA;} - void SetSave(sal_Bool bSet) + bool IsSave() const {return bSaveVBA;} + void SetSave(bool bSet) { if(bSet != bSaveVBA) SetModified(); @@ -126,17 +126,17 @@ void SvtAppFilterOptions_Impl::Load() // ----------------------------------------------------------------------- class SvtWriterFilterOptions_Impl : public SvtAppFilterOptions_Impl { - sal_Bool bLoadExecutable; + bool bLoadExecutable; public: SvtWriterFilterOptions_Impl(const OUString& rRoot) : SvtAppFilterOptions_Impl(rRoot), - bLoadExecutable(sal_False) + bLoadExecutable(false) {} virtual void Commit(); void Load(); - sal_Bool IsLoadExecutable() const {return bLoadExecutable;} - void SetLoadExecutable(sal_Bool bSet) + bool IsLoadExecutable() const {return bLoadExecutable;} + void SetLoadExecutable(bool bSet) { if(bSet != bLoadExecutable) SetModified(); @@ -172,17 +172,17 @@ void SvtWriterFilterOptions_Impl::Load() // ----------------------------------------------------------------------- class SvtCalcFilterOptions_Impl : public SvtAppFilterOptions_Impl { - sal_Bool bLoadExecutable; + bool bLoadExecutable; public: SvtCalcFilterOptions_Impl(const OUString& rRoot) : SvtAppFilterOptions_Impl(rRoot), - bLoadExecutable(sal_False) + bLoadExecutable(false) {} virtual void Commit(); void Load(); - sal_Bool IsLoadExecutable() const {return bLoadExecutable;} - void SetLoadExecutable(sal_Bool bSet) + bool IsLoadExecutable() const {return bLoadExecutable;} + void SetLoadExecutable(bool bSet) { if(bSet != bLoadExecutable) SetModified(); @@ -246,8 +246,8 @@ struct SvtFilterOptions_Impl Load(); } - void SetFlag( sal_uLong nFlag, sal_Bool bSet ); - sal_Bool IsFlag( sal_uLong nFlag ) const; + void SetFlag( sal_uLong nFlag, bool bSet ); + bool IsFlag( sal_uLong nFlag ) const; void Load() { aWriterCfg.Load(); @@ -256,7 +256,7 @@ struct SvtFilterOptions_Impl } }; -void SvtFilterOptions_Impl::SetFlag( sal_uLong nFlag, sal_Bool bSet ) +void SvtFilterOptions_Impl::SetFlag( sal_uLong nFlag, bool bSet ) { switch(nFlag) { @@ -276,9 +276,9 @@ void SvtFilterOptions_Impl::SetFlag( sal_uLong nFlag, sal_Bool bSet ) } } -sal_Bool SvtFilterOptions_Impl::IsFlag( sal_uLong nFlag ) const +bool SvtFilterOptions_Impl::IsFlag( sal_uLong nFlag ) const { - sal_Bool bRet; + bool bRet; switch(nFlag) { case FILTERCFG_WORD_CODE : bRet = aWriterCfg.IsLoad();break; @@ -400,7 +400,7 @@ void SvtFilterOptions::Load() { if(pValues[nProp].hasValue()) { - sal_Bool bVal = *(sal_Bool*)pValues[nProp].getValue(); + bool bVal = *(sal_Bool*)pValues[nProp].getValue(); sal_uLong nFlag = lcl_GetFlag(nProp); pImp->SetFlag( nFlag, bVal); } @@ -409,117 +409,117 @@ void SvtFilterOptions::Load() } // ----------------------------------------------------------------------- -void SvtFilterOptions::SetLoadWordBasicCode( sal_Bool bFlag ) +void SvtFilterOptions::SetLoadWordBasicCode( bool bFlag ) { pImp->SetFlag( FILTERCFG_WORD_CODE, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsLoadWordBasicCode() const +bool SvtFilterOptions::IsLoadWordBasicCode() const { return pImp->IsFlag( FILTERCFG_WORD_CODE ); } -void SvtFilterOptions::SetLoadWordBasicExecutable( sal_Bool bFlag ) +void SvtFilterOptions::SetLoadWordBasicExecutable( bool bFlag ) { pImp->SetFlag( FILTERCFG_WORD_WBCTBL, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsLoadWordBasicExecutable() const +bool SvtFilterOptions::IsLoadWordBasicExecutable() const { return pImp->IsFlag( FILTERCFG_WORD_WBCTBL ); } -void SvtFilterOptions::SetLoadWordBasicStorage( sal_Bool bFlag ) +void SvtFilterOptions::SetLoadWordBasicStorage( bool bFlag ) { pImp->SetFlag( FILTERCFG_WORD_STORAGE, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsLoadWordBasicStorage() const +bool SvtFilterOptions::IsLoadWordBasicStorage() const { return pImp->IsFlag( FILTERCFG_WORD_STORAGE ); } // ----------------------------------------------------------------------- -void SvtFilterOptions::SetLoadExcelBasicCode( sal_Bool bFlag ) +void SvtFilterOptions::SetLoadExcelBasicCode( bool bFlag ) { pImp->SetFlag( FILTERCFG_EXCEL_CODE, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsLoadExcelBasicCode() const +bool SvtFilterOptions::IsLoadExcelBasicCode() const { return pImp->IsFlag( FILTERCFG_EXCEL_CODE ); } -void SvtFilterOptions::SetLoadExcelBasicExecutable( sal_Bool bFlag ) +void SvtFilterOptions::SetLoadExcelBasicExecutable( bool bFlag ) { pImp->SetFlag( FILTERCFG_EXCEL_EXECTBL, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsLoadExcelBasicExecutable() const +bool SvtFilterOptions::IsLoadExcelBasicExecutable() const { return pImp->IsFlag( FILTERCFG_EXCEL_EXECTBL ); } -void SvtFilterOptions::SetLoadExcelBasicStorage( sal_Bool bFlag ) +void SvtFilterOptions::SetLoadExcelBasicStorage( bool bFlag ) { pImp->SetFlag( FILTERCFG_EXCEL_STORAGE, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsLoadExcelBasicStorage() const +bool SvtFilterOptions::IsLoadExcelBasicStorage() const { return pImp->IsFlag( FILTERCFG_EXCEL_STORAGE ); } // ----------------------------------------------------------------------- -void SvtFilterOptions::SetLoadPPointBasicCode( sal_Bool bFlag ) +void SvtFilterOptions::SetLoadPPointBasicCode( bool bFlag ) { pImp->SetFlag( FILTERCFG_PPOINT_CODE, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsLoadPPointBasicCode() const +bool SvtFilterOptions::IsLoadPPointBasicCode() const { return pImp->IsFlag( FILTERCFG_PPOINT_CODE ); } -void SvtFilterOptions::SetLoadPPointBasicStorage( sal_Bool bFlag ) +void SvtFilterOptions::SetLoadPPointBasicStorage( bool bFlag ) { pImp->SetFlag( FILTERCFG_PPOINT_STORAGE, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsLoadPPointBasicStorage() const +bool SvtFilterOptions::IsLoadPPointBasicStorage() const { return pImp->IsFlag( FILTERCFG_PPOINT_STORAGE ); } // ----------------------------------------------------------------------- -sal_Bool SvtFilterOptions::IsMathType2Math() const +bool SvtFilterOptions::IsMathType2Math() const { return pImp->IsFlag( FILTERCFG_MATH_LOAD ); } -void SvtFilterOptions::SetMathType2Math( sal_Bool bFlag ) +void SvtFilterOptions::SetMathType2Math( bool bFlag ) { pImp->SetFlag( FILTERCFG_MATH_LOAD, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsMath2MathType() const +bool SvtFilterOptions::IsMath2MathType() const { return pImp->IsFlag( FILTERCFG_MATH_SAVE ); } -void SvtFilterOptions::SetMath2MathType( sal_Bool bFlag ) +void SvtFilterOptions::SetMath2MathType( bool bFlag ) { pImp->SetFlag( FILTERCFG_MATH_SAVE, bFlag ); SetModified(); @@ -527,51 +527,51 @@ void SvtFilterOptions::SetMath2MathType( sal_Bool bFlag ) // ----------------------------------------------------------------------- -sal_Bool SvtFilterOptions::IsWinWord2Writer() const +bool SvtFilterOptions::IsWinWord2Writer() const { return pImp->IsFlag( FILTERCFG_WRITER_LOAD ); } -void SvtFilterOptions::SetWinWord2Writer( sal_Bool bFlag ) +void SvtFilterOptions::SetWinWord2Writer( bool bFlag ) { pImp->SetFlag( FILTERCFG_WRITER_LOAD, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsWriter2WinWord() const +bool SvtFilterOptions::IsWriter2WinWord() const { return pImp->IsFlag( FILTERCFG_WRITER_SAVE ); } -void SvtFilterOptions::SetWriter2WinWord( sal_Bool bFlag ) +void SvtFilterOptions::SetWriter2WinWord( bool bFlag ) { pImp->SetFlag( FILTERCFG_WRITER_SAVE, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsUseEnhancedFields() const +bool SvtFilterOptions::IsUseEnhancedFields() const { return pImp->IsFlag( FILTERCFG_USE_ENHANCED_FIELDS ); } // ----------------------------------------------------------------------- -sal_Bool SvtFilterOptions::IsExcel2Calc() const +bool SvtFilterOptions::IsExcel2Calc() const { return pImp->IsFlag( FILTERCFG_CALC_LOAD ); } -void SvtFilterOptions::SetExcel2Calc( sal_Bool bFlag ) +void SvtFilterOptions::SetExcel2Calc( bool bFlag ) { pImp->SetFlag( FILTERCFG_CALC_LOAD, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsCalc2Excel() const +bool SvtFilterOptions::IsCalc2Excel() const { return pImp->IsFlag( FILTERCFG_CALC_SAVE ); } -void SvtFilterOptions::SetCalc2Excel( sal_Bool bFlag ) +void SvtFilterOptions::SetCalc2Excel( bool bFlag ) { pImp->SetFlag( FILTERCFG_CALC_SAVE, bFlag ); SetModified(); @@ -579,23 +579,23 @@ void SvtFilterOptions::SetCalc2Excel( sal_Bool bFlag ) // ----------------------------------------------------------------------- -sal_Bool SvtFilterOptions::IsPowerPoint2Impress() const +bool SvtFilterOptions::IsPowerPoint2Impress() const { return pImp->IsFlag( FILTERCFG_IMPRESS_LOAD ); } -void SvtFilterOptions::SetPowerPoint2Impress( sal_Bool bFlag ) +void SvtFilterOptions::SetPowerPoint2Impress( bool bFlag ) { pImp->SetFlag( FILTERCFG_IMPRESS_LOAD, bFlag ); SetModified(); } -sal_Bool SvtFilterOptions::IsImpress2PowerPoint() const +bool SvtFilterOptions::IsImpress2PowerPoint() const { return pImp->IsFlag( FILTERCFG_IMPRESS_SAVE ); } -void SvtFilterOptions::SetImpress2PowerPoint( sal_Bool bFlag ) +void SvtFilterOptions::SetImpress2PowerPoint( bool bFlag ) { pImp->SetFlag( FILTERCFG_IMPRESS_SAVE, bFlag ); SetModified(); @@ -603,12 +603,12 @@ void SvtFilterOptions::SetImpress2PowerPoint( sal_Bool bFlag ) // ----------------------------------------------------------------------- -sal_Bool SvtFilterOptions::IsSmartArt2Shape() const +bool SvtFilterOptions::IsSmartArt2Shape() const { return pImp->IsFlag( FILTERCFG_SMARTART_SHAPE_LOAD ); } -void SvtFilterOptions::SetSmartArt2Shape( sal_Bool bFlag ) +void SvtFilterOptions::SetSmartArt2Shape( bool bFlag ) { pImp->SetFlag( FILTERCFG_SMARTART_SHAPE_LOAD, bFlag ); SetModified(); @@ -629,19 +629,19 @@ SvtFilterOptions& SvtFilterOptions::Get() // ----------------------------------------------------------------------- -sal_Bool SvtFilterOptions::IsEnablePPTPreview() const +bool SvtFilterOptions::IsEnablePPTPreview() const { return pImp->IsFlag( FILTERCFG_ENABLE_PPT_PREVIEW ); } -sal_Bool SvtFilterOptions::IsEnableCalcPreview() const +bool SvtFilterOptions::IsEnableCalcPreview() const { return pImp->IsFlag( FILTERCFG_ENABLE_EXCEL_PREVIEW ); } -sal_Bool SvtFilterOptions::IsEnableWordPreview() const +bool SvtFilterOptions::IsEnableWordPreview() const { return pImp->IsFlag( FILTERCFG_ENABLE_WORD_PREVIEW ); } diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index 89b8bbb5d5a7..c249f67a790e 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -96,11 +96,11 @@ class SvtFontOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - sal_Bool IsFontHistoryEnabled ( ) const ; - void EnableFontHistory ( sal_Bool bState ) ; + bool IsFontHistoryEnabled ( ) const ; + void EnableFontHistory ( bool bState ) ; - sal_Bool IsFontWYSIWYGEnabled ( ) const ; - void EnableFontWYSIWYG ( sal_Bool bState ) ; + bool IsFontWYSIWYGEnabled ( ) const ; + void EnableFontWYSIWYG ( bool bState ) ; private: @@ -121,9 +121,9 @@ class SvtFontOptions_Impl : public ConfigItem private: - sal_Bool m_bReplacementTable ; - sal_Bool m_bFontHistory ; - sal_Bool m_bFontWYSIWYG ; + bool m_bReplacementTable ; + bool m_bFontHistory ; + bool m_bFontWYSIWYG ; }; //***************************************************************************************************************** @@ -133,9 +133,9 @@ SvtFontOptions_Impl::SvtFontOptions_Impl() // Init baseclasses first : ConfigItem ( ROOTNODE_FONT ) // Init member then. - , m_bReplacementTable ( sal_False ) - , m_bFontHistory ( sal_False ) - , m_bFontWYSIWYG ( sal_False ) + , m_bReplacementTable ( false ) + , m_bFontHistory ( false ) + , m_bFontWYSIWYG ( false ) { // Use our static list of configuration keys to get his values. Sequence< OUString > seqNames = impl_GetPropertyNames ( ); @@ -261,7 +261,7 @@ void SvtFontOptions_Impl::Commit() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtFontOptions_Impl::IsFontHistoryEnabled() const +bool SvtFontOptions_Impl::IsFontHistoryEnabled() const { return m_bFontHistory; } @@ -269,7 +269,7 @@ sal_Bool SvtFontOptions_Impl::IsFontHistoryEnabled() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtFontOptions_Impl::EnableFontHistory( sal_Bool bState ) +void SvtFontOptions_Impl::EnableFontHistory( bool bState ) { m_bFontHistory = bState; SetModified(); @@ -278,7 +278,7 @@ void SvtFontOptions_Impl::EnableFontHistory( sal_Bool bState ) //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const +bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const { return m_bFontWYSIWYG; } @@ -286,7 +286,7 @@ sal_Bool SvtFontOptions_Impl::IsFontWYSIWYGEnabled() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtFontOptions_Impl::EnableFontWYSIWYG( sal_Bool bState ) +void SvtFontOptions_Impl::EnableFontWYSIWYG( bool bState ) { m_bFontWYSIWYG = bState; SetModified(); @@ -357,7 +357,7 @@ SvtFontOptions::~SvtFontOptions() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtFontOptions::IsFontHistoryEnabled() const +bool SvtFontOptions::IsFontHistoryEnabled() const { MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsFontHistoryEnabled(); @@ -366,7 +366,7 @@ sal_Bool SvtFontOptions::IsFontHistoryEnabled() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtFontOptions::EnableFontHistory( sal_Bool bState ) +void SvtFontOptions::EnableFontHistory( bool bState ) { MutexGuard aGuard( impl_GetOwnStaticMutex() ); m_pDataContainer->EnableFontHistory( bState ); @@ -375,7 +375,7 @@ void SvtFontOptions::EnableFontHistory( sal_Bool bState ) //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtFontOptions::IsFontWYSIWYGEnabled() const +bool SvtFontOptions::IsFontWYSIWYGEnabled() const { MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsFontWYSIWYGEnabled(); @@ -384,7 +384,7 @@ sal_Bool SvtFontOptions::IsFontWYSIWYGEnabled() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtFontOptions::EnableFontWYSIWYG( sal_Bool bState ) +void SvtFontOptions::EnableFontWYSIWYG( bool bState ) { MutexGuard aGuard( impl_GetOwnStaticMutex() ); m_pDataContainer->EnableFontWYSIWYG( bState ); diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx index 8abbb38e84e4..cc9e4dd97ab3 100644 --- a/unotools/source/config/itemholder1.cxx +++ b/unotools/source/config/itemholder1.cxx @@ -64,10 +64,10 @@ ItemHolder1::ItemHolder1() #ifdef DBG_UTIL catch(const css::uno::Exception& rEx) { - static sal_Bool bMessage = sal_True; + static bool bMessage = true; if(bMessage) { - bMessage = sal_False; + bMessage = false; OString sMsg("CreateInstance with arguments exception: "); sMsg += OString(rEx.Message.getStr(), rEx.Message.getLength(), diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 10b9c799f895..353d4cbc984f 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -52,9 +52,9 @@ namespace public rtl::Static< osl::Mutex, theSvtLinguConfigItemMutex > {}; } -static sal_Bool lcl_SetLocale( sal_Int16 &rLanguage, const uno::Any &rVal ) +static bool lcl_SetLocale( sal_Int16 &rLanguage, const uno::Any &rVal ) { - sal_Bool bSucc = sal_False; + bool bSucc = false; lang::Locale aNew; if (rVal >>= aNew) // conversion successful? @@ -63,7 +63,7 @@ static sal_Bool lcl_SetLocale( sal_Int16 &rLanguage, const uno::Any &rVal ) if (nNew != rLanguage) { rLanguage = nNew; - bSucc = sal_True; + bSucc = true; } } return bSucc; @@ -92,34 +92,34 @@ SvtLinguOptions::SvtLinguOptions() // general options bIsUseDictionaryList = - bIsIgnoreControlCharacters = sal_True; + bIsIgnoreControlCharacters = true; // spelling options bIsSpellCapitalization = - bIsSpellSpecial = sal_True; + bIsSpellSpecial = true; bIsSpellAuto = bIsSpellReverse = bIsSpellWithDigits = - bIsSpellUpperCase = sal_False; + bIsSpellUpperCase = false; // text conversion options - bIsIgnorePostPositionalWord = sal_True; + bIsIgnorePostPositionalWord = true; bIsAutoCloseDialog = bIsShowEntriesRecentlyUsedFirst = - bIsAutoReplaceUniqueEntries = sal_False; - bIsDirectionToSimplified = sal_True; + bIsAutoReplaceUniqueEntries = false; + bIsDirectionToSimplified = true; bIsUseCharacterVariants = bIsTranslateCommonTerms = - bIsReverseMapping = sal_False; + bIsReverseMapping = false; bROIsDirectionToSimplified = bROIsUseCharacterVariants = bROIsTranslateCommonTerms = - bROIsReverseMapping = sal_False; + bROIsReverseMapping = false; // hyphenation options - bIsHyphSpecial = sal_True; - bIsHyphAuto = sal_False; + bIsHyphSpecial = true; + bIsHyphAuto = false; nHyphMinLeading = nHyphMinTrailing = 2; nHyphMinWordLength = 0; @@ -127,8 +127,8 @@ SvtLinguOptions::SvtLinguOptions() nDataFilesChangedCheckValue = 0; //grammar options - bIsGrammarAuto = sal_False, - bIsGrammarInteractive = sal_False; + bIsGrammarAuto = false, + bIsGrammarInteractive = false; } @@ -140,10 +140,10 @@ class SvtLinguConfigItem : public utl::ConfigItem SvtLinguConfigItem( const SvtLinguConfigItem & ); SvtLinguConfigItem & operator = ( const SvtLinguConfigItem & ); - static sal_Bool GetHdlByName( sal_Int32 &rnHdl, const OUString &rPropertyName, sal_Bool bFullPropName = sal_False ); + static bool GetHdlByName( sal_Int32 &rnHdl, const OUString &rPropertyName, bool bFullPropName = false ); static const uno::Sequence< OUString > GetPropertyNames(); - sal_Bool LoadOptions( const uno::Sequence< OUString > &rProperyNames ); - sal_Bool SaveOptions( const uno::Sequence< OUString > &rProperyNames ); + bool LoadOptions( const uno::Sequence< OUString > &rProperyNames ); + bool SaveOptions( const uno::Sequence< OUString > &rProperyNames ); public: SvtLinguConfigItem(); @@ -167,15 +167,15 @@ public: com::sun::star::uno::Any GetProperty( sal_Int32 nPropertyHandle ) const; - sal_Bool SetProperty( const OUString &rPropertyName, + bool SetProperty( const OUString &rPropertyName, const com::sun::star::uno::Any &rValue ); - sal_Bool SetProperty( sal_Int32 nPropertyHandle, + bool SetProperty( sal_Int32 nPropertyHandle, const com::sun::star::uno::Any &rValue ); const SvtLinguOptions& GetOptions() const; - sal_Bool IsReadOnly( const OUString &rPropertyName ) const; - sal_Bool IsReadOnly( sal_Int32 nPropertyHandle ) const; + bool IsReadOnly( const OUString &rPropertyName ) const; + bool IsReadOnly( sal_Int32 nPropertyHandle ) const; }; @@ -279,10 +279,10 @@ const uno::Sequence< OUString > SvtLinguConfigItem::GetPropertyNames() return aNames; } -sal_Bool SvtLinguConfigItem::GetHdlByName( +bool SvtLinguConfigItem::GetHdlByName( sal_Int32 &rnHdl, const OUString &rPropertyName, - sal_Bool bFullPropName ) + bool bFullPropName ) { NamesToHdl *pEntry = &aNamesToHdl[0]; @@ -331,7 +331,7 @@ uno::Any SvtLinguConfigItem::GetProperty( sal_Int32 nPropertyHandle ) const uno::Any aRes; const sal_Int16 *pnVal = 0; - const sal_Bool *pbVal = 0; + const bool *pbVal = 0; const sal_Int32 *pnInt32Val = 0; const SvtLinguOptions &rOpt = const_cast< SvtLinguConfigItem * >(this)->aOpt; @@ -407,11 +407,11 @@ uno::Any SvtLinguConfigItem::GetProperty( sal_Int32 nPropertyHandle ) const } -sal_Bool SvtLinguConfigItem::SetProperty( const OUString &rPropertyName, const uno::Any &rValue ) +bool SvtLinguConfigItem::SetProperty( const OUString &rPropertyName, const uno::Any &rValue ) { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); - sal_Bool bSucc = sal_False; + bool bSucc = false; sal_Int32 nHdl; if (GetHdlByName( nHdl, rPropertyName )) bSucc = SetProperty( nHdl, rValue ); @@ -419,18 +419,18 @@ sal_Bool SvtLinguConfigItem::SetProperty( const OUString &rPropertyName, const u } -sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue ) +bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue ) { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); - sal_Bool bSucc = sal_False; + bool bSucc = false; if (!rValue.hasValue()) return bSucc; - sal_Bool bMod = sal_False; + bool bMod = false; sal_Int16 *pnVal = 0; - sal_Bool *pbVal = 0; + bool *pbVal = 0; sal_Int32 *pnInt32Val = 0; SvtLinguOptions &rOpt = aOpt; @@ -453,13 +453,13 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno:: case UPH_ACTIVE_DICTIONARIES : { rValue >>= rOpt.aActiveDics; - bMod = sal_True; + bMod = true; break; } case UPH_ACTIVE_CONVERSION_DICTIONARIES : { rValue >>= rOpt.aActiveConvDics; - bMod = sal_True; + bMod = true; break; } case UPH_DEFAULT_LOCALE : @@ -499,15 +499,15 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno:: if (pbVal) { - sal_Bool bNew = sal_Bool(); + bool bNew = bool(); if (rValue >>= bNew) { if (bNew != *pbVal) { *pbVal = bNew; - bMod = sal_True; + bMod = true; } - bSucc = sal_True; + bSucc = true; } } else if (pnVal) @@ -518,9 +518,9 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno:: if (nNew != *pnVal) { *pnVal = nNew; - bMod = sal_True; + bMod = true; } - bSucc = sal_True; + bSucc = true; } } else if (pnInt32Val) @@ -531,9 +531,9 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno:: if (nNew != *pnInt32Val) { *pnInt32Val = nNew; - bMod = sal_True; + bMod = true; } - bSucc = sal_True; + bSucc = true; } } @@ -550,11 +550,11 @@ const SvtLinguOptions& SvtLinguConfigItem::GetOptions() const return aOpt; } -sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyNames ) +bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProperyNames ) { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); - sal_Bool bRes = sal_False; + bool bRes = false; const OUString *pProperyNames = rProperyNames.getConstArray(); sal_Int32 nProps = rProperyNames.getLength(); @@ -572,7 +572,7 @@ sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProp { const uno::Any &rVal = pValue[i]; sal_Int32 nPropertyHandle; - GetHdlByName( nPropertyHandle, pProperyNames[i], sal_True ); + GetHdlByName( nPropertyHandle, pProperyNames[i], true ); switch ( nPropertyHandle ) { case UPH_DEFAULT_LOCALE : @@ -630,11 +630,11 @@ sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProp //default is locale dependent: if (MsLangId::isTraditionalChinese(rOpt.nDefaultLanguage_CJK)) { - rOpt.bIsDirectionToSimplified = sal_False; + rOpt.bIsDirectionToSimplified = false; } else { - rOpt.bIsDirectionToSimplified = sal_True; + rOpt.bIsDirectionToSimplified = true; } } } break; @@ -660,7 +660,7 @@ sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProp } } - bRes = sal_True; + bRes = true; } DBG_ASSERT( bRes, "LoadOptions failed" ); @@ -668,14 +668,14 @@ sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProp } -sal_Bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyNames ) +bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProperyNames ) { if (!IsModified()) - return sal_True; + return true; osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); - sal_Bool bRet = sal_False; + bool bRet = false; const uno::Type &rBOOL = ::getBooleanCppuType(); const uno::Type &rINT16 = ::getCppuType( (sal_Int16 *) NULL ); const uno::Type &rINT32 = ::getCppuType( (sal_Int32 *) NULL ); @@ -736,22 +736,22 @@ sal_Bool SvtLinguConfigItem::SaveOptions( const uno::Sequence< OUString > &rProp return bRet; } -sal_Bool SvtLinguConfigItem::IsReadOnly( const OUString &rPropertyName ) const +bool SvtLinguConfigItem::IsReadOnly( const OUString &rPropertyName ) const { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; sal_Int32 nHdl; if (GetHdlByName( nHdl, rPropertyName )) bReadOnly = IsReadOnly( nHdl ); return bReadOnly; } -sal_Bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const +bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const { osl::MutexGuard aGuard(theSvtLinguConfigItemMutex::get()); - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; const SvtLinguOptions &rOpt = const_cast< SvtLinguConfigItem * >(this)->aOpt; switch(nPropertyHandle) @@ -848,7 +848,7 @@ uno::Sequence< uno::Any > SvtLinguConfig::GetProperties( const uno::Sequence< OU return GetConfigItem().GetProperties(rNames); } -sal_Bool SvtLinguConfig::ReplaceSetProperties( +bool SvtLinguConfig::ReplaceSetProperties( const OUString &rNode, uno::Sequence< beans::PropertyValue > rValues ) { return GetConfigItem().ReplaceSetProperties( rNode, rValues ); @@ -864,28 +864,28 @@ uno::Any SvtLinguConfig::GetProperty( sal_Int32 nPropertyHandle ) const return GetConfigItem().GetProperty( nPropertyHandle ); } -sal_Bool SvtLinguConfig::SetProperty( const OUString &rPropertyName, const uno::Any &rValue ) +bool SvtLinguConfig::SetProperty( const OUString &rPropertyName, const uno::Any &rValue ) { return GetConfigItem().SetProperty( rPropertyName, rValue ); } -sal_Bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue ) +bool SvtLinguConfig::SetProperty( sal_Int32 nPropertyHandle, const uno::Any &rValue ) { return GetConfigItem().SetProperty( nPropertyHandle, rValue ); } -sal_Bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const +bool SvtLinguConfig::GetOptions( SvtLinguOptions &rOptions ) const { rOptions = GetConfigItem().GetOptions(); - return sal_True; + return true; } -sal_Bool SvtLinguConfig::IsReadOnly( const OUString &rPropertyName ) const +bool SvtLinguConfig::IsReadOnly( const OUString &rPropertyName ) const { return GetConfigItem().IsReadOnly( rPropertyName ); } -sal_Bool SvtLinguConfig::GetElementNamesFor( +bool SvtLinguConfig::GetElementNamesFor( const OUString &rNodeName, uno::Sequence< OUString > &rElementNames ) const { @@ -904,13 +904,13 @@ sal_Bool SvtLinguConfig::GetElementNamesFor( return bSuccess; } -sal_Bool SvtLinguConfig::GetSupportedDictionaryFormatsFor( +bool SvtLinguConfig::GetSupportedDictionaryFormatsFor( const OUString &rSetName, const OUString &rSetEntry, uno::Sequence< OUString > &rFormatList ) const { if (rSetName.isEmpty() || rSetEntry.isEmpty()) - return sal_False; + return false; bool bSuccess = false; try { @@ -969,12 +969,12 @@ static bool lcl_GetFileUrlFromOrigin( } -sal_Bool SvtLinguConfig::GetDictionaryEntry( +bool SvtLinguConfig::GetDictionaryEntry( const OUString &rNodeName, SvtLinguConfigDictionaryEntry &rDicEntry ) const { if (rNodeName.isEmpty()) - return sal_False; + return false; bool bSuccess = false; try { diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index 4fac21c7c4d9..4726ccd5aeba 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -33,7 +33,7 @@ using namespace ::osl ; using namespace ::com::sun::star::uno ; #define ROOTNODE_LOCALISATION OUString("Office.Common/View/Localisation") -#define DEFAULT_AUTOMNEMONIC sal_False +#define DEFAULT_AUTOMNEMONIC false #define DEFAULT_DIALOGSCALE 0 #define PROPERTYNAME_AUTOMNEMONIC OUString("AutoMnemonic") @@ -95,7 +95,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - sal_Bool IsAutoMnemonic ( ) const ; + bool IsAutoMnemonic ( ) const ; sal_Int32 GetDialogScale ( ) const ; private: @@ -117,7 +117,7 @@ class SvtLocalisationOptions_Impl : public ConfigItem private: - sal_Bool m_bAutoMnemonic ; + bool m_bAutoMnemonic ; sal_Int32 m_nDialogScale ; }; @@ -243,7 +243,7 @@ void SvtLocalisationOptions_Impl::Commit() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const +bool SvtLocalisationOptions_Impl::IsAutoMnemonic() const { return m_bAutoMnemonic; } @@ -317,7 +317,7 @@ SvtLocalisationOptions::~SvtLocalisationOptions() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtLocalisationOptions::IsAutoMnemonic() const +bool SvtLocalisationOptions::IsAutoMnemonic() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsAutoMnemonic(); diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx index 62ef5f11e9f8..15adf8b10c8b 100644 --- a/unotools/source/config/misccfg.cxx +++ b/unotools/source/config/misccfg.cxx @@ -39,9 +39,9 @@ static sal_Int32 nRefCount = 0; class SfxMiscCfg : public utl::ConfigItem { - sal_Bool bPaperSize; // printer warnings - sal_Bool bPaperOrientation; - sal_Bool bNotFound; + bool bPaperSize; // printer warnings + bool bPaperOrientation; + bool bNotFound; sal_Int32 nYear2000; // two digit year representation const com::sun::star::uno::Sequence<OUString> GetPropertyNames(); @@ -54,14 +54,14 @@ public: virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); virtual void Commit(); - sal_Bool IsNotFoundWarning() const {return bNotFound;} - void SetNotFoundWarning( sal_Bool bSet); + bool IsNotFoundWarning() const {return bNotFound;} + void SetNotFoundWarning( bool bSet); - sal_Bool IsPaperSizeWarning() const {return bPaperSize;} - void SetPaperSizeWarning(sal_Bool bSet); + bool IsPaperSizeWarning() const {return bPaperSize;} + void SetPaperSizeWarning(bool bSet); - sal_Bool IsPaperOrientationWarning() const {return bPaperOrientation;} - void SetPaperOrientationWarning( sal_Bool bSet); + bool IsPaperOrientationWarning() const {return bPaperOrientation;} + void SetPaperOrientationWarning( bool bSet); // 0 ... 99 sal_Int32 GetYear2000() const { return nYear2000; } @@ -71,9 +71,9 @@ public: SfxMiscCfg::SfxMiscCfg() : ConfigItem(OUString("Office.Common") ), - bPaperSize(sal_False), - bPaperOrientation (sal_False), - bNotFound (sal_False), + bPaperSize(false), + bPaperOrientation (false), + bNotFound (false), nYear2000( 1930 ) { Load(); @@ -83,21 +83,21 @@ SfxMiscCfg::~SfxMiscCfg() { } -void SfxMiscCfg::SetNotFoundWarning( sal_Bool bSet) +void SfxMiscCfg::SetNotFoundWarning( bool bSet) { if(bNotFound != bSet) SetModified(); bNotFound = bSet; } -void SfxMiscCfg::SetPaperSizeWarning( sal_Bool bSet) +void SfxMiscCfg::SetPaperSizeWarning( bool bSet) { if(bPaperSize != bSet) SetModified(); bPaperSize = bSet; } -void SfxMiscCfg::SetPaperOrientationWarning( sal_Bool bSet) +void SfxMiscCfg::SetPaperOrientationWarning( bool bSet) { if(bPaperOrientation != bSet) SetModified(); @@ -210,32 +210,32 @@ MiscCfg::~MiscCfg( ) } } -sal_Bool MiscCfg::IsNotFoundWarning() const +bool MiscCfg::IsNotFoundWarning() const { return pImpl->IsNotFoundWarning(); } -void MiscCfg::SetNotFoundWarning( sal_Bool bSet) +void MiscCfg::SetNotFoundWarning( bool bSet) { pImpl->SetNotFoundWarning( bSet ); } -sal_Bool MiscCfg::IsPaperSizeWarning() const +bool MiscCfg::IsPaperSizeWarning() const { return pImpl->IsPaperSizeWarning(); } -void MiscCfg::SetPaperSizeWarning(sal_Bool bSet) +void MiscCfg::SetPaperSizeWarning(bool bSet) { pImpl->SetPaperSizeWarning( bSet ); } -sal_Bool MiscCfg::IsPaperOrientationWarning() const +bool MiscCfg::IsPaperOrientationWarning() const { return pImpl->IsPaperOrientationWarning(); } -void MiscCfg::SetPaperOrientationWarning( sal_Bool bSet) +void MiscCfg::SetPaperOrientationWarning( bool bSet) { pImpl->SetPaperOrientationWarning( bSet ); } diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index aa3ce5afd764..60607d0e4352 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -103,7 +103,7 @@ struct FactoryInfo // easy way to reset struct member! void free() { - bInstalled = sal_False; + bInstalled = false; sFactory = ""; sShortName = ""; sTemplateFile = ""; @@ -111,12 +111,12 @@ struct FactoryInfo sEmptyDocumentURL = ""; sDefaultFilter = ""; nIcon = 0; - bChangedTemplateFile = sal_False; - bChangedWindowAttributes = sal_False; - bChangedEmptyDocumentURL = sal_False; - bChangedDefaultFilter = sal_False; - bChangedIcon = sal_False; - bDefaultFilterReadonly = sal_False; + bChangedTemplateFile = false; + bChangedWindowAttributes = false; + bChangedEmptyDocumentURL = false; + bChangedDefaultFilter = false; + bChangedIcon = false; + bDefaultFilterReadonly = false; } //--------------------------------------------------------------------------------------------------------- @@ -131,7 +131,7 @@ struct FactoryInfo css::uno::Sequence< css::beans::PropertyValue > lProperties ( 4 ); sal_Int8 nRealyChanged = 0 ; - if( bChangedTemplateFile == sal_True ) + if( bChangedTemplateFile ) { lProperties[nRealyChanged].Name = sNodeBase + PROPERTYNAME_TEMPLATEFILE; @@ -148,25 +148,25 @@ struct FactoryInfo ++nRealyChanged; } - if( bChangedWindowAttributes == sal_True ) + if( bChangedWindowAttributes ) { lProperties[nRealyChanged].Name = sNodeBase + PROPERTYNAME_WINDOWATTRIBUTES; lProperties[nRealyChanged].Value <<= sWindowAttributes; ++nRealyChanged; } - if( bChangedEmptyDocumentURL == sal_True ) + if( bChangedEmptyDocumentURL ) { lProperties[nRealyChanged].Name = sNodeBase + PROPERTYNAME_EMPTYDOCUMENTURL; lProperties[nRealyChanged].Value <<= sEmptyDocumentURL; ++nRealyChanged; } - if( bChangedDefaultFilter == sal_True ) + if( bChangedDefaultFilter ) { lProperties[nRealyChanged].Name = sNodeBase + PROPERTYNAME_DEFAULTFILTER; lProperties[nRealyChanged].Value <<= sDefaultFilter; ++nRealyChanged; } - if( bChangedIcon == sal_True ) + if( bChangedIcon ) { lProperties[nRealyChanged].Name = sNodeBase + PROPERTYNAME_ICON; lProperties[nRealyChanged].Value <<= nIcon; @@ -174,11 +174,11 @@ struct FactoryInfo } // Don't forget to reset changed flags! Otherwise we save it again and again and ... - bChangedTemplateFile = sal_False ; - bChangedWindowAttributes = sal_False ; - bChangedEmptyDocumentURL = sal_False ; - bChangedDefaultFilter = sal_False ; - bChangedIcon = sal_False ; + bChangedTemplateFile = false ; + bChangedWindowAttributes = false ; + bChangedEmptyDocumentURL = false ; + bChangedDefaultFilter = false ; + bChangedIcon = false ; lProperties.realloc( nRealyChanged ); return lProperties; @@ -188,25 +188,25 @@ struct FactoryInfo // We must support setting AND marking of changed values. // That's why we can't make our member public. We must use get/set/init methods // to control access on it! - sal_Bool getInstalled () const { return bInstalled; }; + bool getInstalled () const { return bInstalled; }; OUString getFactory () const { return sFactory; }; OUString getShortName () const { return sShortName; }; OUString getTemplateFile () const { return sTemplateFile; }; OUString getWindowAttributes () const { return sWindowAttributes; }; OUString getDefaultFilter () const { return sDefaultFilter; }; - sal_Bool isDefaultFilterReadonly() const { return bDefaultFilterReadonly; } + bool isDefaultFilterReadonly() const { return bDefaultFilterReadonly; } sal_Int32 getIcon () const { return nIcon; }; //--------------------------------------------------------------------------------------------------------- // If you call set-methods - we check for changes of valkues and mark it. // But if you wish to set it without that ... you must initialize it! - void initInstalled ( sal_Bool bNewInstalled ) { bInstalled = bNewInstalled ; } + void initInstalled ( bool bNewInstalled ) { bInstalled = bNewInstalled ; } void initFactory ( const OUString& sNewFactory ) { sFactory = sNewFactory ; } void initShortName ( const OUString& sNewShortName ) { sShortName = sNewShortName ; } void initWindowAttributes ( const OUString& sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes ; } void initEmptyDocumentURL ( const OUString& sNewEmptyDocumentURL ) { sEmptyDocumentURL = sNewEmptyDocumentURL ; } void initDefaultFilter ( const OUString& sNewDefaultFilter ) { sDefaultFilter = sNewDefaultFilter ; } - void setDefaultFilterReadonly( const sal_Bool bVal){bDefaultFilterReadonly = bVal;} + void setDefaultFilterReadonly( const bool bVal){bDefaultFilterReadonly = bVal;} void initIcon ( sal_Int32 nNewIcon ) { nIcon = nNewIcon ; } //--------------------------------------------------------------------------------------------------------- @@ -230,7 +230,7 @@ struct FactoryInfo if( sTemplateFile != sNewTemplateFile ) { sTemplateFile = sNewTemplateFile; - bChangedTemplateFile = sal_True ; + bChangedTemplateFile = true ; } }; @@ -240,7 +240,7 @@ struct FactoryInfo if( sWindowAttributes != sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes; - bChangedWindowAttributes = sal_True ; + bChangedWindowAttributes = true ; } }; @@ -250,7 +250,7 @@ struct FactoryInfo if( sDefaultFilter != sNewDefaultFilter ) { sDefaultFilter = sNewDefaultFilter; - bChangedDefaultFilter = sal_True ; + bChangedDefaultFilter = true ; } }; @@ -264,7 +264,7 @@ struct FactoryInfo return xSubstVars; } - sal_Bool bInstalled ; + bool bInstalled ; OUString sFactory ; OUString sShortName ; OUString sTemplateFile ; @@ -273,12 +273,12 @@ struct FactoryInfo OUString sDefaultFilter ; sal_Int32 nIcon ; - sal_Bool bChangedTemplateFile :1 ; - sal_Bool bChangedWindowAttributes :1 ; - sal_Bool bChangedEmptyDocumentURL :1 ; - sal_Bool bChangedDefaultFilter :1 ; - sal_Bool bChangedIcon :1 ; - sal_Bool bDefaultFilterReadonly :1 ; + bool bChangedTemplateFile :1 ; + bool bChangedWindowAttributes :1 ; + bool bChangedEmptyDocumentURL :1 ; + bool bChangedDefaultFilter :1 ; + bool bChangedIcon :1 ; + bool bDefaultFilterReadonly :1 ; css::uno::Reference< css::util::XStringSubstitution > xSubstVars; }; @@ -318,15 +318,15 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem //--------------------------------------------------------------------------------------------------------- // public interface //--------------------------------------------------------------------------------------------------------- - sal_Bool IsModuleInstalled ( SvtModuleOptions::EModule eModule ) const; + bool IsModuleInstalled ( SvtModuleOptions::EModule eModule ) const; ::com::sun::star::uno::Sequence < OUString > GetAllServiceNames(); OUString GetFactoryName ( SvtModuleOptions::EFactory eFactory ) const; OUString GetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory ) const; OUString GetFactoryEmptyDocumentURL( SvtModuleOptions::EFactory eFactory ) const; OUString GetFactoryDefaultFilter ( SvtModuleOptions::EFactory eFactory ) const; - sal_Bool IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const; + bool IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const; sal_Int32 GetFactoryIcon ( SvtModuleOptions::EFactory eFactory ) const; - static sal_Bool ClassifyFactoryByName ( const OUString& sName , + static bool ClassifyFactoryByName ( const OUString& sName , SvtModuleOptions::EFactory& eFactory ); void SetFactoryStandardTemplate( SvtModuleOptions::EFactory eFactory , const OUString& sTemplate ); @@ -351,7 +351,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem //------------------------------------------------------------------------------------------------------------- private: FactoryInfoList m_lFactories; - sal_Bool m_bReadOnlyStatesWellKnown; + bool m_bReadOnlyStatesWellKnown; }; /*-************************************************************************************************************//** @@ -370,7 +370,7 @@ class SvtModuleOptions_Impl : public ::utl::ConfigItem *//*-*************************************************************************************************************/ SvtModuleOptions_Impl::SvtModuleOptions_Impl() : ::utl::ConfigItem( ROOTNODE_FACTORIES ) - , m_bReadOnlyStatesWellKnown( sal_False ) + , m_bReadOnlyStatesWellKnown( false ) { // First initialize list of factory infos! Otherwise we couldnt gurantee right working of these class. for( sal_Int32 nFactory=0; nFactory<FACTORYCOUNT; ++nFactory ) @@ -505,9 +505,9 @@ void SvtModuleOptions_Impl::Commit() @onerror We return default values. (mostly "not installed"!) @threadsafe no *//*-*****************************************************************************************************/ -sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eModule ) const +bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eModule ) const { - sal_Bool bInstalled = sal_False; + bool bInstalled = false; switch( eModule ) { case SvtModuleOptions::E_SWRITER : bInstalled = m_lFactories[SvtModuleOptions::E_WRITER].getInstalled(); @@ -528,7 +528,7 @@ sal_Bool SvtModuleOptions_Impl::IsModuleInstalled( SvtModuleOptions::EModule eMo break; case SvtModuleOptions::E_SSTARTMODULE : bInstalled = m_lFactories[SvtModuleOptions::E_STARTMODULE].getInstalled(); break; - case SvtModuleOptions::E_SBASIC : bInstalled = sal_True; // Couldn't be deselected by setup yet! + case SvtModuleOptions::E_SBASIC : bInstalled = true; // Couldn't be deselected by setup yet! break; case SvtModuleOptions::E_SDATABASE : bInstalled = m_lFactories[SvtModuleOptions::E_DATABASE].getInstalled(); break; @@ -702,9 +702,9 @@ OUString SvtModuleOptions_Impl::GetFactoryDefaultFilter( SvtModuleOptions::EFact return sDefaultFilter; } //***************************************************************************************************************** -sal_Bool SvtModuleOptions_Impl::IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const +bool SvtModuleOptions_Impl::IsDefaultFilterReadonly( SvtModuleOptions::EFactory eFactory ) const { - sal_Bool bRet = sal_False; + bool bRet = false; if( eFactory>=0 && eFactory<FACTORYCOUNT ) { bRet = m_lFactories[eFactory].isDefaultFilterReadonly(); @@ -801,62 +801,62 @@ css::uno::Sequence< OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const @onerror We return false. @threadsafe no *//*-*************************************************************************************************************/ -sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtModuleOptions::EFactory& eFactory ) +bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtModuleOptions::EFactory& eFactory ) { - sal_Bool bState; + bool bState; eFactory = SvtModuleOptions::E_WRITER ; bState = ( sName == FACTORYNAME_WRITER ); - if( bState == sal_False ) + if( !bState ) { eFactory = SvtModuleOptions::E_WRITERWEB ; bState = ( sName == FACTORYNAME_WRITERWEB ); } // no else! - if( bState == sal_False ) + if( !bState ) { eFactory = SvtModuleOptions::E_WRITERGLOBAL ; bState = ( sName == FACTORYNAME_WRITERGLOBAL ); } // no else! - if( bState == sal_False ) + if( !bState ) { eFactory = SvtModuleOptions::E_CALC ; bState = ( sName == FACTORYNAME_CALC ); } // no else! - if( bState == sal_False ) + if( !bState ) { eFactory = SvtModuleOptions::E_DRAW ; bState = ( sName == FACTORYNAME_DRAW ); } // no else! - if( bState == sal_False ) + if( !bState ) { eFactory = SvtModuleOptions::E_IMPRESS ; bState = ( sName == FACTORYNAME_IMPRESS ); } // no else! - if( bState == sal_False ) + if( !bState ) { eFactory = SvtModuleOptions::E_MATH ; bState = ( sName == FACTORYNAME_MATH ); } // no else! - if( bState == sal_False ) + if( !bState ) { eFactory = SvtModuleOptions::E_CHART ; bState = ( sName == FACTORYNAME_CHART ); } // no else! - if( bState == sal_False ) + if( !bState ) { eFactory = SvtModuleOptions::E_DATABASE ; bState = ( sName == FACTORYNAME_DATABASE ); } // no else! - if( bState == sal_False ) + if( !bState ) { eFactory = SvtModuleOptions::E_STARTMODULE ; bState = ( sName == FACTORYNAME_STARTMODULE); @@ -911,7 +911,7 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFa for( sal_Int32 nSetNode=0; nSetNode<nNodeCount; ++nSetNode ) { const OUString& sFactoryName = lFactories[nSetNode]; - if( ClassifyFactoryByName( sFactoryName, eFactory ) == sal_True ) + if( ClassifyFactoryByName( sFactoryName, eFactory ) ) { OUString sTemp; sal_Int32 nTemp = 0; @@ -919,7 +919,7 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFa pInfo = &(m_lFactories[eFactory]); pInfo->free(); - pInfo->initInstalled( sal_True ); + pInfo->initInstalled( true ); pInfo->initFactory ( sFactoryName ); if (lValues[nPropertyStart+PROPERTYHANDLE_SHORTNAME] >>= sTemp) @@ -971,7 +971,7 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable() rInfo.setDefaultFilterReadonly(lReadonlyStates[i]); } - m_bReadOnlyStatesWellKnown = sal_True; + m_bReadOnlyStatesWellKnown = true; } //***************************************************************************************************************** @@ -1032,7 +1032,7 @@ SvtModuleOptions::~SvtModuleOptions() @onerror - @threadsafe yes *//*-*************************************************************************************************************/ -sal_Bool SvtModuleOptions::IsModuleInstalled( EModule eModule ) const +bool SvtModuleOptions::IsModuleInstalled( EModule eModule ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( eModule ); @@ -1066,7 +1066,7 @@ OUString SvtModuleOptions::GetFactoryDefaultFilter( EFactory eFactory ) const return m_pDataContainer->GetFactoryDefaultFilter( eFactory ); } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::IsDefaultFilterReadonly( EFactory eFactory ) const +bool SvtModuleOptions::IsDefaultFilterReadonly( EFactory eFactory ) const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); m_pDataContainer->MakeReadonlyStatesAvailable(); @@ -1080,7 +1080,7 @@ sal_Int32 SvtModuleOptions::GetFactoryIcon( EFactory eFactory ) const } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName , +bool SvtModuleOptions::ClassifyFactoryByName( const OUString& sName , EFactory& eFactory ) { // We don't need any mutex here ... because we don't use any member here! @@ -1104,54 +1104,54 @@ void SvtModuleOptions::SetFactoryDefaultFilter( EFactory eFactory, } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::IsMath() const +bool SvtModuleOptions::IsMath() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SMATH ); } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::IsChart() const +bool SvtModuleOptions::IsChart() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SCHART ); } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::IsCalc() const +bool SvtModuleOptions::IsCalc() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SCALC ); } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::IsDraw() const +bool SvtModuleOptions::IsDraw() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SDRAW ); } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::IsWriter() const +bool SvtModuleOptions::IsWriter() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SWRITER ); } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::IsImpress() const +bool SvtModuleOptions::IsImpress() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SIMPRESS ); } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::IsBasicIDE() const +bool SvtModuleOptions::IsBasicIDE() const { - return sal_True; + return true; } //***************************************************************************************************************** -sal_Bool SvtModuleOptions::IsDataBase() const +bool SvtModuleOptions::IsDataBase() const { ::osl::MutexGuard aGuard( impl_GetOwnStaticMutex() ); return m_pDataContainer->IsModuleInstalled( E_SDATABASE ); diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx index 29ca7de9fdaa..6bfed83d7e99 100644 --- a/unotools/source/config/optionsdlg.cxx +++ b/unotools/source/config/optionsdlg.cxx @@ -52,7 +52,7 @@ private: enum NodeType{ NT_Group, NT_Page, NT_Option }; void ReadNode( const OUString& _rNode, NodeType _eType ); - sal_Bool IsHidden( const OUString& _rPath ) const; + bool IsHidden( const OUString& _rPath ) const; public: SvtOptionsDlgOptions_Impl(); @@ -62,10 +62,10 @@ public: static ::osl::Mutex & getInitMutex(); - sal_Bool IsGroupHidden ( const OUString& _rGroup ) const; - sal_Bool IsPageHidden ( const OUString& _rPage, + bool IsGroupHidden ( const OUString& _rGroup ) const; + bool IsPageHidden ( const OUString& _rPage, const OUString& _rGroup ) const; - sal_Bool IsOptionHidden ( const OUString& _rOption, + bool IsOptionHidden ( const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const; }; @@ -149,7 +149,7 @@ void SvtOptionsDlgOptions_Impl::ReadNode( const OUString& _rNode, NodeType _eTyp Sequence< Any > aValues; aValues = GetProperties( lResult ); - sal_Bool bHide = sal_False; + bool bHide = false; if ( aValues[0] >>= bHide ) m_aOptionNodeList.insert( OptionNodeList::value_type( sNode, bHide ) ); @@ -185,9 +185,9 @@ OUString getOptionPath( const OUString& _rOption ) // ----------------------------------------------------------------------- -sal_Bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const +bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const { - sal_Bool bRet = sal_False; + bool bRet = false; OptionNodeList::const_iterator pIter = m_aOptionNodeList.find( _rPath ); if ( pIter != m_aOptionNodeList.end() ) bRet = pIter->second; @@ -196,21 +196,21 @@ sal_Bool SvtOptionsDlgOptions_Impl::IsHidden( const OUString& _rPath ) const // ----------------------------------------------------------------------- -sal_Bool SvtOptionsDlgOptions_Impl::IsGroupHidden( const OUString& _rGroup ) const +bool SvtOptionsDlgOptions_Impl::IsGroupHidden( const OUString& _rGroup ) const { return IsHidden( getGroupPath( _rGroup ) ); } // ----------------------------------------------------------------------- -sal_Bool SvtOptionsDlgOptions_Impl::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const +bool SvtOptionsDlgOptions_Impl::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const { return IsHidden( getGroupPath( _rGroup ) + getPagePath( _rPage ) ); } // ----------------------------------------------------------------------- -sal_Bool SvtOptionsDlgOptions_Impl::IsOptionHidden( +bool SvtOptionsDlgOptions_Impl::IsOptionHidden( const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const { return IsHidden( getGroupPath( _rGroup ) + getPagePath( _rPage ) + getOptionPath( _rOption ) ); @@ -247,17 +247,17 @@ SvtOptionsDialogOptions::~SvtOptionsDialogOptions() } } -sal_Bool SvtOptionsDialogOptions::IsGroupHidden( const OUString& _rGroup ) const +bool SvtOptionsDialogOptions::IsGroupHidden( const OUString& _rGroup ) const { return m_pImp->IsGroupHidden( _rGroup ); } -sal_Bool SvtOptionsDialogOptions::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const +bool SvtOptionsDialogOptions::IsPageHidden( const OUString& _rPage, const OUString& _rGroup ) const { return m_pImp->IsPageHidden( _rPage, _rGroup ); } -sal_Bool SvtOptionsDialogOptions::IsOptionHidden( +bool SvtOptionsDialogOptions::IsOptionHidden( const OUString& _rOption, const OUString& _rPage, const OUString& _rGroup ) const { return m_pImp->IsOptionHidden( _rOption, _rPage, _rGroup ); diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 73c171970c90..b4736c263254 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -74,17 +74,17 @@ public: // public interface //--------------------------------------------------------------------------------------------------------- - sal_Bool IsPaperSize() const { return m_bPaperSize; } - sal_Bool IsPaperOrientation() const { return m_bPaperOrientation; } - sal_Bool IsNotFound() const { return m_bNotFound; } - sal_Bool IsTransparency() const { return m_bTransparency; } - sal_Bool IsModifyDocumentOnPrintingAllowed() const { return m_bModifyDocumentOnPrintingAllowed; } - - void SetPaperSize( sal_Bool bState ) { m_bPaperSize = bState; SetModified(); } - void SetPaperOrientation( sal_Bool bState ) { m_bPaperOrientation = bState; SetModified(); } - void SetNotFound( sal_Bool bState ) { m_bNotFound = bState; SetModified(); } - void SetTransparency( sal_Bool bState ) { m_bTransparency = bState; SetModified(); } - void SetModifyDocumentOnPrintingAllowed( sal_Bool bState ) { m_bModifyDocumentOnPrintingAllowed = bState; SetModified(); } + bool IsPaperSize() const { return m_bPaperSize; } + bool IsPaperOrientation() const { return m_bPaperOrientation; } + bool IsNotFound() const { return m_bNotFound; } + bool IsTransparency() const { return m_bTransparency; } + bool IsModifyDocumentOnPrintingAllowed() const { return m_bModifyDocumentOnPrintingAllowed; } + + void SetPaperSize( bool bState ) { m_bPaperSize = bState; SetModified(); } + void SetPaperOrientation( bool bState ) { m_bPaperOrientation = bState; SetModified(); } + void SetNotFound( bool bState ) { m_bNotFound = bState; SetModified(); } + void SetTransparency( bool bState ) { m_bTransparency = bState; SetModified(); } + void SetModifyDocumentOnPrintingAllowed( bool bState ) { m_bModifyDocumentOnPrintingAllowed = bState; SetModified(); } //------------------------------------------------------------------------------------------------------------- // private methods @@ -100,11 +100,11 @@ private: private: - sal_Bool m_bPaperSize; - sal_Bool m_bPaperOrientation; - sal_Bool m_bNotFound; - sal_Bool m_bTransparency; - sal_Bool m_bModifyDocumentOnPrintingAllowed; + bool m_bPaperSize; + bool m_bPaperOrientation; + bool m_bNotFound; + bool m_bTransparency; + bool m_bModifyDocumentOnPrintingAllowed; }; //***************************************************************************************************************** @@ -112,11 +112,11 @@ private: //***************************************************************************************************************** SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() : ConfigItem( ROOTNODE_START ), - m_bPaperSize( sal_False ), - m_bPaperOrientation( sal_False ), - m_bNotFound( sal_False ), - m_bTransparency( sal_True ), - m_bModifyDocumentOnPrintingAllowed( sal_True ) + m_bPaperSize( false ), + m_bPaperOrientation( false ), + m_bNotFound( false ), + m_bTransparency( true ), + m_bModifyDocumentOnPrintingAllowed( true ) { Sequence< OUString > seqNames( impl_GetPropertyNames() ); Sequence< Any > seqValues( GetProperties( seqNames ) ); @@ -287,7 +287,7 @@ SvtPrintWarningOptions::~SvtPrintWarningOptions() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtPrintWarningOptions::IsPaperSize() const +bool SvtPrintWarningOptions::IsPaperSize() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsPaperSize(); @@ -296,7 +296,7 @@ sal_Bool SvtPrintWarningOptions::IsPaperSize() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtPrintWarningOptions::IsPaperOrientation() const +bool SvtPrintWarningOptions::IsPaperOrientation() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsPaperOrientation(); @@ -305,7 +305,7 @@ sal_Bool SvtPrintWarningOptions::IsPaperOrientation() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtPrintWarningOptions::IsTransparency() const +bool SvtPrintWarningOptions::IsTransparency() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsTransparency(); @@ -314,7 +314,7 @@ sal_Bool SvtPrintWarningOptions::IsTransparency() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtPrintWarningOptions::SetPaperSize( sal_Bool bState ) +void SvtPrintWarningOptions::SetPaperSize( bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetPaperSize( bState ); @@ -323,7 +323,7 @@ void SvtPrintWarningOptions::SetPaperSize( sal_Bool bState ) //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtPrintWarningOptions::SetPaperOrientation( sal_Bool bState ) +void SvtPrintWarningOptions::SetPaperOrientation( bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetPaperOrientation( bState ); @@ -332,14 +332,14 @@ void SvtPrintWarningOptions::SetPaperOrientation( sal_Bool bState ) //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtPrintWarningOptions::SetTransparency( sal_Bool bState ) +void SvtPrintWarningOptions::SetTransparency( bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetTransparency( bState ); } // ----------------------------------------------------------------------------- -sal_Bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const +bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const { MutexGuard aGuard( GetOwnStaticMutex() ); return m_pDataContainer->IsModifyDocumentOnPrintingAllowed(); @@ -347,7 +347,7 @@ sal_Bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const // ----------------------------------------------------------------------------- -void SvtPrintWarningOptions::SetModifyDocumentOnPrintingAllowed( sal_Bool bState ) +void SvtPrintWarningOptions::SetModifyDocumentOnPrintingAllowed( bool bState ) { MutexGuard aGuard( GetOwnStaticMutex() ); m_pDataContainer->SetModifyDocumentOnPrintingAllowed( bState ) ; diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx index a58439b018e8..609ecc58f0d8 100644 --- a/unotools/source/config/saveopt.cxx +++ b/unotools/source/config/saveopt.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star::uno; class SvtSaveOptions_Impl; class SvtLoadOptions_Impl; -#define CFG_READONLY_DEFAULT sal_False +#define CFG_READONLY_DEFAULT false struct SvtLoadSaveOptions_Impl { @@ -51,7 +51,7 @@ static sal_Int32 nRefCount = 0; class SvtSaveOptions_Impl : public utl::ConfigItem { sal_Int32 nAutoSaveTime; - sal_Bool bUseUserData, + bool bUseUserData, bBackup, bAutoSave, bAutoSavePrompt, @@ -70,7 +70,7 @@ class SvtSaveOptions_Impl : public utl::ConfigItem SvtSaveOptions::ODFDefaultVersion eODFDefaultVersion; - sal_Bool bROAutoSaveTime, + bool bROAutoSaveTime, bROUseUserData, bROBackup, bROAutoSave, @@ -97,43 +97,43 @@ public: virtual void Commit(); sal_Int32 GetAutoSaveTime() const { return nAutoSaveTime; } - sal_Bool IsUseUserData() const { return bUseUserData; } - sal_Bool IsBackup() const { return bBackup; } - sal_Bool IsAutoSave() const { return bAutoSave; } - sal_Bool IsAutoSavePrompt() const { return bAutoSavePrompt; } - sal_Bool IsUserAutoSave() const { return bUserAutoSave; } - sal_Bool IsDocInfoSave() const { return bDocInfSave; } - sal_Bool IsSaveWorkingSet() const { return bSaveWorkingSet; } - sal_Bool IsSaveDocView() const { return bSaveDocView; } - sal_Bool IsSaveRelINet() const { return bSaveRelINet; } - sal_Bool IsSaveRelFSys() const { return bSaveRelFSys; } - sal_Bool IsSaveUnpacked() const { return bSaveUnpacked; } - sal_Bool IsPrettyPrintingEnabled( ) const { return bDoPrettyPrinting; } - sal_Bool IsWarnAlienFormat() const { return bWarnAlienFormat; } - sal_Bool IsLoadDocPrinter() const { return bLoadDocPrinter; } - sal_Bool IsUseSHA1InODF12() const { return bUseSHA1InODF12; } - sal_Bool IsUseBlowfishInODF12() const { return bUseBlowfishInODF12; } + bool IsUseUserData() const { return bUseUserData; } + bool IsBackup() const { return bBackup; } + bool IsAutoSave() const { return bAutoSave; } + bool IsAutoSavePrompt() const { return bAutoSavePrompt; } + bool IsUserAutoSave() const { return bUserAutoSave; } + bool IsDocInfoSave() const { return bDocInfSave; } + bool IsSaveWorkingSet() const { return bSaveWorkingSet; } + bool IsSaveDocView() const { return bSaveDocView; } + bool IsSaveRelINet() const { return bSaveRelINet; } + bool IsSaveRelFSys() const { return bSaveRelFSys; } + bool IsSaveUnpacked() const { return bSaveUnpacked; } + bool IsPrettyPrintingEnabled( ) const { return bDoPrettyPrinting; } + bool IsWarnAlienFormat() const { return bWarnAlienFormat; } + bool IsLoadDocPrinter() const { return bLoadDocPrinter; } + bool IsUseSHA1InODF12() const { return bUseSHA1InODF12; } + bool IsUseBlowfishInODF12() const { return bUseBlowfishInODF12; } SvtSaveOptions::ODFDefaultVersion GetODFDefaultVersion() const { return eODFDefaultVersion; } void SetAutoSaveTime( sal_Int32 n ); - void SetUseUserData( sal_Bool b ); - void SetBackup( sal_Bool b ); - void SetAutoSave( sal_Bool b ); - void SetAutoSavePrompt( sal_Bool b ); - void SetUserAutoSave( sal_Bool b ); - void SetDocInfoSave( sal_Bool b ); - void SetSaveWorkingSet( sal_Bool b ); - void SetSaveDocView( sal_Bool b ); - void SetSaveRelINet( sal_Bool b ); - void SetSaveRelFSys( sal_Bool b ); - void EnablePrettyPrinting( sal_Bool _bDoPP ); - void SetWarnAlienFormat( sal_Bool _bDoPP ); - void SetLoadDocPrinter( sal_Bool bNew ); + void SetUseUserData( bool b ); + void SetBackup( bool b ); + void SetAutoSave( bool b ); + void SetAutoSavePrompt( bool b ); + void SetUserAutoSave( bool b ); + void SetDocInfoSave( bool b ); + void SetSaveWorkingSet( bool b ); + void SetSaveDocView( bool b ); + void SetSaveRelINet( bool b ); + void SetSaveRelFSys( bool b ); + void EnablePrettyPrinting( bool _bDoPP ); + void SetWarnAlienFormat( bool _bDoPP ); + void SetLoadDocPrinter( bool bNew ); void SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion eNew ); - sal_Bool IsReadOnly( SvtSaveOptions::EOption eOption ) const; + bool IsReadOnly( SvtSaveOptions::EOption eOption ) const; }; void SvtSaveOptions_Impl::SetAutoSaveTime( sal_Int32 n ) @@ -146,7 +146,7 @@ void SvtSaveOptions_Impl::SetAutoSaveTime( sal_Int32 n ) } } -void SvtSaveOptions_Impl::SetUseUserData( sal_Bool b ) +void SvtSaveOptions_Impl::SetUseUserData( bool b ) { if (!bROUseUserData && bUseUserData!=b) { @@ -155,7 +155,7 @@ void SvtSaveOptions_Impl::SetUseUserData( sal_Bool b ) } } -void SvtSaveOptions_Impl::SetBackup( sal_Bool b ) +void SvtSaveOptions_Impl::SetBackup( bool b ) { if (!bROBackup && bBackup!=b) { @@ -164,7 +164,7 @@ void SvtSaveOptions_Impl::SetBackup( sal_Bool b ) } } -void SvtSaveOptions_Impl::SetAutoSave( sal_Bool b ) +void SvtSaveOptions_Impl::SetAutoSave( bool b ) { if (!bROAutoSave && bAutoSave!=b) { @@ -174,7 +174,7 @@ void SvtSaveOptions_Impl::SetAutoSave( sal_Bool b ) } } -void SvtSaveOptions_Impl::SetAutoSavePrompt( sal_Bool b ) +void SvtSaveOptions_Impl::SetAutoSavePrompt( bool b ) { if (!bROAutoSavePrompt && bAutoSavePrompt!=b) { @@ -183,7 +183,7 @@ void SvtSaveOptions_Impl::SetAutoSavePrompt( sal_Bool b ) } } -void SvtSaveOptions_Impl::SetUserAutoSave( sal_Bool b ) +void SvtSaveOptions_Impl::SetUserAutoSave( bool b ) { if (!bROUserAutoSave && bUserAutoSave!=b) { @@ -193,7 +193,7 @@ void SvtSaveOptions_Impl::SetUserAutoSave( sal_Bool b ) } } -void SvtSaveOptions_Impl::SetDocInfoSave(sal_Bool b) +void SvtSaveOptions_Impl::SetDocInfoSave(bool b) { if (!bRODocInfSave && bDocInfSave!=b) { @@ -202,7 +202,7 @@ void SvtSaveOptions_Impl::SetDocInfoSave(sal_Bool b) } } -void SvtSaveOptions_Impl::SetSaveWorkingSet( sal_Bool b ) +void SvtSaveOptions_Impl::SetSaveWorkingSet( bool b ) { if (!bROSaveWorkingSet && bSaveWorkingSet!=b) { @@ -211,7 +211,7 @@ void SvtSaveOptions_Impl::SetSaveWorkingSet( sal_Bool b ) } } -void SvtSaveOptions_Impl::SetSaveDocView( sal_Bool b ) +void SvtSaveOptions_Impl::SetSaveDocView( bool b ) { if (!bROSaveDocView && bSaveDocView!=b) { @@ -220,7 +220,7 @@ void SvtSaveOptions_Impl::SetSaveDocView( sal_Bool b ) } } -void SvtSaveOptions_Impl::SetSaveRelINet( sal_Bool b ) +void SvtSaveOptions_Impl::SetSaveRelINet( bool b ) { if (!bROSaveRelINet && bSaveRelINet!=b) { @@ -229,7 +229,7 @@ void SvtSaveOptions_Impl::SetSaveRelINet( sal_Bool b ) } } -void SvtSaveOptions_Impl::SetSaveRelFSys( sal_Bool b ) +void SvtSaveOptions_Impl::SetSaveRelFSys( bool b ) { if (!bROSaveRelFSys && bSaveRelFSys!=b) { @@ -238,7 +238,7 @@ void SvtSaveOptions_Impl::SetSaveRelFSys( sal_Bool b ) } } -void SvtSaveOptions_Impl::EnablePrettyPrinting( sal_Bool _bDoPP ) +void SvtSaveOptions_Impl::EnablePrettyPrinting( bool _bDoPP ) { if (!bRODoPrettyPrinting && bDoPrettyPrinting!=_bDoPP) { @@ -247,7 +247,7 @@ void SvtSaveOptions_Impl::EnablePrettyPrinting( sal_Bool _bDoPP ) } } -void SvtSaveOptions_Impl::SetWarnAlienFormat( sal_Bool _bDoPP ) +void SvtSaveOptions_Impl::SetWarnAlienFormat( bool _bDoPP ) { if (!bROWarnAlienFormat && bWarnAlienFormat!=_bDoPP) { @@ -256,7 +256,7 @@ void SvtSaveOptions_Impl::SetWarnAlienFormat( sal_Bool _bDoPP ) } } -void SvtSaveOptions_Impl::SetLoadDocPrinter( sal_Bool bNew ) +void SvtSaveOptions_Impl::SetLoadDocPrinter( bool bNew ) { if ( !bROLoadDocPrinter && bLoadDocPrinter != bNew ) { @@ -274,9 +274,9 @@ void SvtSaveOptions_Impl::SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersio } } -sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const +bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const { - sal_Bool bReadOnly = CFG_READONLY_DEFAULT; + bool bReadOnly = CFG_READONLY_DEFAULT; switch(eOption) { case SvtSaveOptions::E_AUTOSAVETIME : @@ -394,22 +394,22 @@ Sequence< OUString > GetPropertyNames() SvtSaveOptions_Impl::SvtSaveOptions_Impl() : ConfigItem( OUString("Office.Common/Save") ) , nAutoSaveTime( 0 ) - , bUseUserData( sal_False ) - , bBackup( sal_False ) - , bAutoSave( sal_False ) - , bAutoSavePrompt( sal_False ) - , bUserAutoSave( sal_False ) - , bDocInfSave( sal_False ) - , bSaveWorkingSet( sal_False ) - , bSaveDocView( sal_False ) - , bSaveRelINet( sal_False ) - , bSaveRelFSys( sal_False ) - , bSaveUnpacked( sal_False ) - , bDoPrettyPrinting( sal_False ) - , bWarnAlienFormat( sal_True ) - , bLoadDocPrinter( sal_True ) - , bUseSHA1InODF12( sal_False ) - , bUseBlowfishInODF12( sal_False ) + , bUseUserData( false ) + , bBackup( false ) + , bAutoSave( false ) + , bAutoSavePrompt( false ) + , bUserAutoSave( false ) + , bDocInfSave( false ) + , bSaveWorkingSet( false ) + , bSaveDocView( false ) + , bSaveRelINet( false ) + , bSaveRelFSys( false ) + , bSaveUnpacked( false ) + , bDoPrettyPrinting( false ) + , bWarnAlienFormat( true ) + , bLoadDocPrinter( true ) + , bUseSHA1InODF12( false ) + , bUseBlowfishInODF12( false ) , eODFDefaultVersion( SvtSaveOptions::ODFVER_LATEST ) , bROAutoSaveTime( CFG_READONLY_DEFAULT ) , bROUseUserData( CFG_READONLY_DEFAULT ) @@ -479,7 +479,7 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl() default: { - sal_Bool bTemp = sal_Bool(); + bool bTemp = bool(); if ( pValues[nProp] >>= bTemp ) { switch ( nProp ) @@ -755,7 +755,7 @@ void SvtSaveOptions_Impl::Notify( const Sequence<OUString>& ) class SvtLoadOptions_Impl : public utl::ConfigItem { - sal_Bool bLoadUserDefinedSettings; + bool bLoadUserDefinedSettings; public: SvtLoadOptions_Impl(); @@ -764,15 +764,15 @@ public: virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); virtual void Commit(); - void SetLoadUserSettings(sal_Bool b){bLoadUserDefinedSettings = b; SetModified();} - sal_Bool IsLoadUserSettings() const {return bLoadUserDefinedSettings;} + void SetLoadUserSettings(bool b){bLoadUserDefinedSettings = b; SetModified();} + bool IsLoadUserSettings() const {return bLoadUserDefinedSettings;} }; // ----------------------------------------------------------------------- const sal_Char cUserDefinedSettings[] = "UserDefinedSettings"; SvtLoadOptions_Impl::SvtLoadOptions_Impl() : ConfigItem( OUString("Office.Common/Load") ) - , bLoadUserDefinedSettings( sal_False ) + , bLoadUserDefinedSettings( false ) { Sequence< OUString > aNames(1); aNames[0] = OUString::createFromAscii(cUserDefinedSettings); @@ -856,147 +856,147 @@ sal_Int32 SvtSaveOptions::GetAutoSaveTime() const return pImp->pSaveOpt->GetAutoSaveTime(); } -void SvtSaveOptions::SetUseUserData( sal_Bool b ) +void SvtSaveOptions::SetUseUserData( bool b ) { pImp->pSaveOpt->SetUseUserData( b ); } -sal_Bool SvtSaveOptions::IsUseUserData() const +bool SvtSaveOptions::IsUseUserData() const { return pImp->pSaveOpt->IsUseUserData(); } -void SvtSaveOptions::SetBackup( sal_Bool b ) +void SvtSaveOptions::SetBackup( bool b ) { pImp->pSaveOpt->SetBackup( b ); } -sal_Bool SvtSaveOptions::IsBackup() const +bool SvtSaveOptions::IsBackup() const { return pImp->pSaveOpt->IsBackup(); } -void SvtSaveOptions::SetAutoSave( sal_Bool b ) +void SvtSaveOptions::SetAutoSave( bool b ) { pImp->pSaveOpt->SetAutoSave( b ); } -sal_Bool SvtSaveOptions::IsAutoSave() const +bool SvtSaveOptions::IsAutoSave() const { return pImp->pSaveOpt->IsAutoSave(); } -void SvtSaveOptions::SetAutoSavePrompt( sal_Bool b ) +void SvtSaveOptions::SetAutoSavePrompt( bool b ) { pImp->pSaveOpt->SetAutoSavePrompt( b ); } -sal_Bool SvtSaveOptions::IsAutoSavePrompt() const +bool SvtSaveOptions::IsAutoSavePrompt() const { return pImp->pSaveOpt->IsAutoSavePrompt(); } -void SvtSaveOptions::SetUserAutoSave( sal_Bool b ) +void SvtSaveOptions::SetUserAutoSave( bool b ) { pImp->pSaveOpt->SetUserAutoSave( b ); } -sal_Bool SvtSaveOptions::IsUserAutoSave() const +bool SvtSaveOptions::IsUserAutoSave() const { return pImp->pSaveOpt->IsUserAutoSave(); } -void SvtSaveOptions::SetDocInfoSave(sal_Bool b) +void SvtSaveOptions::SetDocInfoSave(bool b) { pImp->pSaveOpt->SetDocInfoSave( b ); } -sal_Bool SvtSaveOptions::IsDocInfoSave() const +bool SvtSaveOptions::IsDocInfoSave() const { return pImp->pSaveOpt->IsDocInfoSave(); } -void SvtSaveOptions::SetSaveWorkingSet( sal_Bool b ) +void SvtSaveOptions::SetSaveWorkingSet( bool b ) { pImp->pSaveOpt->SetSaveWorkingSet( b ); } -sal_Bool SvtSaveOptions::IsSaveWorkingSet() const +bool SvtSaveOptions::IsSaveWorkingSet() const { return pImp->pSaveOpt->IsSaveWorkingSet(); } -void SvtSaveOptions::SetSaveDocView( sal_Bool b ) +void SvtSaveOptions::SetSaveDocView( bool b ) { pImp->pSaveOpt->SetSaveDocView( b ); } -sal_Bool SvtSaveOptions::IsSaveDocView() const +bool SvtSaveOptions::IsSaveDocView() const { return pImp->pSaveOpt->IsSaveDocView(); } -void SvtSaveOptions::SetSaveRelINet( sal_Bool b ) +void SvtSaveOptions::SetSaveRelINet( bool b ) { pImp->pSaveOpt->SetSaveRelINet( b ); } -sal_Bool SvtSaveOptions::IsSaveRelINet() const +bool SvtSaveOptions::IsSaveRelINet() const { return pImp->pSaveOpt->IsSaveRelINet(); } -void SvtSaveOptions::SetSaveRelFSys( sal_Bool b ) +void SvtSaveOptions::SetSaveRelFSys( bool b ) { pImp->pSaveOpt->SetSaveRelFSys( b ); } -sal_Bool SvtSaveOptions::IsSaveRelFSys() const +bool SvtSaveOptions::IsSaveRelFSys() const { return pImp->pSaveOpt->IsSaveRelFSys(); } -sal_Bool SvtSaveOptions::IsSaveUnpacked() const +bool SvtSaveOptions::IsSaveUnpacked() const { return pImp->pSaveOpt->IsSaveUnpacked(); } -void SvtSaveOptions::SetLoadUserSettings(sal_Bool b) +void SvtSaveOptions::SetLoadUserSettings(bool b) { pImp->pLoadOpt->SetLoadUserSettings(b); } -sal_Bool SvtSaveOptions::IsLoadUserSettings() const +bool SvtSaveOptions::IsLoadUserSettings() const { return pImp->pLoadOpt->IsLoadUserSettings(); } -void SvtSaveOptions::SetPrettyPrinting( sal_Bool _bEnable ) +void SvtSaveOptions::SetPrettyPrinting( bool _bEnable ) { pImp->pSaveOpt->EnablePrettyPrinting( _bEnable ); } -sal_Bool SvtSaveOptions::IsPrettyPrinting() const +bool SvtSaveOptions::IsPrettyPrinting() const { return pImp->pSaveOpt->IsPrettyPrintingEnabled(); } -void SvtSaveOptions::SetWarnAlienFormat( sal_Bool _bEnable ) +void SvtSaveOptions::SetWarnAlienFormat( bool _bEnable ) { pImp->pSaveOpt->SetWarnAlienFormat( _bEnable ); } -sal_Bool SvtSaveOptions::IsWarnAlienFormat() const +bool SvtSaveOptions::IsWarnAlienFormat() const { return pImp->pSaveOpt->IsWarnAlienFormat(); } -void SvtSaveOptions::SetLoadDocumentPrinter( sal_Bool _bEnable ) +void SvtSaveOptions::SetLoadDocumentPrinter( bool _bEnable ) { pImp->pSaveOpt->SetLoadDocPrinter( _bEnable ); } -sal_Bool SvtSaveOptions::IsLoadDocumentPrinter() const +bool SvtSaveOptions::IsLoadDocumentPrinter() const { return pImp->pSaveOpt->IsLoadDocPrinter(); } @@ -1011,17 +1011,17 @@ SvtSaveOptions::ODFDefaultVersion SvtSaveOptions::GetODFDefaultVersion() const return pImp->pSaveOpt->GetODFDefaultVersion(); } -sal_Bool SvtSaveOptions::IsUseSHA1InODF12() const +bool SvtSaveOptions::IsUseSHA1InODF12() const { return pImp->pSaveOpt->IsUseSHA1InODF12(); } -sal_Bool SvtSaveOptions::IsUseBlowfishInODF12() const +bool SvtSaveOptions::IsUseBlowfishInODF12() const { return pImp->pSaveOpt->IsUseBlowfishInODF12(); } -sal_Bool SvtSaveOptions::IsReadOnly( SvtSaveOptions::EOption eOption ) const +bool SvtSaveOptions::IsReadOnly( SvtSaveOptions::EOption eOption ) const { return pImp->pSaveOpt->IsReadOnly(eOption); } diff --git a/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx index 3845eaa816f5..894529523869 100644 --- a/unotools/source/config/searchopt.cxx +++ b/unotools/source/config/searchopt.cxx @@ -38,18 +38,18 @@ using namespace com::sun::star::i18n; class SvtSearchOptions_Impl : public ConfigItem { sal_Int32 nFlags; - sal_Bool bModified; + bool bModified; // disallow copy-constructor and assignment-operator for now SvtSearchOptions_Impl( const SvtSearchOptions_Impl & ); SvtSearchOptions_Impl & operator = ( const SvtSearchOptions_Impl & ); protected: - sal_Bool IsModified() const { return bModified; } + bool IsModified() const { return bModified; } using ConfigItem::SetModified; - void SetModified( sal_Bool bVal ); - sal_Bool Load(); - sal_Bool Save(); + void SetModified( bool bVal ); + bool Load(); + bool Save(); Sequence< OUString > GetPropertyNames() const; @@ -61,8 +61,8 @@ public: virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence< OUString >& aPropertyNames ); - sal_Bool GetFlag( sal_uInt16 nOffset ) const; - void SetFlag( sal_uInt16 nOffset, sal_Bool bVal ); + bool GetFlag( sal_uInt16 nOffset ) const; + void SetFlag( sal_uInt16 nOffset, bool bVal ); }; @@ -71,7 +71,7 @@ SvtSearchOptions_Impl::SvtSearchOptions_Impl() : { nFlags = 0x0003FFFF; // set all options values to 'true' Load(); - SetModified( sal_False ); + SetModified( false ); } @@ -91,13 +91,13 @@ void SvtSearchOptions_Impl::Notify( const Sequence< OUString >& ) { } -sal_Bool SvtSearchOptions_Impl::GetFlag( sal_uInt16 nOffset ) const +bool SvtSearchOptions_Impl::GetFlag( sal_uInt16 nOffset ) const { DBG_ASSERT( nOffset <= MAX_FLAGS_OFFSET, "offset out of range"); return ((nFlags >> nOffset) & 0x01) ? sal_True : sal_False; } -void SvtSearchOptions_Impl::SetFlag( sal_uInt16 nOffset, sal_Bool bVal ) +void SvtSearchOptions_Impl::SetFlag( sal_uInt16 nOffset, bool bVal ) { DBG_ASSERT( nOffset <= MAX_FLAGS_OFFSET, "offset out of range"); sal_Int32 nOldFlags = nFlags; @@ -107,10 +107,10 @@ void SvtSearchOptions_Impl::SetFlag( sal_uInt16 nOffset, sal_Bool bVal ) else nFlags &= ~nMask; if (nFlags != nOldFlags) - SetModified( sal_True ); + SetModified( true ); } -void SvtSearchOptions_Impl::SetModified( sal_Bool bVal ) +void SvtSearchOptions_Impl::SetModified( bool bVal ) { bModified = bVal; if (bModified) @@ -162,9 +162,9 @@ Sequence< OUString > SvtSearchOptions_Impl::GetPropertyNames() const return aNames; } -sal_Bool SvtSearchOptions_Impl::Load() +bool SvtSearchOptions_Impl::Load() { - sal_Bool bSucc = sal_False; + bool bSucc = false; Sequence< OUString > aNames = GetPropertyNames(); sal_Int32 nProps = aNames.getLength(); @@ -176,7 +176,7 @@ sal_Bool SvtSearchOptions_Impl::Load() if (nProps && aValues.getLength() == nProps) { - bSucc = sal_True; + bSucc = true; const Any* pValues = aValues.getConstArray(); for (sal_uInt16 i = 0; i < nProps; ++i) @@ -185,7 +185,7 @@ sal_Bool SvtSearchOptions_Impl::Load() DBG_ASSERT( rVal.hasValue(), "property value missing" ); if (rVal.hasValue()) { - sal_Bool bVal = sal_Bool(); + bool bVal = bool(); if (rVal >>= bVal) { if (i <= MAX_FLAGS_OFFSET) @@ -200,13 +200,13 @@ sal_Bool SvtSearchOptions_Impl::Load() else { OSL_FAIL( "unexpected type" ); - bSucc = sal_False; + bSucc = false; } } else { OSL_FAIL( "value missing" ); - bSucc = sal_False; + bSucc = false; } } } @@ -215,9 +215,9 @@ sal_Bool SvtSearchOptions_Impl::Load() return bSucc; } -sal_Bool SvtSearchOptions_Impl::Save() +bool SvtSearchOptions_Impl::Save() { - sal_Bool bSucc = sal_False; + bool bSucc = false; const Sequence< OUString > aNames = GetPropertyNames(); sal_Int32 nProps = aNames.getLength(); @@ -230,12 +230,12 @@ sal_Bool SvtSearchOptions_Impl::Save() if (nProps && nProps == MAX_FLAGS_OFFSET + 1) { for (sal_uInt16 i = 0; i < nProps; ++i) - pValue[i] <<= (sal_Bool) GetFlag(i); + pValue[i] <<= GetFlag(i); bSucc |= PutProperties( aNames, aValues ); } if (bSucc) - SetModified( sal_False ); + SetModified( false ); return bSucc; } @@ -297,267 +297,267 @@ sal_Int32 SvtSearchOptions::GetTransliterationFlags() const return nRes; } -sal_Bool SvtSearchOptions::IsWholeWordsOnly() const +bool SvtSearchOptions::IsWholeWordsOnly() const { return pImpl->GetFlag( 0 ); } -void SvtSearchOptions::SetWholeWordsOnly( sal_Bool bVal ) +void SvtSearchOptions::SetWholeWordsOnly( bool bVal ) { pImpl->SetFlag( 0, bVal ); } -sal_Bool SvtSearchOptions::IsBackwards() const +bool SvtSearchOptions::IsBackwards() const { return pImpl->GetFlag( 1 ); } -void SvtSearchOptions::SetBackwards( sal_Bool bVal ) +void SvtSearchOptions::SetBackwards( bool bVal ) { pImpl->SetFlag( 1, bVal ); } -sal_Bool SvtSearchOptions::IsUseRegularExpression() const +bool SvtSearchOptions::IsUseRegularExpression() const { return pImpl->GetFlag( 2 ); } -void SvtSearchOptions::SetUseRegularExpression( sal_Bool bVal ) +void SvtSearchOptions::SetUseRegularExpression( bool bVal ) { pImpl->SetFlag( 2, bVal ); } -void SvtSearchOptions::SetSearchForStyles( sal_Bool bVal ) +void SvtSearchOptions::SetSearchForStyles( bool bVal ) { pImpl->SetFlag( 3, bVal ); } -sal_Bool SvtSearchOptions::IsSimilaritySearch() const +bool SvtSearchOptions::IsSimilaritySearch() const { return pImpl->GetFlag( 4 ); } -void SvtSearchOptions::SetSimilaritySearch( sal_Bool bVal ) +void SvtSearchOptions::SetSimilaritySearch( bool bVal ) { pImpl->SetFlag( 4, bVal ); } -sal_Bool SvtSearchOptions::IsUseAsianOptions() const +bool SvtSearchOptions::IsUseAsianOptions() const { return pImpl->GetFlag( 5 ); } -void SvtSearchOptions::SetUseAsianOptions( sal_Bool bVal ) +void SvtSearchOptions::SetUseAsianOptions( bool bVal ) { pImpl->SetFlag( 5, bVal ); } -sal_Bool SvtSearchOptions::IsMatchCase() const +bool SvtSearchOptions::IsMatchCase() const { return pImpl->GetFlag( 6 ); } -void SvtSearchOptions::SetMatchCase( sal_Bool bVal ) +void SvtSearchOptions::SetMatchCase( bool bVal ) { pImpl->SetFlag( 6, bVal ); } -sal_Bool SvtSearchOptions::IsMatchFullHalfWidthForms() const +bool SvtSearchOptions::IsMatchFullHalfWidthForms() const { return pImpl->GetFlag( 7 ); } -void SvtSearchOptions::SetMatchFullHalfWidthForms( sal_Bool bVal ) +void SvtSearchOptions::SetMatchFullHalfWidthForms( bool bVal ) { pImpl->SetFlag( 7, bVal ); } -sal_Bool SvtSearchOptions::IsMatchHiraganaKatakana() const +bool SvtSearchOptions::IsMatchHiraganaKatakana() const { return pImpl->GetFlag( 8 ); } -void SvtSearchOptions::SetMatchHiraganaKatakana( sal_Bool bVal ) +void SvtSearchOptions::SetMatchHiraganaKatakana( bool bVal ) { pImpl->SetFlag( 8, bVal ); } -sal_Bool SvtSearchOptions::IsMatchContractions() const +bool SvtSearchOptions::IsMatchContractions() const { return pImpl->GetFlag( 9 ); } -void SvtSearchOptions::SetMatchContractions( sal_Bool bVal ) +void SvtSearchOptions::SetMatchContractions( bool bVal ) { pImpl->SetFlag( 9, bVal ); } -sal_Bool SvtSearchOptions::IsMatchMinusDashChoon() const +bool SvtSearchOptions::IsMatchMinusDashChoon() const { return pImpl->GetFlag( 10 ); } -void SvtSearchOptions::SetMatchMinusDashChoon( sal_Bool bVal ) +void SvtSearchOptions::SetMatchMinusDashChoon( bool bVal ) { pImpl->SetFlag( 10, bVal ); } -sal_Bool SvtSearchOptions::IsMatchRepeatCharMarks() const +bool SvtSearchOptions::IsMatchRepeatCharMarks() const { return pImpl->GetFlag( 11 ); } -void SvtSearchOptions::SetMatchRepeatCharMarks( sal_Bool bVal ) +void SvtSearchOptions::SetMatchRepeatCharMarks( bool bVal ) { pImpl->SetFlag( 11, bVal ); } -sal_Bool SvtSearchOptions::IsMatchVariantFormKanji() const +bool SvtSearchOptions::IsMatchVariantFormKanji() const { return pImpl->GetFlag( 12 ); } -void SvtSearchOptions::SetMatchVariantFormKanji( sal_Bool bVal ) +void SvtSearchOptions::SetMatchVariantFormKanji( bool bVal ) { pImpl->SetFlag( 12, bVal ); } -sal_Bool SvtSearchOptions::IsMatchOldKanaForms() const +bool SvtSearchOptions::IsMatchOldKanaForms() const { return pImpl->GetFlag( 13 ); } -void SvtSearchOptions::SetMatchOldKanaForms( sal_Bool bVal ) +void SvtSearchOptions::SetMatchOldKanaForms( bool bVal ) { pImpl->SetFlag( 13, bVal ); } -sal_Bool SvtSearchOptions::IsMatchDiziDuzu() const +bool SvtSearchOptions::IsMatchDiziDuzu() const { return pImpl->GetFlag( 14 ); } -void SvtSearchOptions::SetMatchDiziDuzu( sal_Bool bVal ) +void SvtSearchOptions::SetMatchDiziDuzu( bool bVal ) { pImpl->SetFlag( 14, bVal ); } -sal_Bool SvtSearchOptions::IsMatchBavaHafa() const +bool SvtSearchOptions::IsMatchBavaHafa() const { return pImpl->GetFlag( 15 ); } -void SvtSearchOptions::SetMatchBavaHafa( sal_Bool bVal ) +void SvtSearchOptions::SetMatchBavaHafa( bool bVal ) { pImpl->SetFlag( 15, bVal ); } -sal_Bool SvtSearchOptions::IsMatchTsithichiDhizi() const +bool SvtSearchOptions::IsMatchTsithichiDhizi() const { return pImpl->GetFlag( 16 ); } -void SvtSearchOptions::SetMatchTsithichiDhizi( sal_Bool bVal ) +void SvtSearchOptions::SetMatchTsithichiDhizi( bool bVal ) { pImpl->SetFlag( 16, bVal ); } -sal_Bool SvtSearchOptions::IsMatchHyuiyuByuvyu() const +bool SvtSearchOptions::IsMatchHyuiyuByuvyu() const { return pImpl->GetFlag( 17 ); } -void SvtSearchOptions::SetMatchHyuiyuByuvyu( sal_Bool bVal ) +void SvtSearchOptions::SetMatchHyuiyuByuvyu( bool bVal ) { pImpl->SetFlag( 17, bVal ); } -sal_Bool SvtSearchOptions::IsMatchSesheZeje() const +bool SvtSearchOptions::IsMatchSesheZeje() const { return pImpl->GetFlag( 18 ); } -void SvtSearchOptions::SetMatchSesheZeje( sal_Bool bVal ) +void SvtSearchOptions::SetMatchSesheZeje( bool bVal ) { pImpl->SetFlag( 18, bVal ); } -sal_Bool SvtSearchOptions::IsMatchIaiya() const +bool SvtSearchOptions::IsMatchIaiya() const { return pImpl->GetFlag( 19 ); } -void SvtSearchOptions::SetMatchIaiya( sal_Bool bVal ) +void SvtSearchOptions::SetMatchIaiya( bool bVal ) { pImpl->SetFlag( 19, bVal ); } -sal_Bool SvtSearchOptions::IsMatchKiku() const +bool SvtSearchOptions::IsMatchKiku() const { return pImpl->GetFlag( 20 ); } -void SvtSearchOptions::SetMatchKiku( sal_Bool bVal ) +void SvtSearchOptions::SetMatchKiku( bool bVal ) { pImpl->SetFlag( 20, bVal ); } -sal_Bool SvtSearchOptions::IsIgnorePunctuation() const +bool SvtSearchOptions::IsIgnorePunctuation() const { return pImpl->GetFlag( 21 ); } -void SvtSearchOptions::SetIgnorePunctuation( sal_Bool bVal ) +void SvtSearchOptions::SetIgnorePunctuation( bool bVal ) { pImpl->SetFlag( 21, bVal ); } -sal_Bool SvtSearchOptions::IsIgnoreWhitespace() const +bool SvtSearchOptions::IsIgnoreWhitespace() const { return pImpl->GetFlag( 22 ); } -void SvtSearchOptions::SetIgnoreWhitespace( sal_Bool bVal ) +void SvtSearchOptions::SetIgnoreWhitespace( bool bVal ) { pImpl->SetFlag( 22, bVal ); } -sal_Bool SvtSearchOptions::IsIgnoreProlongedSoundMark() const +bool SvtSearchOptions::IsIgnoreProlongedSoundMark() const { return pImpl->GetFlag( 23 ); } -void SvtSearchOptions::SetIgnoreProlongedSoundMark( sal_Bool bVal ) +void SvtSearchOptions::SetIgnoreProlongedSoundMark( bool bVal ) { pImpl->SetFlag( 23, bVal ); } -sal_Bool SvtSearchOptions::IsIgnoreMiddleDot() const +bool SvtSearchOptions::IsIgnoreMiddleDot() const { return pImpl->GetFlag( 24 ); } -void SvtSearchOptions::SetIgnoreMiddleDot( sal_Bool bVal ) +void SvtSearchOptions::SetIgnoreMiddleDot( bool bVal ) { pImpl->SetFlag( 24, bVal ); } -sal_Bool SvtSearchOptions::IsNotes() const +bool SvtSearchOptions::IsNotes() const { return pImpl->GetFlag( 25 ); } -void SvtSearchOptions::SetNotes( sal_Bool bVal ) +void SvtSearchOptions::SetNotes( bool bVal ) { pImpl->SetFlag( 25, bVal ); } -sal_Bool SvtSearchOptions::IsIgnoreDiacritics_CTL() const +bool SvtSearchOptions::IsIgnoreDiacritics_CTL() const { return pImpl->GetFlag( 26 ); } -void SvtSearchOptions::SetIgnoreDiacritics_CTL( sal_Bool bVal ) +void SvtSearchOptions::SetIgnoreDiacritics_CTL( bool bVal ) { pImpl->SetFlag( 26, bVal ); } diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 3a33933de9e3..c1203331b0fd 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -98,7 +98,7 @@ using namespace ::com::sun::star::uno ; #define PROPERTYCOUNT 16 #define PROPERTYHANDLE_INVALID -1 -#define CFG_READONLY_DEFAULT sal_False +#define CFG_READONLY_DEFAULT false //_________________________________________________________________________________________________________________ // private declarations! @@ -158,21 +158,21 @@ class SvtSecurityOptions_Impl : public ConfigItem // public interface //--------------------------------------------------------------------------------------------------------- - sal_Bool IsReadOnly ( SvtSecurityOptions::EOption eOption ) const ; + bool IsReadOnly ( SvtSecurityOptions::EOption eOption ) const ; Sequence< OUString > GetSecureURLs ( ) const ; void SetSecureURLs ( const Sequence< OUString >& seqURLList ) ; inline sal_Int32 GetMacroSecurityLevel ( ) const ; void SetMacroSecurityLevel ( sal_Int32 _nLevel ) ; - inline sal_Bool IsMacroDisabled ( ) const ; + inline bool IsMacroDisabled ( ) const ; Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors ( ) const ; void SetTrustedAuthors ( const Sequence< SvtSecurityOptions::Certificate >& rAuthors ) ; - sal_Bool IsOptionSet ( SvtSecurityOptions::EOption eOption ) const ; - sal_Bool SetOption ( SvtSecurityOptions::EOption eOption, sal_Bool bValue ) ; - sal_Bool IsOptionEnabled ( SvtSecurityOptions::EOption eOption ) const ; + bool IsOptionSet ( SvtSecurityOptions::EOption eOption ) const ; + bool SetOption ( SvtSecurityOptions::EOption eOption, bool bValue ) ; + bool IsOptionEnabled ( SvtSecurityOptions::EOption eOption ) const ; /*-****************************************************************************************************//** @short return list of key names of ouer configuration management which represent our module tree @@ -187,57 +187,57 @@ class SvtSecurityOptions_Impl : public ConfigItem @onerror - *//*-*****************************************************************************************************/ - void SetProperty( sal_Int32 nHandle, const Any& rValue, sal_Bool bReadOnly ); + void SetProperty( sal_Int32 nHandle, const Any& rValue, bool bReadOnly ); void LoadAuthors( void ); static sal_Int32 GetHandle( const OUString& rPropertyName ); - bool GetOption( SvtSecurityOptions::EOption eOption, sal_Bool*& rpValue, sal_Bool*& rpRO ); + bool GetOption( SvtSecurityOptions::EOption eOption, bool*& rpValue, bool*& rpRO ); static Sequence< OUString > GetPropertyNames(); Sequence< OUString > m_seqSecureURLs; - sal_Bool m_bSaveOrSend; - sal_Bool m_bSigning; - sal_Bool m_bPrint; - sal_Bool m_bCreatePDF; - sal_Bool m_bRemoveInfo; - sal_Bool m_bRecommendPwd; - sal_Bool m_bCtrlClickHyperlink; - sal_Bool m_bBlockUntrustedRefererLinks; + bool m_bSaveOrSend; + bool m_bSigning; + bool m_bPrint; + bool m_bCreatePDF; + bool m_bRemoveInfo; + bool m_bRecommendPwd; + bool m_bCtrlClickHyperlink; + bool m_bBlockUntrustedRefererLinks; sal_Int32 m_nSecLevel; Sequence< SvtSecurityOptions::Certificate > m_seqTrustedAuthors; - sal_Bool m_bDisableMacros; - - sal_Bool m_bROSecureURLs; - sal_Bool m_bROSaveOrSend; - sal_Bool m_bROSigning; - sal_Bool m_bROPrint; - sal_Bool m_bROCreatePDF; - sal_Bool m_bRORemoveInfo; - sal_Bool m_bRORecommendPwd; - sal_Bool m_bROCtrlClickHyperlink; - sal_Bool m_bROBlockUntrustedRefererLinks; - sal_Bool m_bROSecLevel; - sal_Bool m_bROTrustedAuthors; - sal_Bool m_bRODisableMacros; + bool m_bDisableMacros; + + bool m_bROSecureURLs; + bool m_bROSaveOrSend; + bool m_bROSigning; + bool m_bROPrint; + bool m_bROCreatePDF; + bool m_bRORemoveInfo; + bool m_bRORecommendPwd; + bool m_bROCtrlClickHyperlink; + bool m_bROBlockUntrustedRefererLinks; + bool m_bROSecLevel; + bool m_bROTrustedAuthors; + bool m_bRODisableMacros; // xmlsec05 deprecated EBasicSecurityMode m_eBasicMode; - sal_Bool m_bExecutePlugins; - sal_Bool m_bWarning; - sal_Bool m_bConfirmation; - - sal_Bool m_bROConfirmation; - sal_Bool m_bROWarning; - sal_Bool m_bROExecutePlugins; - sal_Bool m_bROBasicMode; + bool m_bExecutePlugins; + bool m_bWarning; + bool m_bConfirmation; + + bool m_bROConfirmation; + bool m_bROWarning; + bool m_bROExecutePlugins; + bool m_bROBasicMode; public: - sal_Bool IsWarningEnabled() const; - void SetWarningEnabled( sal_Bool bSet ); - sal_Bool IsConfirmationEnabled() const; - void SetConfirmationEnabled( sal_Bool bSet ); - sal_Bool IsExecutePlugins() const; - void SetExecutePlugins( sal_Bool bSet ); + bool IsWarningEnabled() const; + void SetWarningEnabled( bool bSet ); + bool IsConfirmationEnabled() const; + void SetConfirmationEnabled( bool bSet ); + bool IsExecutePlugins() const; + void SetExecutePlugins( bool bSet ); EBasicSecurityMode GetBasicMode ( ) const ; void SetBasicMode ( EBasicSecurityMode eMode ) ; }; @@ -248,17 +248,17 @@ class SvtSecurityOptions_Impl : public ConfigItem SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() :ConfigItem ( ROOTNODE_SECURITY ) ,m_seqSecureURLs ( DEFAULT_SECUREURL ) - ,m_bSaveOrSend ( sal_True ) - ,m_bSigning ( sal_True ) - ,m_bPrint ( sal_True ) - ,m_bCreatePDF ( sal_True ) - ,m_bRemoveInfo ( sal_True ) + ,m_bSaveOrSend ( true ) + ,m_bSigning ( true ) + ,m_bPrint ( true ) + ,m_bCreatePDF ( true ) + ,m_bRemoveInfo ( true ) ,m_bRecommendPwd(false) ,m_bCtrlClickHyperlink(false) ,m_bBlockUntrustedRefererLinks(false) ,m_nSecLevel ( sal_True ) ,m_seqTrustedAuthors ( DEFAULT_TRUSTEDAUTHORS ) - ,m_bDisableMacros ( sal_False ) + ,m_bDisableMacros ( false ) ,m_bROSecureURLs ( CFG_READONLY_DEFAULT ) ,m_bROSaveOrSend ( CFG_READONLY_DEFAULT ) ,m_bROSigning ( CFG_READONLY_DEFAULT ) @@ -270,13 +270,13 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl() ,m_bROBlockUntrustedRefererLinks(CFG_READONLY_DEFAULT) ,m_bROSecLevel ( CFG_READONLY_DEFAULT ) ,m_bROTrustedAuthors ( CFG_READONLY_DEFAULT ) - ,m_bRODisableMacros ( sal_True ) // currently is not intended to be changed + ,m_bRODisableMacros ( true ) // currently is not intended to be changed // xmlsec05 deprecated , m_eBasicMode ( DEFAULT_STAROFFICEBASIC ) - , m_bExecutePlugins ( sal_True ) - , m_bWarning ( sal_True ) - , m_bConfirmation ( sal_True ) + , m_bExecutePlugins ( true ) + , m_bWarning ( true ) + , m_bConfirmation ( true ) , m_bROConfirmation ( CFG_READONLY_DEFAULT ) , m_bROWarning ( CFG_READONLY_DEFAULT ) , m_bROExecutePlugins ( CFG_READONLY_DEFAULT ) @@ -315,7 +315,7 @@ SvtSecurityOptions_Impl::~SvtSecurityOptions_Impl() Commit(); } -void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValue, sal_Bool bRO ) +void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValue, bool bRO ) { switch( nProperty ) { @@ -542,7 +542,7 @@ sal_Int32 SvtSecurityOptions_Impl::GetHandle( const OUString& rName ) return nHandle; } -bool SvtSecurityOptions_Impl::GetOption( SvtSecurityOptions::EOption eOption, sal_Bool*& rpValue, sal_Bool*& rpRO ) +bool SvtSecurityOptions_Impl::GetOption( SvtSecurityOptions::EOption eOption, bool*& rpValue, bool*& rpRO ) { switch( eOption ) { @@ -745,7 +745,7 @@ void SvtSecurityOptions_Impl::Commit() { bDone = !m_bRODisableMacros; if( bDone ) - lValues[ nRealCount ] <<= (sal_Bool)m_bDisableMacros; + lValues[ nRealCount ] <<= m_bDisableMacros; } break; @@ -798,9 +798,9 @@ void SvtSecurityOptions_Impl::Commit() PutProperties( lNames, lValues ); } -sal_Bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOption ) const +bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOption ) const { - sal_Bool bReadonly; + bool bReadonly; switch(eOption) { case SvtSecurityOptions::E_SECUREURLS : @@ -857,7 +857,7 @@ sal_Bool SvtSecurityOptions_Impl::IsReadOnly( SvtSecurityOptions::EOption eOptio default: - bReadonly = sal_True; + bReadonly = true; } return bReadonly; @@ -883,7 +883,7 @@ inline sal_Int32 SvtSecurityOptions_Impl::GetMacroSecurityLevel() const return m_nSecLevel; } -inline sal_Bool SvtSecurityOptions_Impl::IsMacroDisabled() const +inline bool SvtSecurityOptions_Impl::IsMacroDisabled() const { return m_bDisableMacros; } @@ -918,11 +918,11 @@ void SvtSecurityOptions_Impl::SetTrustedAuthors( const Sequence< SvtSecurityOpti } } -sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOption ) const +bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOption ) const { - sal_Bool* pValue; - sal_Bool* pRO; - sal_Bool bRet = sal_False; + bool* pValue; + bool* pRO; + bool bRet = false; if( ( const_cast< SvtSecurityOptions_Impl* >( this ) )->GetOption( eOption, pValue, pRO ) ) bRet = *pValue; @@ -930,17 +930,17 @@ sal_Bool SvtSecurityOptions_Impl::IsOptionSet( SvtSecurityOptions::EOption eOpti return bRet; } -sal_Bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption, sal_Bool bValue ) +bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption, bool bValue ) { - sal_Bool* pValue; - sal_Bool* pRO; - sal_Bool bRet = sal_False; + bool* pValue; + bool* pRO; + bool bRet = false; if( GetOption( eOption, pValue, pRO ) ) { if( !*pRO ) { - bRet = sal_True; + bRet = true; if( *pValue != bValue ) { *pValue = bValue; @@ -952,11 +952,11 @@ sal_Bool SvtSecurityOptions_Impl::SetOption( SvtSecurityOptions::EOption eOption return bRet; } -sal_Bool SvtSecurityOptions_Impl::IsOptionEnabled( SvtSecurityOptions::EOption eOption ) const +bool SvtSecurityOptions_Impl::IsOptionEnabled( SvtSecurityOptions::EOption eOption ) const { - sal_Bool* pValue; - sal_Bool* pRO; - sal_Bool bRet = sal_False; + bool* pValue; + bool* pRO; + bool bRet = false; if( ( const_cast< SvtSecurityOptions_Impl* >( this ) )->GetOption( eOption, pValue, pRO ) ) bRet = !*pRO; @@ -1030,7 +1030,7 @@ SvtSecurityOptions::~SvtSecurityOptions() } } -sal_Bool SvtSecurityOptions::IsReadOnly( EOption eOption ) const +bool SvtSecurityOptions::IsReadOnly( EOption eOption ) const { MutexGuard aGuard( GetInitMutex() ); return m_pDataContainer->IsReadOnly(eOption); @@ -1100,7 +1100,7 @@ void SvtSecurityOptions::SetMacroSecurityLevel( sal_Int32 _nLevel ) m_pDataContainer->SetMacroSecurityLevel( _nLevel ); } -sal_Bool SvtSecurityOptions::IsMacroDisabled() const +bool SvtSecurityOptions::IsMacroDisabled() const { MutexGuard aGuard( GetInitMutex() ); return m_pDataContainer->IsMacroDisabled(); @@ -1166,12 +1166,12 @@ void SvtSecurityOptions_Impl::SetBasicMode( EBasicSecurityMode eMode ) } } -sal_Bool SvtSecurityOptions_Impl::IsExecutePlugins() const +bool SvtSecurityOptions_Impl::IsExecutePlugins() const { return m_bExecutePlugins; } -void SvtSecurityOptions_Impl::SetExecutePlugins( sal_Bool bSet ) +void SvtSecurityOptions_Impl::SetExecutePlugins( bool bSet ) { DBG_ASSERT(!m_bROExecutePlugins, "SvtSecurityOptions_Impl::SetExecutePlugins()\nYou tried to write on a readonly value!\n"); if (!m_bROExecutePlugins && m_bExecutePlugins!=bSet) @@ -1181,12 +1181,12 @@ void SvtSecurityOptions_Impl::SetExecutePlugins( sal_Bool bSet ) } } -sal_Bool SvtSecurityOptions_Impl::IsWarningEnabled() const +bool SvtSecurityOptions_Impl::IsWarningEnabled() const { return m_bWarning; } -void SvtSecurityOptions_Impl::SetWarningEnabled( sal_Bool bSet ) +void SvtSecurityOptions_Impl::SetWarningEnabled( bool bSet ) { DBG_ASSERT(!m_bROWarning, "SvtSecurityOptions_Impl::SetWarningEnabled()\nYou tried to write on a readonly value!\n"); if (!m_bROWarning && m_bWarning!=bSet) @@ -1196,12 +1196,12 @@ void SvtSecurityOptions_Impl::SetWarningEnabled( sal_Bool bSet ) } } -sal_Bool SvtSecurityOptions_Impl::IsConfirmationEnabled() const +bool SvtSecurityOptions_Impl::IsConfirmationEnabled() const { return m_bConfirmation; } -void SvtSecurityOptions_Impl::SetConfirmationEnabled( sal_Bool bSet ) +void SvtSecurityOptions_Impl::SetConfirmationEnabled( bool bSet ) { DBG_ASSERT(!m_bROConfirmation, "SvtSecurityOptions_Impl::SetConfirmationEnabled()\nYou tried to write on a readonly value!\n"); if (!m_bROConfirmation && m_bConfirmation!=bSet) @@ -1212,37 +1212,37 @@ void SvtSecurityOptions_Impl::SetConfirmationEnabled( sal_Bool bSet ) } -sal_Bool SvtSecurityOptions::IsExecutePlugins() const +bool SvtSecurityOptions::IsExecutePlugins() const { MutexGuard aGuard( GetInitMutex() ); return m_pDataContainer->IsExecutePlugins(); } -void SvtSecurityOptions::SetExecutePlugins( sal_Bool bSet ) +void SvtSecurityOptions::SetExecutePlugins( bool bSet ) { MutexGuard aGuard( GetInitMutex() ); m_pDataContainer->SetExecutePlugins( bSet ); } -sal_Bool SvtSecurityOptions::IsWarningEnabled() const +bool SvtSecurityOptions::IsWarningEnabled() const { MutexGuard aGuard( GetInitMutex() ); return m_pDataContainer->IsWarningEnabled(); } -void SvtSecurityOptions::SetWarningEnabled( sal_Bool bSet ) +void SvtSecurityOptions::SetWarningEnabled( bool bSet ) { MutexGuard aGuard( GetInitMutex() ); m_pDataContainer->SetWarningEnabled( bSet ); } -sal_Bool SvtSecurityOptions::IsConfirmationEnabled() const +bool SvtSecurityOptions::IsConfirmationEnabled() const { MutexGuard aGuard( GetInitMutex() ); return m_pDataContainer->IsConfirmationEnabled(); } -void SvtSecurityOptions::SetConfirmationEnabled( sal_Bool bSet ) +void SvtSecurityOptions::SetConfirmationEnabled( bool bSet ) { MutexGuard aGuard( GetInitMutex() ); m_pDataContainer->SetConfirmationEnabled( bSet ); diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index 7c140bca3aaf..5f17b08f4e99 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -94,7 +94,7 @@ public: OUString GetFullName () const; - sal_Bool IsTokenReadonly (sal_uInt16 nToken) const; + bool IsTokenReadonly (sal_uInt16 nToken) const; OUString GetToken (sal_uInt16 nToken) const; void SetToken (sal_uInt16 nToken, OUString const& rNewToken); void Notify (); @@ -208,7 +208,7 @@ void SvtUserOptions::Impl::Notify () NotifyListeners(0); } -sal_Bool SvtUserOptions::Impl::IsTokenReadonly (sal_uInt16 nToken) const +bool SvtUserOptions::Impl::IsTokenReadonly (sal_uInt16 nToken) const { if (nToken < nOptionNameCount) { @@ -221,7 +221,7 @@ sal_Bool SvtUserOptions::Impl::IsTokenReadonly (sal_uInt16 nToken) const else { SAL_WARN("unotools.config", "SvtUserOptions::Impl::IsTokenReadonly(): invalid token"); - return sal_False; + return false; } } @@ -278,7 +278,7 @@ OUString SvtUserOptions::GetCustomerNumber () const { return GetToken(USER_OPT_C void SvtUserOptions::SetCustomerNumber (OUString const& sToken) { SetToken(USER_OPT_CUSTOMERNUMBER, sToken); } -sal_Bool SvtUserOptions::IsTokenReadonly (sal_uInt16 nToken) const +bool SvtUserOptions::IsTokenReadonly (sal_uInt16 nToken) const { osl::MutexGuard aGuard(GetInitMutex()); return pImpl->IsTokenReadonly(nToken); diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 43ac37df1406..124eaef77334 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -47,7 +47,7 @@ #define DEFAULT_WINDOWSTATE OUString() #define DEFAULT_USERDATA css::uno::Sequence< css::beans::NamedValue >() #define DEFAULT_PAGEID 0 -#define DEFAULT_VISIBLE sal_False +#define DEFAULT_VISIBLE false //#define DEBUG_VIEWOPTIONS @@ -111,7 +111,7 @@ class IMPL_TViewData m_nPageID = DEFAULT_PAGEID ; m_bVisible = DEFAULT_VISIBLE ; - m_bDefault = sal_True ; + m_bDefault = true ; } //--------------------------------------------------------------------------------------------------------- @@ -119,7 +119,7 @@ class IMPL_TViewData void setWindowState( const OUString& sValue ) { m_bDefault = ( - ( m_bDefault == sal_True ) && + m_bDefault && ( sValue == DEFAULT_WINDOWSTATE ) ); m_sWindowState = sValue; @@ -129,7 +129,7 @@ class IMPL_TViewData void setUserData( const css::uno::Sequence< css::beans::NamedValue >& lValue ) { m_bDefault = ( - ( m_bDefault == sal_True ) && + m_bDefault && ( lValue == DEFAULT_USERDATA ) ); m_lUserData = lValue; @@ -139,17 +139,17 @@ class IMPL_TViewData void setPageID( sal_Int32 nValue ) { m_bDefault = ( - ( m_bDefault == sal_True ) && + m_bDefault && ( nValue == DEFAULT_PAGEID ) ); m_nPageID = nValue; } //--------------------------------------------------------------------------------------------------------- - void setVisible( sal_Bool bValue ) + void setVisible( bool bValue ) { m_bDefault = ( - ( m_bDefault == sal_True ) && + m_bDefault && ( bValue == DEFAULT_VISIBLE ) ); m_bVisible = bValue; @@ -160,7 +160,7 @@ class IMPL_TViewData OUString getWindowState() { return m_sWindowState; } css::uno::Sequence< css::beans::NamedValue > getUserData () { return m_lUserData ; } sal_Int32 getPageID () { return m_nPageID ; } - sal_Bool getVisible () { return m_bVisible ; } + bool getVisible () { return m_bVisible ; } //--------------------------------------------------------------------------------------------------------- // special operation for easy access on user data @@ -170,9 +170,9 @@ class IMPL_TViewData // we change UserData in every case! // a) we change already existing item // or b) we add a new one - m_bDefault = sal_False; + m_bDefault = false; - sal_Bool bExist = sal_False; + bool bExist = false; sal_Int32 nCount = m_lUserData.getLength(); // change it, if it already exist ... @@ -181,13 +181,13 @@ class IMPL_TViewData if( m_lUserData[nStep].Name == sName ) { m_lUserData[nStep].Value = aValue ; - bExist = sal_True; + bExist = true; break; } } // ... or create new list item - if( bExist == sal_False ) + if( !bExist ) { m_lUserData.realloc( nCount+1 ); m_lUserData[nCount].Name = sName ; @@ -215,15 +215,15 @@ class IMPL_TViewData //--------------------------------------------------------------------------------------------------------- // check for default items - sal_Bool isDefault() { return m_bDefault; } + bool isDefault() { return m_bDefault; } private: OUString m_sWindowState ; css::uno::Sequence< css::beans::NamedValue > m_lUserData ; sal_Int32 m_nPageID ; - sal_Bool m_bVisible ; + bool m_bVisible ; - sal_Bool m_bDefault ; + bool m_bDefault ; }; struct IMPL_TStringHashCode @@ -258,8 +258,8 @@ class SvtViewOptionsBase_Impl SvtViewOptionsBase_Impl ( const OUString& sList ); virtual ~SvtViewOptionsBase_Impl ( ); - sal_Bool Exists ( const OUString& sName ); - sal_Bool Delete ( const OUString& sName ); + bool Exists ( const OUString& sName ); + bool Delete ( const OUString& sName ); OUString GetWindowState ( const OUString& sName ); void SetWindowState ( const OUString& sName , const OUString& sState ); @@ -271,7 +271,7 @@ class SvtViewOptionsBase_Impl sal_Int32 nID ); State GetVisible ( const OUString& sName ); void SetVisible ( const OUString& sName , - sal_Bool bVisible ); + bool bVisible ); css::uno::Any GetUserItem ( const OUString& sName , const OUString& sItem ); void SetUserItem ( const OUString& sName , @@ -281,7 +281,7 @@ class SvtViewOptionsBase_Impl //------------------------------------------------------------------------------------------------------------- private: css::uno::Reference< css::uno::XInterface > impl_getSetNode( const OUString& sNode , - sal_Bool bCreateIfMissing); + bool bCreateIfMissing); //------------------------------------------------------------------------------------------------------------- private: @@ -378,9 +378,9 @@ SvtViewOptionsBase_Impl::~SvtViewOptionsBase_Impl() @return true , if item exist false, otherwise *//*-*************************************************************************************************************/ -sal_Bool SvtViewOptionsBase_Impl::Exists( const OUString& sName ) +bool SvtViewOptionsBase_Impl::Exists( const OUString& sName ) { - sal_Bool bExists = sal_False; + bool bExists = false; try { @@ -389,7 +389,7 @@ sal_Bool SvtViewOptionsBase_Impl::Exists( const OUString& sName ) } catch(const css::uno::Exception& ex) { - bExists = sal_False; + bExists = false; SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex) } @@ -406,25 +406,25 @@ sal_Bool SvtViewOptionsBase_Impl::Exists( const OUString& sName ) @return true , if item not exist(!) or could be deleted (should be the same!) false, otherwise *//*-*************************************************************************************************************/ -sal_Bool SvtViewOptionsBase_Impl::Delete( const OUString& sName ) +bool SvtViewOptionsBase_Impl::Delete( const OUString& sName ) { #ifdef DEBUG_VIEWOPTIONS ++m_nWriteCount; #endif - sal_Bool bDeleted = sal_False; + bool bDeleted = false; try { css::uno::Reference< css::container::XNameContainer > xSet(m_xSet, css::uno::UNO_QUERY_THROW); xSet->removeByName(sName); - bDeleted = sal_True; + bDeleted = true; ::comphelper::ConfigurationHelper::flush(m_xRoot); } catch(const css::container::NoSuchElementException&) - { bDeleted = sal_True; } + { bDeleted = true; } catch(const css::uno::Exception& ex) { - bDeleted = sal_False; + bDeleted = false; SVTVIEWOPTIONS_LOG_UNEXPECTED_EXCEPTION(ex) } @@ -450,7 +450,7 @@ OUString SvtViewOptionsBase_Impl::GetWindowState( const OUString& sName ) try { css::uno::Reference< css::beans::XPropertySet > xNode( - impl_getSetNode(sName, sal_False), + impl_getSetNode(sName, false), css::uno::UNO_QUERY); if (xNode.is()) xNode->getPropertyValue(PROPERTY_WINDOWSTATE) >>= sWindowState; @@ -475,7 +475,7 @@ void SvtViewOptionsBase_Impl::SetWindowState( const OUString& sName , try { css::uno::Reference< css::beans::XPropertySet > xNode( - impl_getSetNode(sName, sal_True), + impl_getSetNode(sName, true), css::uno::UNO_QUERY_THROW); xNode->setPropertyValue(PROPERTY_WINDOWSTATE, css::uno::makeAny(sState)); ::comphelper::ConfigurationHelper::flush(m_xRoot); @@ -496,7 +496,7 @@ css::uno::Sequence< css::beans::NamedValue > SvtViewOptionsBase_Impl::GetUserDat try { css::uno::Reference< css::container::XNameAccess > xNode( - impl_getSetNode(sName, sal_False), + impl_getSetNode(sName, false), css::uno::UNO_QUERY); // no _THROW ! because we dont create missing items here. So we have to live with zero references .-) css::uno::Reference< css::container::XNameAccess > xUserData; if (xNode.is()) @@ -537,7 +537,7 @@ void SvtViewOptionsBase_Impl::SetUserData( const OUString& try { css::uno::Reference< css::container::XNameAccess > xNode( - impl_getSetNode(sName, sal_True), + impl_getSetNode(sName, true), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameContainer > xUserData; xNode->getByName(PROPERTY_USERDATA) >>= xUserData; @@ -574,7 +574,7 @@ css::uno::Any SvtViewOptionsBase_Impl::GetUserItem( const OUString& sName , try { css::uno::Reference< css::container::XNameAccess > xNode( - impl_getSetNode(sName, sal_False), + impl_getSetNode(sName, false), css::uno::UNO_QUERY); css::uno::Reference< css::container::XNameAccess > xUserData; if (xNode.is()) @@ -605,7 +605,7 @@ void SvtViewOptionsBase_Impl::SetUserItem( const OUString& sName , try { css::uno::Reference< css::container::XNameAccess > xNode( - impl_getSetNode(sName, sal_True), + impl_getSetNode(sName, true), css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameContainer > xUserData; xNode->getByName(PROPERTY_USERDATA) >>= xUserData; @@ -635,7 +635,7 @@ sal_Int32 SvtViewOptionsBase_Impl::GetPageID( const OUString& sName ) try { css::uno::Reference< css::beans::XPropertySet > xNode( - impl_getSetNode(sName, sal_False), + impl_getSetNode(sName, false), css::uno::UNO_QUERY); if (xNode.is()) xNode->getPropertyValue(PROPERTY_PAGEID) >>= nID; @@ -660,7 +660,7 @@ void SvtViewOptionsBase_Impl::SetPageID( const OUString& sName , try { css::uno::Reference< css::beans::XPropertySet > xNode( - impl_getSetNode(sName, sal_True), + impl_getSetNode(sName, true), css::uno::UNO_QUERY_THROW); xNode->setPropertyValue(PROPERTY_PAGEID, css::uno::makeAny(nID)); ::comphelper::ConfigurationHelper::flush(m_xRoot); @@ -682,11 +682,11 @@ SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUStri try { css::uno::Reference< css::beans::XPropertySet > xNode( - impl_getSetNode(sName, sal_False), + impl_getSetNode(sName, false), css::uno::UNO_QUERY); if (xNode.is()) { - sal_Bool bVisible = sal_False; + bool bVisible = false; if (xNode->getPropertyValue(PROPERTY_VISIBLE) >>= bVisible) { eState = bVisible ? STATE_TRUE : STATE_FALSE; @@ -703,7 +703,7 @@ SvtViewOptionsBase_Impl::State SvtViewOptionsBase_Impl::GetVisible( const OUStri //***************************************************************************************************************** void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName , - sal_Bool bVisible ) + bool bVisible ) { #ifdef DEBUG_VIEWOPTIONS ++m_nWriteCount; @@ -712,7 +712,7 @@ void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName , try { css::uno::Reference< css::beans::XPropertySet > xNode( - impl_getSetNode(sName, sal_True), + impl_getSetNode(sName, true), css::uno::UNO_QUERY_THROW); xNode->setPropertyValue(PROPERTY_VISIBLE, css::uno::makeAny(bVisible)); ::comphelper::ConfigurationHelper::flush(m_xRoot); @@ -734,7 +734,7 @@ void SvtViewOptionsBase_Impl::SetVisible( const OUString& sName , @return - *//*-*************************************************************************************************************/ css::uno::Reference< css::uno::XInterface > SvtViewOptionsBase_Impl::impl_getSetNode( const OUString& sNode , - sal_Bool bCreateIfMissing) + bool bCreateIfMissing) { css::uno::Reference< css::uno::XInterface > xNode; @@ -883,12 +883,12 @@ SvtViewOptions::~SvtViewOptions() //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtViewOptions::Exists() const +bool SvtViewOptions::Exists() const { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); - sal_Bool bExists = sal_False; + bool bExists = false; switch( m_eViewType ) { case E_DIALOG : { @@ -914,12 +914,12 @@ sal_Bool SvtViewOptions::Exists() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtViewOptions::Delete() +bool SvtViewOptions::Delete() { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); - sal_Bool bState = sal_False; + bool bState = false; switch( m_eViewType ) { case E_DIALOG : { @@ -1039,7 +1039,7 @@ void SvtViewOptions::SetPageID( sal_Int32 nID ) //***************************************************************************************************************** // public method //***************************************************************************************************************** -sal_Bool SvtViewOptions::IsVisible() const +bool SvtViewOptions::IsVisible() const { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); @@ -1048,7 +1048,7 @@ sal_Bool SvtViewOptions::IsVisible() const // These call isn't allowed for dialogs, tab-dialogs or tab-pages! OSL_ENSURE( !(m_eViewType==E_DIALOG||m_eViewType==E_TABDIALOG||m_eViewType==E_TABPAGE), "SvtViewOptions::IsVisible()\nCall not allowed for Dialogs, TabDialogs or TabPages! I do nothing!\n" ); - sal_Bool bState = sal_False; + bool bState = false; if( m_eViewType == E_WINDOW ) bState = m_pDataContainer_Windows->GetVisible( m_sViewName ) == SvtViewOptionsBase_Impl::STATE_TRUE; @@ -1058,7 +1058,7 @@ sal_Bool SvtViewOptions::IsVisible() const //***************************************************************************************************************** // public method //***************************************************************************************************************** -void SvtViewOptions::SetVisible( sal_Bool bState ) +void SvtViewOptions::SetVisible( bool bState ) { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); diff --git a/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx index bd598d2fc4c8..a63f7956ef05 100644 --- a/unotools/source/config/xmlaccelcfg.cxx +++ b/unotools/source/config/xmlaccelcfg.cxx @@ -108,7 +108,7 @@ throw( SAXException, RuntimeException ) throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); } else - m_bAcceleratorMode = sal_True; + m_bAcceleratorMode = true; } else if ( aElementName == ELEMENT_ACCELERATORITEM ) { @@ -122,7 +122,7 @@ throw( SAXException, RuntimeException ) else { // read accelerator item - m_bItemCloseExpected = sal_True; + m_bItemCloseExpected = true; SvtAcceleratorConfigItem aItem; diff --git a/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx index 0382e768ab16..d8a1a8b4e638 100644 --- a/unotools/source/i18n/intlwrapper.cxx +++ b/unotools/source/i18n/intlwrapper.cxx @@ -60,7 +60,7 @@ void IntlWrapper::ImplNewLocaleData() const } -void IntlWrapper::ImplNewCollator( sal_Bool bCaseSensitive ) const +void IntlWrapper::ImplNewCollator( bool bCaseSensitive ) const { CollatorWrapper* p = new CollatorWrapper( m_xContext ); if ( bCaseSensitive ) diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 9a7439109815..3ef632634b36 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -72,8 +72,8 @@ LocaleDataWrapper::LocaleDataWrapper( m_xContext( rxContext ), xLD( LocaleData::create(rxContext) ), maLanguageTag( rLanguageTag ), - bLocaleDataItemValid( sal_False ), - bReservedWordValid( sal_False ) + bLocaleDataItemValid( false ), + bReservedWordValid( false ) { invalidateData(); } @@ -85,8 +85,8 @@ LocaleDataWrapper::LocaleDataWrapper( m_xContext( comphelper::getProcessComponentContext() ), xLD( LocaleData::create(m_xContext) ), maLanguageTag( rLanguageTag ), - bLocaleDataItemValid( sal_False ), - bReservedWordValid( sal_False ) + bLocaleDataItemValid( false ), + bReservedWordValid( false ) { invalidateData(); } @@ -128,13 +128,13 @@ void LocaleDataWrapper::invalidateData() { for (sal_Int32 j=0; j<LocaleItem::COUNT; ++j) aLocaleItem[j] = ""; - bLocaleDataItemValid = sal_False; + bLocaleDataItemValid = false; } if ( bReservedWordValid ) { for ( sal_Int16 j=0; j<reservedWords::COUNT; ++j ) aReservedWord[j] = ""; - bReservedWordValid = sal_False; + bReservedWordValid = false; } xDefaultCalendar.reset(); if (aGrouping.getLength()) @@ -361,7 +361,7 @@ void LocaleDataWrapper::getOneLocaleItemImpl( sal_Int16 nItem ) if ( !bLocaleDataItemValid ) { aLocaleDataItem = getLocaleItem(); - bLocaleDataItemValid = sal_True; + bLocaleDataItemValid = true; } switch ( nItem ) { @@ -427,7 +427,7 @@ void LocaleDataWrapper::getOneReservedWordImpl( sal_Int16 nWord ) if ( !bReservedWordValid ) { aReservedWordSeq = getReservedWord(); - bReservedWordValid = sal_True; + bReservedWordValid = true; } DBG_ASSERT( nWord < aReservedWordSeq.getLength(), "getOneReservedWordImpl: which one?" ); if ( nWord < aReservedWordSeq.getLength() ) @@ -617,13 +617,13 @@ void LocaleDataWrapper::scanCurrFormatImpl( const OUString& rCode, const sal_Unicode* const pStop = pStr + rCode.getLength(); const sal_Unicode* p = pStr + nStart; int nInSection = 0; - sal_Bool bQuote = sal_False; + bool bQuote = false; while ( p < pStop ) { if ( bQuote ) { if ( *p == '"' && *(p-1) != '\\' ) - bQuote = sal_False; + bQuote = false; } else { @@ -631,7 +631,7 @@ void LocaleDataWrapper::scanCurrFormatImpl( const OUString& rCode, { case '"' : if ( pStr == p || *(p-1) != '\\' ) - bQuote = sal_True; + bQuote = true; break; case '-' : if (!nInSection && nSign == -1) @@ -1217,8 +1217,8 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const sal_Unicode* pCopyBu sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, - sal_Int64 nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep, - sal_Bool bTrailingZeros ) const + sal_Int64 nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, + bool bTrailingZeros ) const { sal_Unicode aNumBuf[64]; sal_Unicode* pNumBuf; @@ -1302,11 +1302,11 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf, { pBuf = ImplAddString( pBuf, getNumDecimalSep() ); - sal_Bool bNullEnd = sal_True; + bool bNullEnd = true; while ( i < nNumLen ) { if ( *pNumBuf != '0' ) - bNullEnd = sal_False; + bNullEnd = false; *pBuf = *pNumBuf; pBuf++; @@ -1373,7 +1373,7 @@ OUString LocaleDataWrapper::getDate( const Date& rDate ) const } -OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const +OUString LocaleDataWrapper::getTime( const Time& rTime, bool bSec, bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); //!TODO: leading zeros et al @@ -1403,8 +1403,8 @@ OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCal, - sal_Int16 nDisplayDayOfWeek, sal_Bool bDayOfMonthWithLeadingZero, - sal_Int16 nDisplayMonth, sal_Bool bTwoDigitYear ) const + sal_Int16 nDisplayDayOfWeek, bool bDayOfMonthWithLeadingZero, + sal_Int16 nDisplayMonth, bool bTwoDigitYear ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); using namespace ::com::sun::star::i18n; @@ -1447,7 +1447,7 @@ OUString LocaleDataWrapper::getLongDate( const Date& rDate, CalendarWrapper& rCa } -OUString LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, sal_Bool b100Sec ) const +OUString LocaleDataWrapper::getDuration( const Time& rTime, bool bSec, bool b100Sec ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); sal_Unicode aBuf[128]; @@ -1493,7 +1493,7 @@ inline size_t ImplGetNumberStringLengthGuess( const LocaleDataWrapper& rLoc, sal OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, - sal_Bool bUseThousandSep, sal_Bool bTrailingZeros ) const + bool bUseThousandSep, bool bTrailingZeros ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); sal_Unicode aBuf[128]; // big enough for 64-bit long and crazy grouping @@ -1512,7 +1512,7 @@ OUString LocaleDataWrapper::getNum( sal_Int64 nNumber, sal_uInt16 nDecimals, } OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, - const OUString& rCurrencySymbol, sal_Bool bUseThousandSep ) const + const OUString& rCurrencySymbol, bool bUseThousandSep ) const { ::utl::ReadWriteGuard aGuard( aMutex, ::utl::ReadWriteGuardMode::nBlockCritical ); sal_Unicode aBuf[192]; @@ -1529,18 +1529,18 @@ OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, new sal_Unicode[ rCurrencySymbol.getLength() + nGuess + 20 ]); sal_Unicode* pBuf = pBuffer; - sal_Bool bNeg; + bool bNeg; if ( nNumber < 0 ) { - bNeg = sal_True; + bNeg = true; nNumber *= -1; } else - bNeg = sal_False; + bNeg = false; // convert number sal_Unicode* pEndNumBuf = ImplAddFormatNum( pNumBuffer, nNumber, nDecimals, - bUseThousandSep, sal_True ); + bUseThousandSep, true ); sal_Int32 nNumLen = (sal_Int32)(sal_uLong)(pEndNumBuf-pNumBuffer); // replace zeros with zero character @@ -1548,7 +1548,7 @@ OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, { sal_Unicode* pTempBuf; sal_uInt16 i; - sal_Bool bZero = sal_True; + bool bZero = true; pTempBuf = pNumBuffer+nNumLen-nDecimals; i = 0; @@ -1556,7 +1556,7 @@ OUString LocaleDataWrapper::getCurr( sal_Int64 nNumber, sal_uInt16 nDecimals, { if ( *pTempBuf != '0' ) { - bZero = sal_False; + bZero = false; break; } diff --git a/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx index 0bc602e73127..08327250fe8f 100644 --- a/unotools/source/i18n/readwritemutexguard.cxx +++ b/unotools/source/i18n/readwritemutexguard.cxx @@ -82,7 +82,7 @@ ReadWriteGuard::~ReadWriteGuard() void ReadWriteGuard::changeReadToWrite() { - sal_Bool bOk = !(nMode & (ReadWriteGuardMode::nWrite | ReadWriteGuardMode::nBlockCritical)); + bool bOk = !(nMode & (ReadWriteGuardMode::nWrite | ReadWriteGuardMode::nBlockCritical)); DBG_ASSERT( bOk, "ReadWriteGuard::changeReadToWrite: can't" ); if ( bOk ) { @@ -97,7 +97,7 @@ void ReadWriteGuard::changeReadToWrite() nMode |= ReadWriteGuardMode::nWrite; // wait for any other read to complete // TODO: set up a waiting thread instead of a loop - sal_Bool bWait = sal_True; + bool bWait = true; do { rMutex.pMutex->acquire(); diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index c0f8dded5d03..c6b04807a216 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.cxx @@ -33,7 +33,7 @@ AtomProvider::~AtomProvider() { } -int AtomProvider::getAtom( const OUString& rString, sal_Bool bCreate ) +int AtomProvider::getAtom( const OUString& rString, bool bCreate ) { ::boost::unordered_map< OUString, int, OUStringHash >::iterator it = m_aAtomMap.find( rString ); if( it != m_aAtomMap.end() ) @@ -66,7 +66,7 @@ MultiAtomProvider::~MultiAtomProvider() delete it->second; } -int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, sal_Bool bCreate ) +int MultiAtomProvider::getAtom( int atomClass, const OUString& rString, bool bCreate ) { ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.find( atomClass ); diff --git a/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx index 4c3f6df9fb4e..af477672d1eb 100644 --- a/unotools/source/misc/datetime.cxx +++ b/unotools/source/misc/datetime.cxx @@ -33,7 +33,7 @@ namespace const OUString& rString, T /*nMin*/ = -1, T /*nMax*/ = -1) { - sal_Bool bNeg = sal_False; + bool bNeg = false; rValue = 0; sal_Int32 nPos = 0L; @@ -45,7 +45,7 @@ namespace if( nPos < nLen && '-' == rString[nPos] ) { - bNeg = sal_True; + bNeg = true; nPos++; } diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index 79502b36abb1..8014c978d82e 100644 --- a/unotools/source/misc/mediadescriptor.cxx +++ b/unotools/source/misc/mediadescriptor.cxx @@ -329,13 +329,13 @@ MediaDescriptor::MediaDescriptor(const css::uno::Sequence< css::beans::PropertyV { } -sal_Bool MediaDescriptor::isStreamReadOnly() const +bool MediaDescriptor::isStreamReadOnly() const { static OUString CONTENTSCHEME_FILE( "file" ); static OUString CONTENTPROP_ISREADONLY( "IsReadOnly" ); - static sal_Bool READONLY_FALLBACK = sal_False; + static bool READONLY_FALLBACK = false; - sal_Bool bReadOnly = READONLY_FALLBACK; + bool bReadOnly = READONLY_FALLBACK; // check for explicit readonly state const_iterator pIt = find(MediaDescriptor::PROP_READONLY()); @@ -348,13 +348,13 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const // streams based on post data are readonly by definition pIt = find(MediaDescriptor::PROP_POSTDATA()); if (pIt != end()) - return sal_True; + return true; // A XStream capsulate XInputStream and XOutputStream ... // If it exists - the file must be open in read/write mode! pIt = find(MediaDescriptor::PROP_STREAM()); if (pIt != end()) - return sal_False; + return false; // Only file system content provider is able to provide XStream // so for this content impossibility to create XStream triggers @@ -370,7 +370,7 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const aScheme = xId->getContentProviderScheme(); if (aScheme.equalsIgnoreAsciiCase(CONTENTSCHEME_FILE)) - bReadOnly = sal_True; + bReadOnly = true; else { ::ucbhelper::Content aContent(xContent, css::uno::Reference< css::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext()); @@ -473,25 +473,25 @@ void MediaDescriptor::clearComponentDataEntry( const OUString& rName ) return aEncryptionData; } -sal_Bool MediaDescriptor::addInputStream() +bool MediaDescriptor::addInputStream() { - return impl_addInputStream( sal_True ); + return impl_addInputStream( true ); } /*-----------------------------------------------*/ -sal_Bool MediaDescriptor::addInputStreamOwnLock() +bool MediaDescriptor::addInputStreamOwnLock() { return impl_addInputStream( officecfg::Office::Common::Misc::UseDocumentSystemFileLocking::get()); } /*-----------------------------------------------*/ -sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile ) +bool MediaDescriptor::impl_addInputStream( bool bLockFile ) { // check for an already existing stream item first const_iterator pIt = find(MediaDescriptor::PROP_INPUTSTREAM()); if (pIt != end()) - return sal_True; + return true; try { @@ -524,7 +524,7 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile ) } } -sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData ) +bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference< css::io::XInputStream >& _rxPostData ) throw(::com::sun::star::uno::RuntimeException) { if ( !_rxPostData.is() ) @@ -586,15 +586,15 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference if ( !xResultStream.is() ) { OSL_FAIL( "no valid reply to the HTTP-Post" ); - return sal_False; + return false; } (*this)[MediaDescriptor::PROP_INPUTSTREAM()] <<= xResultStream; - return sal_True; + return true; } /*-----------------------------------------------*/ -sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool bLockFile ) +bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFile ) throw(::com::sun::star::uno::RuntimeException) { OUString referer(getUnpackedValueOrDefault(PROP_REFERRER(), OUString())); @@ -631,7 +631,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool "unotools.misc", "caught ContentCreationException \"" << e.Message << "\" while opening <" << sURL << ">"); - return sal_False; // TODO error handling + return false; // TODO error handling } catch(const css::uno::Exception& e) { @@ -639,7 +639,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool "unotools.misc", "caught Exception \"" << e.Message << "\" while opening <" << sURL << ">"); - return sal_False; // TODO error handling + return false; // TODO error handling } // try to open the file in read/write mode @@ -649,13 +649,13 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool css::uno::Reference< css::io::XStream > xStream ; css::uno::Reference< css::io::XInputStream > xInputStream; - sal_Bool bReadOnly = sal_False; - sal_Bool bModeRequestedExplicitly = sal_False; + bool bReadOnly = false; + bool bModeRequestedExplicitly = false; const_iterator pIt = find(MediaDescriptor::PROP_READONLY()); if (pIt != end()) { pIt->second >>= bReadOnly; - bModeRequestedExplicitly = sal_True; + bModeRequestedExplicitly = true; } if ( !bReadOnly && bLockFile ) @@ -682,7 +682,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool "unotools.misc", "caught Exception \"" << e.Message << "\" while opening <" << sURL << ">"); - return sal_False; + return false; } xStream.clear(); xInputStream.clear(); @@ -707,13 +707,13 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool // so for this content impossibility to create XStream triggers // switch to readonly mode in case of opening with locking on if( bLockFile && aScheme.equalsIgnoreAsciiCase("file") ) - bReadOnly = sal_True; + bReadOnly = true; else { - sal_Bool bRequestReadOnly = bReadOnly; + bool bRequestReadOnly = bReadOnly; aContent.getPropertyValue("IsReadOnly") >>= bReadOnly; if ( bReadOnly && !bRequestReadOnly && bModeRequestedExplicitly ) - return sal_False; // the document is explicitly requested with WRITEABLE mode + return false; // the document is explicitly requested with WRITEABLE mode } } catch(const css::uno::RuntimeException&) @@ -742,7 +742,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool "unotools.misc", "caught Exception \"" << e.Message << "\" while opening <" << sURL << ">"); - return sal_False; + return false; } } diff --git a/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx index 4798af6d825f..e54c2455e04c 100644 --- a/unotools/source/streaming/streamwrap.cxx +++ b/unotools/source/streaming/streamwrap.cxx @@ -35,14 +35,14 @@ DBG_NAME(OInputStreamWrapper) //------------------------------------------------------------------ OInputStreamWrapper::OInputStreamWrapper( SvStream& _rStream ) :m_pSvStream(&_rStream) - ,m_bSvStreamOwner(sal_False) + ,m_bSvStreamOwner(false) { DBG_CTOR(OInputStreamWrapper,NULL); } //------------------------------------------------------------------ -OInputStreamWrapper::OInputStreamWrapper( SvStream* pStream, sal_Bool bOwner ) +OInputStreamWrapper::OInputStreamWrapper( SvStream* pStream, bool bOwner ) :m_pSvStream( pStream ) ,m_bSvStreamOwner( bOwner ) { @@ -163,11 +163,11 @@ void OInputStreamWrapper::checkError() const //------------------------------------------------------------------------------ OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream& _rStream) { - SetStream( &_rStream, sal_False ); + SetStream( &_rStream, false ); } //------------------------------------------------------------------------------ -OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream* _pStream, sal_Bool _bOwner) +OSeekableInputStreamWrapper::OSeekableInputStreamWrapper(SvStream* _pStream, bool _bOwner) { SetStream( _pStream, _bOwner ); } @@ -318,7 +318,7 @@ sal_Int64 SAL_CALL OSeekableOutputStreamWrapper::getLength( ) throw (IOExceptio //------------------------------------------------------------------------------ OStreamWrapper::OStreamWrapper(SvStream& _rStream) { - SetStream( &_rStream, sal_False ); + SetStream( &_rStream, false ); } //------------------------------------------------------------------------------ diff --git a/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx index ca98e23b915f..c11ae0d5ebcf 100644 --- a/unotools/source/ucbhelper/XTempFile.hxx +++ b/unotools/source/ucbhelper/XTempFile.hxx @@ -50,12 +50,12 @@ protected: ::utl::TempFile* mpTempFile; ::osl::Mutex maMutex; SvStream* mpStream; - sal_Bool mbRemoveFile; - sal_Bool mbInClosed; - sal_Bool mbOutClosed; + bool mbRemoveFile; + bool mbInClosed; + bool mbOutClosed; sal_Int64 mnCachedPos; - sal_Bool mbHasCachedPos; + bool mbHasCachedPos; void checkError () const; void checkConnected (); diff --git a/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx index 25b2adfdbfbf..665f6526d42f 100644 --- a/unotools/source/ucbhelper/localfilehelper.cxx +++ b/unotools/source/ucbhelper/localfilehelper.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::ucb; namespace utl { -sal_Bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn ) +bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const OUString& rBaseURL, OUString& rReturn ) { rReturn = ""; @@ -50,13 +50,13 @@ sal_Bool LocalFileHelper::ConvertSystemPathToURL( const OUString& rName, const O } catch ( ::com::sun::star::uno::RuntimeException& ) { - return sal_False; + return false; } return !rReturn.isEmpty(); } -sal_Bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUString& rReturn ) +bool LocalFileHelper::ConvertURLToSystemPath( const OUString& rName, OUString& rReturn ) { rReturn = ""; Reference< XUniversalContentBroker > pBroker( @@ -111,13 +111,13 @@ bool LocalFileHelper::ConvertURLToPhysicalName(const OUString& rName, OUString& return !rReturn.isEmpty(); } -sal_Bool LocalFileHelper::IsLocalFile(const OUString& rName) +bool LocalFileHelper::IsLocalFile(const OUString& rName) { OUString aTmp; return ConvertURLToPhysicalName(rName, aTmp); } -sal_Bool LocalFileHelper::IsFileContent(const OUString& rName) +bool LocalFileHelper::IsFileContent(const OUString& rName) { OUString aTmp; return ConvertURLToSystemPath(rName, aTmp); @@ -125,7 +125,7 @@ sal_Bool LocalFileHelper::IsFileContent(const OUString& rName) typedef ::std::vector< OUString* > StringList_Impl; -::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, sal_Bool bFolder ) +::com::sun::star::uno::Sequence < OUString > LocalFileHelper::GetFolderContents( const OUString& rFolder, bool bFolder ) { StringList_Impl* pFiles = NULL; try diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx index 0d8920bf9e64..904781a18f22 100644 --- a/unotools/source/ucbhelper/progresshandlerwrap.cxx +++ b/unotools/source/ucbhelper/progresshandlerwrap.cxx @@ -31,16 +31,16 @@ ProgressHandlerWrap::ProgressHandlerWrap( ::com::sun::star::uno::Reference< ::co { } -sal_Bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum ) +bool getStatusFromAny_Impl( const Any& aAny, OUString& aText, sal_Int32& nNum ) { - sal_Bool bNumIsSet = sal_False; + bool bNumIsSet = false; Sequence< Any > aSetList; if( ( aAny >>= aSetList ) && aSetList.getLength() ) for( int ind = 0; ind < aSetList.getLength(); ind++ ) { if( !bNumIsSet && ( aSetList[ind] >>= nNum ) ) - bNumIsSet = sal_True; + bNumIsSet = true; else aText.isEmpty() && ( aSetList[ind] >>= aText ); } diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index 42f482d5608a..84e38ae6f75a 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -51,7 +51,7 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo UcbLockBytesRef xLockBytes; if ( eOpenMode & STREAM_WRITE ) { - sal_Bool bTruncate = ( eOpenMode & STREAM_TRUNC ) != 0; + bool bTruncate = ( eOpenMode & STREAM_TRUNC ) != 0; if ( bTruncate ) { try @@ -60,7 +60,7 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo ::ucbhelper::Content aCnt( rFileName, Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aCnt.executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString("delete"), makeAny( true ) ); } catch ( const CommandAbortedException& ) @@ -193,7 +193,7 @@ SvStream* UcbStreamHelper::CreateStream( Reference < XStream > xStream ) return pStream; } -SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream, sal_Bool bCloseStream ) +SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream, bool bCloseStream ) { SvStream* pStream = NULL; UcbLockBytesRef xLockBytes = UcbLockBytes::CreateInputLockBytes( xStream ); @@ -210,7 +210,7 @@ SvStream* UcbStreamHelper::CreateStream( Reference < XInputStream > xStream, sal return pStream; }; -SvStream* UcbStreamHelper::CreateStream( Reference < XStream > xStream, sal_Bool bCloseStream ) +SvStream* UcbStreamHelper::CreateStream( Reference < XStream > xStream, bool bCloseStream ) { SvStream* pStream = NULL; if ( xStream->getOutputStream().is() ) diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx index 8c4c6f0e0827..3b31e529e789 100644 --- a/unotools/source/ucbhelper/xtempfile.cxx +++ b/unotools/source/ucbhelper/xtempfile.cxx @@ -31,11 +31,11 @@ OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentCont , static_cast< Implements >( IMPLEMENTS_PROPERTY_SET | IMPLEMENTS_FAST_PROPERTY_SET | IMPLEMENTS_PROPERTY_ACCESS ) , com::sun::star::uno::Sequence< OUString >() ) , mpStream( NULL ) -, mbRemoveFile( sal_True ) -, mbInClosed( sal_False ) -, mbOutClosed( sal_False ) +, mbRemoveFile( true ) +, mbInClosed( false ) +, mbOutClosed( false ) , mnCachedPos( 0 ) -, mbHasCachedPos( sal_False ) +, mbHasCachedPos( false ) { mpTempFile = new ::utl::TempFile; @@ -179,7 +179,7 @@ throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css // usually that means that the stream was read till the end // TODO/LATER: it is better to get rid of this optimization by avoiding using of multiple temporary files ( there should be only one temporary file? ) mnCachedPos = mpStream->Tell(); - mbHasCachedPos = sal_True; + mbHasCachedPos = true; mpStream = NULL; if ( mpTempFile ) @@ -249,7 +249,7 @@ throw ( css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeE if ( mbInClosed ) throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); - mbInClosed = sal_True; + mbInClosed = true; if ( mbOutClosed ) { @@ -297,13 +297,13 @@ throw ( css::io::NotConnectedException, css::io::BufferSizeExceededException, cs if ( mbOutClosed ) throw css::io::NotConnectedException ( OUString(), const_cast < css::uno::XWeak * > ( static_cast < const css::uno::XWeak * > (this ) ) ); - mbOutClosed = sal_True; + mbOutClosed = true; // TODO/LATER: it is better to get rid of this optimization by avoiding using of multiple temporary files ( there should be only one temporary file? ) if ( mpStream ) { mnCachedPos = mpStream->Tell(); - mbHasCachedPos = sal_True; + mbHasCachedPos = true; mpStream = NULL; if ( mpTempFile ) @@ -339,7 +339,7 @@ void OTempFileService::checkConnected () mpStream->Seek( sal::static_int_cast<sal_Size>(mnCachedPos) ); if ( mpStream->SvStream::GetError () == ERRCODE_NONE ) { - mbHasCachedPos = sal_False; + mbHasCachedPos = false; mnCachedPos = 0; } else diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx index 214c586912f0..137cd8accb27 100644 --- a/uui/source/fltdlg.cxx +++ b/uui/source/fltdlg.cxx @@ -208,7 +208,7 @@ OUString FilterDialog::impl_buildUIFileName( const OUString& sName ) { OUString sShortName( sName ); - if( ::utl::LocalFileHelper::ConvertURLToSystemPath( sName, sShortName ) == sal_True ) + if( ::utl::LocalFileHelper::ConvertURLToSystemPath( sName, sShortName ) ) { // it's a system file ... build short name by using osl functionality } diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx index 4644b7ab89af..ea5b443cc0a3 100644 --- a/vcl/generic/fontmanager/fontcache.cxx +++ b/vcl/generic/fontmanager/fontcache.cxx @@ -352,7 +352,7 @@ void FontCache::read() pFont->m_nFamilyName = pAtoms->getAtom( ATOM_FAMILYNAME, OUString( pLine, nIndex, RTL_TEXTENCODING_UTF8 ), - sal_True ); + true ); while( nIndex < nLen ) { sal_Int32 nLastIndex = nIndex+1; @@ -361,7 +361,7 @@ void FontCache::read() if( nIndex - nLastIndex ) { OUString aAlias( pLine+nLastIndex, nIndex-nLastIndex, RTL_TEXTENCODING_UTF8 ); - pFont->m_aAliases.push_back( pAtoms->getAtom( ATOM_FAMILYNAME, aAlias, sal_True ) ); + pFont->m_aAliases.push_back( pAtoms->getAtom( ATOM_FAMILYNAME, aAlias, true ) ); } } aStream.ReadLine( aLine ); @@ -388,7 +388,7 @@ void FontCache::read() continue; } int nCollEntry = atoi( pLine ); - pFont->m_nPSName = pAtoms->getAtom( ATOM_PSNAME, OUString( pLine + nTokenPos[1], nTokenPos[2]-nTokenPos[1]-1, RTL_TEXTENCODING_UTF8 ), sal_True ); + pFont->m_nPSName = pAtoms->getAtom( ATOM_PSNAME, OUString( pLine + nTokenPos[1], nTokenPos[2]-nTokenPos[1]-1, RTL_TEXTENCODING_UTF8 ), true ); pFont->m_eItalic = (FontItalic)atoi( pLine+nTokenPos[2] ); pFont->m_eWeight = (FontWeight)atoi( pLine+nTokenPos[3] ); pFont->m_eWidth = (FontWidth)atoi( pLine+nTokenPos[4] ); diff --git a/vcl/generic/fontmanager/fontconfig.cxx b/vcl/generic/fontmanager/fontconfig.cxx index 4ff925aff0bc..536dd769904c 100644 --- a/vcl/generic/fontmanager/fontconfig.cxx +++ b/vcl/generic/fontmanager/fontconfig.cxx @@ -575,7 +575,7 @@ void PrintFontManager::countFontconfigFonts( boost::unordered_map<OString, int, continue; } - int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), RTL_TEXTENCODING_UTF8 ), sal_True ); + int nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), RTL_TEXTENCODING_UTF8 ), true ); PrintFont* pUpdate = aFonts.front(); std::list<PrintFont*>::const_iterator second_font = aFonts.begin(); ++second_font; diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 4f4d99b95a90..004f17e30ddb 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -321,7 +321,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, // PSName OUString aPSName( OStringToOUString( pInfo->gfi->fontName, RTL_TEXTENCODING_ISO_8859_1 ) ); - m_nPSName = pProvider->getAtom( ATOM_PSNAME, aPSName, sal_True ); + m_nPSName = pProvider->getAtom( ATOM_PSNAME, aPSName, true ); // family name (if not already set) OUString aFamily; @@ -335,7 +335,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, aFamily = aFamily.getToken( 0, '-', nIndex ); } familyNameOverride( aPSName, aFamily ); - m_nFamilyName = pProvider->getAtom( ATOM_FAMILYNAME, aFamily, sal_True ); + m_nFamilyName = pProvider->getAtom( ATOM_FAMILYNAME, aFamily, true ); } else aFamily = pProvider->getString( ATOM_FAMILYNAME, m_nFamilyName ); @@ -1163,7 +1163,7 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const { if( aNames.begin() != aNames.end() ) { - pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, aNames.front(), sal_True ); + pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, aNames.front(), true ); aNames.pop_front(); } else @@ -1176,14 +1176,14 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const if ( dotIndex == -1 ) dotIndex = pTTFontFile->m_aFontFile.getLength(); - pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( pTTFontFile->m_aFontFile.copy( 0, dotIndex ), aEncoding ), sal_True ); + pFont->m_nFamilyName = m_pAtoms->getAtom( ATOM_FAMILYNAME, OStringToOUString( pTTFontFile->m_aFontFile.copy( 0, dotIndex ), aEncoding ), true ); } } for( ::std::list< OUString >::iterator it = aNames.begin(); it != aNames.end(); ++it ) { if( !it->isEmpty() ) { - int nAlias = m_pAtoms->getAtom( ATOM_FAMILYNAME, *it, sal_True ); + int nAlias = m_pAtoms->getAtom( ATOM_FAMILYNAME, *it, true ); if( nAlias != pFont->m_nFamilyName ) { std::list< int >::const_iterator al_it; @@ -1204,7 +1204,7 @@ bool PrintFontManager::analyzeTrueTypeFile( PrintFont* pFont ) const OUString(aInfo.psname, rtl_str_getLength(aInfo.psname), aEncoding) : m_pAtoms->getString(ATOM_FAMILYNAME, pFont->m_nFamilyName); // poor font does not have a postscript name - pFont->m_nPSName = m_pAtoms->getAtom( ATOM_PSNAME, sPSName, sal_True ); + pFont->m_nPSName = m_pAtoms->getAtom( ATOM_PSNAME, sPSName, true ); switch( aInfo.weight ) { diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx index 3ae073b28fa4..d78ed1e67637 100644 --- a/vcl/source/app/dbggui.cxx +++ b/vcl/source/app/dbggui.cxx @@ -988,7 +988,7 @@ IMPL_LINK( DbgDialog, ClickHdl, Button*, pButton ) strncpy( pData->aExclClassFilter, aData.aExclClassFilter, sizeof( pData->aExclClassFilter ) ); strncpy( pData->aInclFilter, aData.aInclFilter, sizeof( pData->aInclFilter ) ); strncpy( pData->aExclFilter, aData.aExclFilter, sizeof( pData->aExclFilter ) ); - if ( maBoldAppFont.GetSavedValue() != maBoldAppFont.IsChecked() ) + if ( maBoldAppFont.GetSavedValue() != TriState(maBoldAppFont.IsChecked()) ) { AllSettings aSettings = Application::GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 605d42d62055..67102049c8fd 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -1188,7 +1188,7 @@ OUString DateFormatter::ImplGetDateAsText( const Date& rDate, { case XTDATEF_SYSTEM_LONG: { - return ImplGetLocaleDataWrapper().getLongDate( rDate, GetCalendarWrapper(), 1, sal_False, 1, !bShowCentury ); + return ImplGetLocaleDataWrapper().getLongDate( rDate, GetCalendarWrapper(), 1, false, 1, !bShowCentury ); } case XTDATEF_SHORT_DDMMYY: case XTDATEF_SHORT_DDMMYYYY: @@ -2653,7 +2653,7 @@ TimeField::TimeField( Window* pParent, WinBits nWinStyle ) : maLast( GetMax() ) { SetField( this ); - SetText( ImplGetLocaleDataWrapper().getTime( maFieldTime, sal_False, sal_False ) ); + SetText( ImplGetLocaleDataWrapper().getTime( maFieldTime, false, false ) ); Reformat(); } @@ -2666,7 +2666,7 @@ TimeField::TimeField( Window* pParent, const ResId& rResId ) : WinBits nStyle = ImplInitRes( rResId ); SpinField::ImplInit( pParent, nStyle ); SetField( this ); - SetText( ImplGetLocaleDataWrapper().getTime( maFieldTime, sal_False, sal_False ) ); + SetText( ImplGetLocaleDataWrapper().getTime( maFieldTime, false, false ) ); ImplLoadRes( rResId ); if ( !(nStyle & WB_HIDE ) ) @@ -2835,7 +2835,7 @@ TimeBox::TimeBox( Window* pParent, WinBits nWinStyle ) : ComboBox( pParent, nWinStyle ) { SetField( this ); - SetText( ImplGetLocaleDataWrapper().getTime( maFieldTime, sal_False, sal_False ) ); + SetText( ImplGetLocaleDataWrapper().getTime( maFieldTime, false, false ) ); Reformat(); } diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a4a29e96a9c0..d250c4c38b92 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -281,7 +281,7 @@ RTFDocumentImpl::RTFDocumentImpl(uno::Reference<uno::XComponentContext> const& x m_nListPictureId(0) { OSL_ASSERT(xInputStream.is()); - m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream, sal_True)); + m_pInStream.reset(utl::UcbStreamHelper::CreateStream(xInputStream, true)); m_xModelFactory.set(m_xDstDoc, uno::UNO_QUERY); |