[Libreoffice-commits] core.git: chart2/qa cui/source framework/source include/svtools include/unotools include/vcl linguistic/source sc/source sd/source sfx2/source svtools/source svx/source sw/inc sw/qa sw/source unotools/source uui/source vcl/generic vcl/source writerfilter/source
Stephan Bergmann
sbergman at redhat.com
Wed Feb 19 12:47:45 CET 2014
chart2/qa/extras/chart2export.cxx | 2
cui/source/dialogs/postdlg.cxx | 2
cui/source/options/connpooloptions.cxx | 2
cui/source/options/fontsubs.cxx | 2
cui/source/options/optbasic.cxx | 12
cui/source/options/optfltr.cxx | 8
cui/source/options/optgdlg.cxx | 24 -
cui/source/options/opthtml.cxx | 14
cui/source/options/optjava.cxx | 6
cui/source/options/optmemory.cxx | 2
cui/source/options/optsave.cxx | 18
cui/source/options/optupdt.cxx | 8
cui/source/options/securityoptions.hxx | 16
cui/source/tabpages/autocdlg.cxx | 4
cui/source/tabpages/chardlg.cxx | 6
cui/source/tabpages/page.cxx | 6
cui/source/tabpages/paragrph.cxx | 16
cui/source/tabpages/swpossizetabpage.cxx | 4
framework/source/services/substitutepathvars.cxx | 2
include/svtools/accessibilityoptions.hxx | 2
include/svtools/optionsdrawinglayer.hxx | 2
include/unotools/atom.hxx | 4
include/unotools/cmdoptions.hxx | 4
include/unotools/configitem.hxx | 18
include/unotools/confignode.hxx | 38 -
include/unotools/configpaths.hxx | 4
include/unotools/configvaluecontainer.hxx | 4
include/unotools/eventcfg.hxx | 4
include/unotools/fltrcfg.hxx | 94 ++--
include/unotools/fontoptions.hxx | 8
include/unotools/intlwrapper.hxx | 6
include/unotools/lingucfg.hxx | 104 ++---
include/unotools/localedatawrapper.hxx | 32 -
include/unotools/localfilehelper.hxx | 10
include/unotools/localisationoptions.hxx | 2
include/unotools/mediadescriptor.hxx | 14
include/unotools/misccfg.hxx | 12
include/unotools/moduleoptions.hxx | 22 -
include/unotools/optionsdlg.hxx | 6
include/unotools/printwarningoptions.hxx | 18
include/unotools/saveopt.hxx | 64 +--
include/unotools/searchopt.hxx | 110 ++---
include/unotools/securityoptions.hxx | 16
include/unotools/streamwrap.hxx | 10
include/unotools/ucbstreamhelper.hxx | 4
include/unotools/useroptions.hxx | 2
include/unotools/viewoptions.hxx | 8
include/unotools/xmlaccelcfg.hxx | 8
include/vcl/button.hxx | 4
linguistic/source/convdiclist.cxx | 2
linguistic/source/dlistimp.cxx | 2
linguistic/source/lngsvcmgr.cxx | 2
sc/source/ui/dbgui/scuiasciiopt.cxx | 2
sc/source/ui/optdlg/tpprint.cxx | 6
sc/source/ui/optdlg/tpview.cxx | 46 +-
sd/source/core/CustomAnimationPreset.cxx | 2
sd/source/ui/dlg/dlgass.cxx | 4
sd/source/ui/dlg/prntopts.cxx | 22 -
sd/source/ui/dlg/tpoption.cxx | 28 -
sd/source/ui/view/DocumentRenderer.cxx | 2
sfx2/source/dialog/alienwarn.cxx | 4
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/mgetempl.cxx | 2
sfx2/source/dialog/printopt.cxx | 8
sfx2/source/doc/SfxDocumentMetaData.cxx | 2
svtools/source/config/accessibilityoptions.cxx | 2
svtools/source/config/optionsdrawinglayer.cxx | 2
svtools/source/misc/imageresourceaccess.cxx | 2
svx/source/form/datanavi.cxx | 2
svx/source/inc/datanavi.hxx | 2
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 2
svx/source/xml/xmlgrhlp.cxx | 2
sw/inc/fmturl.hxx | 4
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 2
sw/source/core/fields/docufld.cxx | 4
sw/source/core/layout/atrfrm.cxx | 2
sw/source/filter/ww8/rtfexportfilter.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/optload.cxx | 4
sw/source/ui/config/optpage.cxx | 8
sw/source/ui/frmdlg/frmpage.cxx | 18
sw/source/ui/frmdlg/wrap.cxx | 2
sw/source/ui/misc/pggrid.cxx | 8
sw/source/ui/table/rowht.cxx | 2
sw/source/ui/table/tabledlg.cxx | 8
sw/source/ui/utlui/uitool.cxx | 2
unotools/source/accessibility/accessiblerelationsethelper.cxx | 10
unotools/source/accessibility/accessiblestatesethelper.cxx | 10
unotools/source/config/bootstrap.cxx | 10
unotools/source/config/cmdoptions.cxx | 24 -
unotools/source/config/configitem.cxx | 72 +--
unotools/source/config/confignode.cxx | 42 +-
unotools/source/config/configpaths.cxx | 6
unotools/source/config/configvaluecontainer.cxx | 10
unotools/source/config/eventcfg.cxx | 12
unotools/source/config/extendedsecurityoptions.cxx | 4
unotools/source/config/fltrcfg.cxx | 120 ++---
unotools/source/config/fontoptions.cxx | 36 -
unotools/source/config/itemholder1.cxx | 4
unotools/source/config/lingucfg.cxx | 128 +++---
unotools/source/config/localisationoptions.cxx | 10
unotools/source/config/misccfg.cxx | 42 +-
unotools/source/config/moduleoptions.cxx | 134 +++---
unotools/source/config/optionsdlg.cxx | 26 -
unotools/source/config/printwarningoptions.cxx | 58 +-
unotools/source/config/saveopt.cxx | 202 +++++-----
unotools/source/config/searchopt.cxx | 150 +++----
unotools/source/config/securityoptions.cxx | 176 ++++----
unotools/source/config/useroptions.cxx | 8
unotools/source/config/viewoptions.cxx | 94 ++--
unotools/source/config/xmlaccelcfg.cxx | 4
unotools/source/i18n/intlwrapper.cxx | 2
unotools/source/i18n/localedatawrapper.cxx | 54 +-
unotools/source/i18n/readwritemutexguard.cxx | 4
unotools/source/misc/atom.cxx | 4
unotools/source/misc/datetime.cxx | 4
unotools/source/misc/mediadescriptor.cxx | 50 +-
unotools/source/streaming/streamwrap.cxx | 10
unotools/source/ucbhelper/XTempFile.hxx | 8
unotools/source/ucbhelper/localfilehelper.cxx | 12
unotools/source/ucbhelper/progresshandlerwrap.cxx | 6
unotools/source/ucbhelper/ucbstreamhelper.cxx | 8
unotools/source/ucbhelper/xtempfile.cxx | 18
uui/source/fltdlg.cxx | 2
vcl/generic/fontmanager/fontcache.cxx | 6
vcl/generic/fontmanager/fontconfig.cxx | 2
vcl/generic/fontmanager/fontmanager.cxx | 12
vcl/source/app/dbggui.cxx | 2
vcl/source/control/field2.cxx | 8
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
130 files changed, 1306 insertions(+), 1306 deletions(-)
New commits:
commit 973b47a336b239cc92f1789013d28e5bd55f859f
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Feb 19 12:30:34 2014 +0100
unotools: sal_Bool -> bool
Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index b7b3668..8c7e7b3 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 adc1a5d..b32599d 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 56adb93..988ddd8 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 b44a347..eb66e8b 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 7cddcc6..366ac53 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 3b78b3b..951ac05 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 2aedac0..45e0d32 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 1e0957f..1ae7df3 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 5e28451..e5ec7b8 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 9e8976d..3eca0b5 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 ce66f09..27d8da1 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 a6a9eec..20990c3 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 7ff25c4..ba2f379 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 9394bbe..a438073 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 110e0b1..d2b44bb 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 46b9901..d801568 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 fd5da1a..f318968 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 bacecec..464ed48 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 8daf83d..8f480f8 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 ed3d857..09dd382 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 fe328cd..e8e4d2e 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 617fc42..7a64584 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 43b85a2..a8bfba2 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 9f3c86c..d278ccb 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 32c7706..295569d 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 20f3a20..c8a1f1b3 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 b095d23..5e3b738 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 d228865..765c38d 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 3933123..f246783 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 8a6f21e..39c881f 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 6df81e9..a28598c 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 eb9c99d..8ce4961 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 3f206f4..17050d7 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 a059e5e..6f69580 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 ccc1fb6..d359c37 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 1eb6b7a..1cd2063 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 5cdfade..30c52ef 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 6ea2a3f..4ef1236 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 ec6f2ed..aae2cf0 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 8a2835f..c83a1ed 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 5e7a9c2..8247e4b 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 d76a02f..6b05a2c 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 3304354..3e906b2 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 7060742..7b98646 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 def9853..b6c3a1c 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 e61394a..5a32cc0 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 a262648..89d2d20 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 eac3342..25fea26 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 17a2228..fae2d1d 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 623253b..158c99e 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 9e2d8d8..b398ed8 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::
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list