summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-04-03 15:45:26 +0000
committerKurt Zenker <kz@openoffice.org>2008-04-03 15:45:26 +0000
commit198cd1f1983318a0403814a028985155d962bb05 (patch)
tree005768d3899e550ce68d6f25390eee4e84a6b8b0 /svx
parent56d069fd47a5938ef2aa611f855d41fee30f3538 (diff)
INTEGRATION: CWS vcl87 (1.25.38); FILE MERGED
2008/03/12 09:35:58 pl 1.25.38.2: RESYNC: (1.25-1.26); FILE MERGED 2008/02/26 16:54:32 pl 1.25.38.1: #i86358# remove unused code
Diffstat (limited to 'svx')
0 files changed, 0 insertions, 0 deletions
re/diff/cui/source/options/connpooloptions.cxx?id=34002c4e5cf68ac0c98c3922c653c9ea8b898207'>cui/source/options/connpooloptions.cxx8
-rw-r--r--cui/source/options/connpooloptions.hxx2
-rw-r--r--cui/source/options/dbregister.cxx6
-rw-r--r--cui/source/options/fontsubs.cxx4
-rw-r--r--cui/source/options/fontsubs.hxx2
-rw-r--r--cui/source/options/optaboutconfig.cxx6
-rw-r--r--cui/source/options/optaboutconfig.hxx2
-rw-r--r--cui/source/options/optaccessibility.cxx4
-rw-r--r--cui/source/options/optaccessibility.hxx2
-rw-r--r--cui/source/options/optasian.cxx4
-rw-r--r--cui/source/options/optbasic.cxx16
-rw-r--r--cui/source/options/optbasic.hxx2
-rw-r--r--cui/source/options/optchart.cxx4
-rw-r--r--cui/source/options/optchart.hxx2
-rw-r--r--cui/source/options/optcolor.cxx4
-rw-r--r--cui/source/options/optcolor.hxx2
-rw-r--r--cui/source/options/optctl.cxx14
-rw-r--r--cui/source/options/optctl.hxx2
-rw-r--r--cui/source/options/optfltr.cxx8
-rw-r--r--cui/source/options/optfltr.hxx4
-rw-r--r--cui/source/options/optgdlg.cxx8
-rw-r--r--cui/source/options/optgdlg.hxx6
-rw-r--r--cui/source/options/optgenrl.cxx8
-rw-r--r--cui/source/options/opthtml.cxx4
-rw-r--r--cui/source/options/opthtml.hxx2
-rw-r--r--cui/source/options/optinet2.cxx34
-rw-r--r--cui/source/options/optinet2.hxx8
-rw-r--r--cui/source/options/optjava.cxx16
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/options/optjsearch.cxx44
-rw-r--r--cui/source/options/optjsearch.hxx2
-rw-r--r--cui/source/options/optlingu.cxx6
-rw-r--r--cui/source/options/optmemory.cxx6
-rw-r--r--cui/source/options/optmemory.hxx2
-rw-r--r--cui/source/options/optpath.cxx4
-rw-r--r--cui/source/options/optsave.cxx20
-rw-r--r--cui/source/options/optsave.hxx2
-rw-r--r--cui/source/options/optupdt.cxx12
-rw-r--r--cui/source/options/optupdt.hxx2
-rw-r--r--cui/source/options/personalization.cxx2
-rw-r--r--cui/source/options/personalization.hxx2
41 files changed, 146 insertions, 144 deletions
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index b966c033176e..b00df7aad0d6 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -382,23 +382,23 @@ namespace offapp
}
- sal_Bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
+ bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
{
commitTimeoutField();
- sal_Bool bModified = sal_False;
+ bool bModified = false;
// the enabled flag
if (m_pEnablePooling->GetSavedValue() != TriState(m_pEnablePooling->IsChecked()))
{
_rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED);
- bModified = sal_True;
+ bModified = true;
}
// the settings for the single drivers
if (m_pDriverList->isModified())
{
_rSet.Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS);
- bModified = sal_True;
+ bModified = true;
}
return bModified;
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 535c8d5f6c93..27fef9a06487 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -56,7 +56,7 @@ namespace offapp
protected:
virtual bool Notify( NotifyEvent& _rNEvt );
- virtual sal_Bool FillItemSet(SfxItemSet& _rSet);
+ virtual bool FillItemSet(SfxItemSet& _rSet);
virtual void Reset(const SfxItemSet& _rSet);
virtual void ActivatePage( const SfxItemSet& _rSet);
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 4ea648141bd0..d71d7927054f 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -182,10 +182,10 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
-sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
+bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
{
// the settings for the single drivers
- sal_Bool bModified = sal_False;
+ bool bModified = false;
DatabaseRegistrations aRegistrations;
sal_uLong nCount = pPathBox->GetEntryCount();
for ( sal_uLong i = 0; i < nCount; ++i )
@@ -202,7 +202,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
if ( m_nOldCount != aRegistrations.size() || m_bModified )
{
rCoreSet.Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER);
- bModified = sal_True;
+ bModified = true;
}
return bModified;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 84a4868c6639..86fe6b513ae3 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -150,7 +150,7 @@ SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent,
return new SvxFontSubstTabPage(pParent, rAttrSet);
}
-sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
+bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
{
pConfig->ClearSubstitutions();// remove all entries
@@ -189,7 +189,7 @@ sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
boost::optional< OUString >(sFontName), batch);
batch->commit();
- return sal_False;
+ return false;
}
void SvxFontSubstTabPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 16301725b623..bbc891555c9e 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -96,7 +96,7 @@ class SvxFontSubstTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+ virtual bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index df029f024529..0ac465444a23 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -187,9 +187,9 @@ void CuiAboutConfigTabPage::Reset(/* const SfxItemSet&*/ )
m_pPrefBox->SetUpdateMode(true);
}
-sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ )
+bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ )
{
- sal_Bool bModified = sal_False;
+ bool bModified = false;
std::vector< boost::shared_ptr< Prop_Impl > >::iterator pIter;
for( pIter = m_vectorOfModified.begin() ; pIter != m_vectorOfModified.end(); ++pIter )
@@ -198,7 +198,7 @@ sal_Bool CuiAboutConfigTabPage::FillItemSet(/* SfxItemSet&*/ )
Reference< XNameReplace > xNameReplace( xUpdateAccess, UNO_QUERY_THROW );
xNameReplace->replaceByName( (*pIter)->Property, (*pIter)->Value );
- bModified = sal_True;
+ bModified = true;
Reference< util::XChangesBatch > xChangesBatch( xUpdateAccess, UNO_QUERY_THROW );
xChangesBatch->commitChanges();
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 135fc21e39c5..e9a11d4a37b2 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -63,7 +63,7 @@ public:
void Reset(/* const SfxItemSet&*/ );
void FillItems(const com::sun::star::uno::Reference<com::sun::star::container::XNameAccess>& xNameAccess);
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess( const OUString& sNodePath, sal_Bool bUpdate );
- virtual sal_Bool FillItemSet( /* SfxItemSet& rSet*/ );
+ virtual bool FillItemSet( /* SfxItemSet& rSet*/ );
virtual Size GetOptimalSize() const;
};
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 47a2f5c14aea..88c2a2aea1cd 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -66,7 +66,7 @@ SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxIt
return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet);
}
-sal_Bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
{
//aConfig.Set... from controls
@@ -91,7 +91,7 @@ sal_Bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
Application::MergeSystemSettings( aAllSettings );
Application::SetSettings(aAllSettings);
- return sal_False;
+ return false;
}
void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index c004d23a6b45..400d3ebe1f74 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -46,7 +46,7 @@ public:
virtual ~SvxAccessibilityOptionsTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+ virtual bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 2681de82301e..953e742629a8 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -160,7 +160,7 @@ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttr
return new SvxAsianLayoutPage(pParent, rAttrSet);
}
-sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
+bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
{
if(m_pCharKerningRB->IsChecked() != m_pCharKerningRB->GetSavedValue())
{
@@ -212,7 +212,7 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
}
eLastUsedLanguageTypeForForbiddenCharacters = m_pLanguageLB->GetSelectLanguage();
- return sal_False;
+ return false;
}
void SvxAsianLayoutPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 366ac536d0a7..bd8c9bd3c5ab 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -66,16 +66,16 @@ void SvxBasicIDEOptionsPage::LoadConfig()
pUseExtendedTypesChk->Check( bExtended );
}
-sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
+bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
{
- sal_Bool bModified = sal_False;
+ bool bModified = false;
boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
if( TriState(pAutocloseProcChk->IsChecked()) != pAutocloseProcChk->GetSavedValue() )
{
officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set( pAutocloseProcChk->IsChecked(), batch );
CodeCompleteOptions::SetProcedureAutoCompleteOn( pAutocloseProcChk->IsChecked() );
- bModified = sal_True;
+ bModified = true;
}
if( TriState(pCodeCompleteChk->IsChecked()) != pCodeCompleteChk->GetSavedValue() )
@@ -83,35 +83,35 @@ sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
//boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set( pCodeCompleteChk->IsChecked(), batch );
CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk->IsChecked() );
- bModified = sal_True;
+ bModified = true;
}
if( TriState(pUseExtendedTypesChk->IsChecked()) != pUseExtendedTypesChk->GetSavedValue() )
{
officecfg::Office::BasicIDE::Autocomplete::UseExtended::set( pUseExtendedTypesChk->IsChecked(), batch );
CodeCompleteOptions::SetExtendedTypeDeclaration( pUseExtendedTypesChk->IsChecked() );
- bModified = sal_True;
+ bModified = true;
}
if( TriState(pAutocloseParenChk->IsChecked()) != pAutocloseParenChk->GetSavedValue() )
{
officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::set( pAutocloseParenChk->IsChecked(), batch );
CodeCompleteOptions::SetAutoCloseParenthesisOn( pAutocloseParenChk->IsChecked() );
- bModified = sal_True;
+ bModified = true;
}
if( TriState(pAutocloseQuotesChk->IsChecked()) != pAutocloseQuotesChk->GetSavedValue() )
{
officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::set( pAutocloseQuotesChk->IsChecked(), batch );
CodeCompleteOptions::SetAutoCloseQuotesOn( pAutocloseQuotesChk->IsChecked() );
- bModified = sal_True;
+ bModified = true;
}
if( TriState(pAutoCorrectChk->IsChecked()) != pAutoCorrectChk->GetSavedValue() )
{
officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::set( pAutoCorrectChk->IsChecked(), batch );
CodeCompleteOptions::SetAutoCorrectOn( pAutoCorrectChk->IsChecked() );
- bModified = sal_True;
+ bModified = true;
}
if( bModified )
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index 3e75c8116dbf..13c8490383a9 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -41,7 +41,7 @@ public:
~SvxBasicIDEOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+ virtual bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void FillUserData();
};
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 5fac95aeaf9e..673a08f013af 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -108,12 +108,12 @@ SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& r
return new SvxDefaultColorOptPage( pParent, rAttrs );
}
-sal_Bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
{
if( pColorConfig )
rOutAttrs.Put( *(static_cast< SfxPoolItem* >(pColorConfig)));
- return sal_True;
+ return true;
}
void SvxDefaultColorOptPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 8c38565857c2..d91ebb6b6149 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -64,7 +64,7 @@ public:
void Construct();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
+ virtual bool FillItemSet( SfxItemSet& rOutAttrs );
virtual void Reset( const SfxItemSet& rInAttrs );
};
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 6b97a1aaa182..f29162d19ebb 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1082,7 +1082,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r
return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) );
}
-sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
{
bFillItemSetCalled = sal_True;
if(m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos())
@@ -1094,7 +1094,7 @@ sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
pColorConfig->Commit();
if(pExtColorConfig->IsModified())
pExtColorConfig->Commit();
- return sal_True;
+ return true;
}
void SvxColorOptionsTabPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 119909fdd7ab..4c6216cf9f27 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -52,7 +52,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+ virtual bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index ebd2e495c813..96e95a53d554 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -66,9 +66,9 @@ SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrS
return new SvxCTLOptionsPage( pParent, rAttrSet );
}
-sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
+bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
{
- sal_Bool bModified = sal_False;
+ bool bModified = false;
SvtCTLOptions aCTLOptions;
// Sequence checking
@@ -76,20 +76,20 @@ sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
if ( bChecked != m_pSequenceCheckingCB->GetSavedValue() )
{
aCTLOptions.SetCTLSequenceChecking( bChecked );
- bModified = sal_True;
+ bModified = true;
}
bChecked = m_pRestrictedCB->IsChecked();
if( bChecked != m_pRestrictedCB->GetSavedValue() )
{
aCTLOptions.SetCTLSequenceCheckingRestricted( bChecked );
- bModified = sal_True;
+ bModified = true;
}
bChecked = m_pTypeReplaceCB->IsChecked();
if( bChecked != m_pTypeReplaceCB->GetSavedValue())
{
aCTLOptions.SetCTLSequenceCheckingTypeAndReplace(bChecked);
- bModified = sal_True;
+ bModified = true;
}
bool bLogicalChecked = m_pMovementLogicalRB->IsChecked();
@@ -100,14 +100,14 @@ sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
SvtCTLOptions::CursorMovement eMovement =
bLogicalChecked ? SvtCTLOptions::MOVEMENT_LOGICAL : SvtCTLOptions::MOVEMENT_VISUAL;
aCTLOptions.SetCTLCursorMovement( eMovement );
- bModified = sal_True;
+ bModified = true;
}
sal_uInt16 nPos = m_pNumeralsLB->GetSelectEntryPos();
if ( nPos != m_pNumeralsLB->GetSavedValue() )
{
aCTLOptions.SetCTLTextNumerals( (SvtCTLOptions::TextNumerals)nPos );
- bModified = sal_True;
+ bModified = true;
}
return bModified;
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index 358698c3ac16..32ae80c86873 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -48,7 +48,7 @@ public:
virtual ~SvxCTLOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+ virtual bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index cf9bc8d45f54..f0f58ea1e90a 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -76,7 +76,7 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
return new OfaMSFilterTabPage( pParent, rAttrSet );
}
-sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
@@ -100,7 +100,7 @@ sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
if( aPBasicStgCB->GetSavedValue() != (bFlag = aPBasicStgCB->IsChecked()))
rOpt.SetLoadPPointBasicStorage( bFlag );
- return sal_False;
+ return false;
}
void OfaMSFilterTabPage::Reset( const SfxItemSet& )
@@ -170,7 +170,7 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
return new OfaMSFilterTabPage2( pParent, rAttrSet );
}
-sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
@@ -221,7 +221,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
}
}
- return sal_True;
+ return true;
}
void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index da6459fc41be..9ee8a71c36a4 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -46,7 +46,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+ virtual bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
@@ -95,7 +95,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual sal_Bool FillItemSet( SfxItemSet& rSet );
+ virtual bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 67cc8e44efcb..c3794a85c952 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -242,7 +242,7 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
-sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
{
sal_Bool bModified = sal_False;
@@ -652,7 +652,7 @@ SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
return new OfaViewTabPage(pParent, rAttrSet);
}
-sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
+bool OfaViewTabPage::FillItemSet( SfxItemSet& )
{
SvtFontOptions aFontOpt;
SvtMenuOptions aMenuOpt;
@@ -1179,7 +1179,7 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool
}
}
-sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
// lock configuration broadcasters so that we can coordinate the notifications
pLangConfig->aSysLocaleOptions.BlockBroadcasts( true );
@@ -1414,7 +1414,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
pLangConfig->aLanguageOptions.BlockBroadcasts( false );
pLangConfig->aLinguConfig.BlockBroadcasts( false );
- return sal_False;
+ return false;
}
void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 79aaeaed8c8a..8c28f7ac31a4 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/