summaryrefslogtreecommitdiff
path: root/cui/source/options
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-10 17:23:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-10 17:25:23 +0200
commit4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40 (patch)
treea71acd0d466e02c18bf78ffdcfea748135805d21 /cui/source/options
parent2f8fd888b42dc41662b54a16d62575c2b15e844a (diff)
Change SfxTabPage::FillItemSet param from ref to pointer
...there were a number of call sites that passed undefined "null pointer references" (apparently in cases where the passed argument was actually unused) Change-Id: I19799e90f0cd8e98367782441a5ea9df27b59830
Diffstat (limited to 'cui/source/options')
-rw-r--r--cui/source/options/connpooloptions.cxx6
-rw-r--r--cui/source/options/connpooloptions.hxx2
-rw-r--r--cui/source/options/dbregister.cxx4
-rw-r--r--cui/source/options/fontsubs.cxx2
-rw-r--r--cui/source/options/fontsubs.hxx2
-rw-r--r--cui/source/options/optaccessibility.cxx2
-rw-r--r--cui/source/options/optaccessibility.hxx2
-rw-r--r--cui/source/options/optasian.cxx2
-rw-r--r--cui/source/options/optbasic.cxx2
-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.cxx2
-rw-r--r--cui/source/options/optctl.hxx2
-rw-r--r--cui/source/options/optfltr.cxx4
-rw-r--r--cui/source/options/optfltr.hxx4
-rw-r--r--cui/source/options/optgdlg.cxx20
-rw-r--r--cui/source/options/optgdlg.hxx6
-rw-r--r--cui/source/options/optgenrl.cxx4
-rw-r--r--cui/source/options/opthtml.cxx2
-rw-r--r--cui/source/options/opthtml.hxx2
-rw-r--r--cui/source/options/optinet2.cxx10
-rw-r--r--cui/source/options/optinet2.hxx8
-rw-r--r--cui/source/options/optjava.cxx2
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/options/optjsearch.cxx2
-rw-r--r--cui/source/options/optjsearch.hxx2
-rw-r--r--cui/source/options/optlingu.cxx8
-rw-r--r--cui/source/options/optmemory.cxx6
-rw-r--r--cui/source/options/optmemory.hxx2
-rw-r--r--cui/source/options/optpath.cxx2
-rw-r--r--cui/source/options/optsave.cxx18
-rw-r--r--cui/source/options/optsave.hxx2
-rw-r--r--cui/source/options/optupdt.cxx2
-rw-r--r--cui/source/options/optupdt.hxx2
-rw-r--r--cui/source/options/personalization.cxx2
-rw-r--r--cui/source/options/personalization.hxx2
-rw-r--r--cui/source/options/treeopt.cxx2
40 files changed, 79 insertions, 79 deletions
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index fcb0ca90288b..613c8a4e750a 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -367,7 +367,7 @@ namespace offapp
}
- bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
+ bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet* _rSet)
{
commitTimeoutField();
@@ -375,14 +375,14 @@ namespace offapp
// the enabled flag
if (m_pEnablePooling->IsValueChangedFromSaved())
{
- _rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED);
+ _rSet->Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED);
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);
+ _rSet->Put(DriverPoolingSettingsItem(SID_SB_DRIVER_TIMEOUTS, m_pDriverList->getSettings()), SID_SB_DRIVER_TIMEOUTS);
bModified = true;
}
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index cd80ccfc578c..064999cbb121 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 ) SAL_OVERRIDE;
- virtual bool FillItemSet(SfxItemSet& _rSet) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet& _rSet) SAL_OVERRIDE;
virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE;
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 7af151db533d..151d65457314 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -182,7 +182,7 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
-bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
+bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet )
{
// the settings for the single drivers
bool bModified = false;
@@ -201,7 +201,7 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
}
if ( m_nOldCount != aRegistrations.size() || m_bModified )
{
- rCoreSet.Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER);
+ rCoreSet->Put(DatabaseMapItem( SID_SB_DB_REGISTER, aRegistrations ), SID_SB_DB_REGISTER);
bModified = true;
}
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index efe9f7163483..be2dd1c79481 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);
}
-bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
+bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
{
pConfig->ClearSubstitutions();// remove all entries
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 415f59c83317..bad9084f829f 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 bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index d8f062de37ee..4b260d36fae1 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);
}
-bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
{
//aConfig.Set... from controls
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 97bd44e21dd4..cd65854ed230 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 bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index d79a954dceea..44d8cbb8dd65 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);
}
-bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
+bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
{
if(m_pCharKerningRB->IsValueChangedFromSaved())
{
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 27a983c6621b..317d52666cb5 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -66,7 +66,7 @@ void SvxBasicIDEOptionsPage::LoadConfig()
pUseExtendedTypesChk->Check( bExtended );
}
-bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
+bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
{
bool bModified = false;
boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index ac46d81d1132..d065ea6ac006 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -41,7 +41,7 @@ public:
virtual ~SvxBasicIDEOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 673a08f013af..74b9b605c55a 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -108,10 +108,10 @@ SfxTabPage* SvxDefaultColorOptPage::Create( Window* pParent, const SfxItemSet& r
return new SvxDefaultColorOptPage( pParent, rAttrs );
}
-bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
+bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
{
if( pColorConfig )
- rOutAttrs.Put( *(static_cast< SfxPoolItem* >(pColorConfig)));
+ rOutAttrs->Put( *(static_cast< SfxPoolItem* >(pColorConfig)));
return true;
}
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 5590d5ae1a95..7a1bd24337d8 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -59,7 +59,7 @@ public:
void Construct();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 77108e8d26a9..9abfde7728a4 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1079,7 +1079,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r
return ( new SvxColorOptionsTabPage( pParent, rAttrSet ) );
}
-bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
+bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* )
{
bFillItemSetCalled = true;
if(m_pColorSchemeLB->IsValueChangedFromSaved())
@@ -1131,7 +1131,7 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& )
int SvxColorOptionsTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
- FillItemSet( *pSet_ );
+ FillItemSet( pSet_ );
return( LEAVE_PAGE );
}
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index b3033bade873..d3553785a686 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 bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 3d51979d507d..e5501136c20a 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -66,7 +66,7 @@ SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrS
return new SvxCTLOptionsPage( pParent, rAttrSet );
}
-bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
+bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
SvtCTLOptions aCTLOptions;
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index 326718bee03f..e2396e2e3366 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 bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index bf877b692bac..8c5e47160ff4 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 );
}
-bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
@@ -169,7 +169,7 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
return new OfaMSFilterTabPage2( pParent, rAttrSet );
}
-bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
+bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 30b58f011a94..da22fe558f83 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 bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -95,7 +95,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 7b6f9478fa7a..6bb145a60b57 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -106,7 +106,7 @@ using namespace ::utl;
int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
- FillItemSet( *pSet_ );
+ FillItemSet( pSet_ );
return LEAVE_PAGE;
}
@@ -243,7 +243,7 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
-bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
@@ -283,12 +283,12 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
}
const SfxUInt16Item* pUInt16Item =
- PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) );
+ PTR_CAST( SfxUInt16Item, GetOldItem( *rSet, SID_ATTR_YEAR2000 ) );
sal_uInt16 nNum = (sal_uInt16)m_pYearValueField->GetText().toInt32();
if ( pUInt16Item && pUInt16Item->GetValue() != nNum )
{
bModified = true;
- rSet.Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
+ rSet->Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
}
return bModified;
@@ -652,7 +652,7 @@ SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
return new OfaViewTabPage(pParent, rAttrSet);
}
-bool OfaViewTabPage::FillItemSet( SfxItemSet& )
+bool OfaViewTabPage::FillItemSet( SfxItemSet* )
{
SvtFontOptions aFontOpt;
SvtMenuOptions aMenuOpt;
@@ -1177,7 +1177,7 @@ static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBool
}
}
-bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
+bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
{
// lock configuration broadcasters so that we can coordinate the notifications
pLangConfig->aSysLocaleOptions.BlockBroadcasts( true );
@@ -1270,7 +1270,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// this will happen after releasing the lock on the ConfigurationBroadcaster at
// the end of this method
pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang );
- rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) );
+ rSet->Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, true ) );
sal_uInt16 nNewType = SvtLanguageOptions::GetScriptTypeOfLanguage( eNewLocale );
bool bNewCJK = ( nNewType & SCRIPTTYPE_ASIAN ) != 0;
@@ -1324,7 +1324,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
if(pCurrentDocShell)
{
- rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
+ rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
SID_ATTR_LANGUAGE));
}
}
@@ -1344,7 +1344,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
if(pCurrentDocShell)
{
- rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
+ rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
SID_ATTR_CHAR_CJK_LANGUAGE));
}
}
@@ -1364,7 +1364,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
if(pCurrentDocShell)
{
- rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
+ rSet->Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
SID_ATTR_CHAR_CTL_LANGUAGE));
}
}
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 61b22282cddd..28a7a581f252 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -70,7 +70,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -125,7 +125,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -169,7 +169,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
#endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 1cff7c16567d..af517dcdbf17 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -304,7 +304,7 @@ SfxTabPage* SvxGeneralTabPage::Create( Window* pParent, const SfxItemSet& rAttrS
-bool SvxGeneralTabPage::FillItemSet( SfxItemSet& )
+bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
{
// remove leading and trailing whitespaces
for (unsigned i = 0; i != vFields.size(); ++i)
@@ -435,7 +435,7 @@ void SvxGeneralTabPage::SetAddress_Impl()
int SvxGeneralTabPage::DeactivatePage( SfxItemSet* pSet_ )
{
if ( pSet_ )
- FillItemSet( *pSet_ );
+ FillItemSet( pSet_ );
return LEAVE_PAGE;
}
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index c6c724cab33b..a7a4e3388fec 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -94,7 +94,7 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
return new OfaHtmlTabPage(pParent, rAttrSet);
}
-bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
+bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
{
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
if(aSize1NF->IsValueChangedFromSaved())
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 1bab77f331ed..a91a4ed507be 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -59,7 +59,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 893848327919..ad94515a8cd9 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -391,7 +391,7 @@ void SvxProxyTabPage::Reset(const SfxItemSet&)
EnableControls_Impl( m_pProxyModeLB->GetSelectEntryPos() == 2 );
}
-bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
+bool SvxProxyTabPage::FillItemSet(SfxItemSet* )
{
bool bModified = false;
@@ -865,7 +865,7 @@ void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
int SvxSecurityTabPage::DeactivatePage( SfxItemSet* _pSet )
{
if( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -888,7 +888,7 @@ namespace
}
}
-bool SvxSecurityTabPage::FillItemSet( SfxItemSet& )
+bool SvxSecurityTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
@@ -929,7 +929,7 @@ SfxTabPage* MozPluginTabPage::Create( Window* pParent,
return new MozPluginTabPage( pParent, rAttrSet );
}
-bool MozPluginTabPage::FillItemSet( SfxItemSet& )
+bool MozPluginTabPage::FillItemSet( SfxItemSet* )
{
bool hasInstall = isInstalled();
bool hasChecked = m_pWBasicCodeCB->IsChecked();
@@ -1232,7 +1232,7 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
/* -------------------------------------------------------------------------*/
-bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
+bool SvxEMailTabPage::FillItemSet( SfxItemSet* )
{
bool bMailModified = false;
if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->IsValueChangedFromSaved())
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index c76a8eb97a92..105bce864705 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -105,7 +105,7 @@ private:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -175,7 +175,7 @@ protected:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -195,7 +195,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
@@ -220,7 +220,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index b54f710b906d..39ec6a3b1f85 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -642,7 +642,7 @@ SfxTabPage* SvxJavaOptionsPage::Create( Window* pParent, const SfxItemSet& rAttr
-bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
+bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
{
bool bModified = false;
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index a6b4d52c5923..421c1e49067e 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -109,7 +109,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 8fbf05f7c67b..b3951b850691 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -211,7 +211,7 @@ void SvxJSearchOptionsPage::Reset( const SfxItemSet& )
}
-bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& )
+bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet* )
{
sal_Int32 nOldVal = nTransliterationFlags;
nTransliterationFlags = GetTransliterationFlags_Impl();
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 4c20a5c178a5..9173c24ca156 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -67,7 +67,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
bool IsSaveOptions() const { return bSaveOptions; }
void EnableSaveOptions( bool bVal ) { bSaveOptions = bVal; }
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 6168506a864d..3481b7553fd4 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1156,7 +1156,7 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
-bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
+bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet )
{
bool bModified = true; // !!!!
@@ -1301,17 +1301,17 @@ bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet )
SfxHyphenRegionItem aHyp( GetWhich( SID_ATTR_HYPHENREGION ) );
aHyp.GetMinLead() = (sal_uInt8) aPreBreakData.GetNumericValue();
aHyp.GetMinTrail() = (sal_uInt8) aPostBreakData.GetNumericValue();
- rCoreSet.Put( aHyp );
+ rCoreSet->Put( aHyp );
}
}
// automatic spell checking
bool bNewAutoCheck = m_pLinguOptionsCLB->IsChecked( (sal_uLong) EID_SPELL_AUTO );
- const SfxPoolItem* pOld = GetOldItem( rCoreSet, SID_AUTOSPELL_CHECK );
+ const SfxPoolItem* pOld = GetOldItem( *rCoreSet, SID_AUTOSPELL_CHECK );
if ( !pOld || ( (SfxBoolItem*)pOld )->GetValue() != bNewAutoCheck )
{
- rCoreSet.Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ),
+ rCoreSet->Put( SfxBoolItem( GetWhich( SID_AUTOSPELL_CHECK ),
bNewAutoCheck ) );
bModified |= true;
}
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 72bda7a569f7..1e1a97daa8b0 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -105,7 +105,7 @@ inline void OfaMemoryOptionsPage::SetNfGraphicObjectCacheLast( long nSizeInBytes
int OfaMemoryOptionsPage::DeactivatePage( SfxItemSet* _pSet )
{
if ( _pSet )
- FillItemSet( *_pSet );
+ FillItemSet( _pSet );
return LEAVE_PAGE;
}
@@ -155,7 +155,7 @@ SfxTabPage* OfaMemoryOptionsPage::Create( Window* pParent, const SfxItemSet& rAt
-bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
+bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
@@ -198,7 +198,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
if( m_pQuickLaunchCB->IsValueChangedFromSaved())
{
- rSet.Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked()));
+ rSet->Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked()));
bModified = true;
}
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index 0e5fb8b1e147..b1564fbaa5f6 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -61,7 +61,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 1b065062d555..5b44550ba650 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -264,7 +264,7 @@ SfxTabPage* SvxPathTabPage::Create( Window* pParent,
-bool SvxPathTabPage::FillItemSet( SfxItemSet& )
+bool SvxPathTabPage::FillItemSet( SfxItemSet* )
{
for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
{
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 59b95b50a8df..42e744fe62fb 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -238,7 +238,7 @@ void SfxSaveTabPage::DetectHiddenControls()
}
-bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
+bool SfxSaveTabPage::FillItemSet( SfxItemSet* rSet )
{
bool bModified = false;
SvtSaveOptions aSaveOpt;
@@ -258,55 +258,55 @@ bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
if ( aDocInfoCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ),
aDocInfoCB->IsChecked() ) );
bModified |= true;
}
if ( aBackupCB->IsEnabled() && aBackupCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ),
aBackupCB->IsChecked() ) );
bModified |= true;
}
if ( aAutoSaveCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
aAutoSaveCB->IsChecked() ) );
bModified |= true;
}
if ( aWarnAlienFormatCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ),
aWarnAlienFormatCB->IsChecked() ) );
bModified |= true;
}
if ( aAutoSaveEdit->IsValueChangedFromSaved() )
{
- rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
+ rSet->Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
(sal_uInt16)aAutoSaveEdit->GetValue() ) );
bModified |= true;
}
if ( aUserAutoSaveCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
aUserAutoSaveCB->IsChecked() ) );
bModified |= true;
}
// save relatively
if ( aRelativeFsysCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ),
aRelativeFsysCB->IsChecked() ) );
bModified |= true;
}
if ( aRelativeInetCB->IsValueChangedFromSaved() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ),
+ rSet->Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ),
aRelativeInetCB->IsChecked() ) );
bModified |= true;
}
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 810c1af3e3b6..189240ca7ad0 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -76,7 +76,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
};
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 127131057620..2ac7d83986bd 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -157,7 +157,7 @@ SvxOnlineUpdateTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
-bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
+bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index c0d61f72b1e4..525fbcad56f5 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -56,7 +56,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual void FillUserData() SAL_OVERRIDE;
};
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 21cb2b4dde41..57cffe7e2d29 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -108,7 +108,7 @@ SfxTabPage* SvxPersonalizationTabPage::Create( Window *pParent, const SfxItemSet
return new SvxPersonalizationTabPage( pParent, rSet );
}
-bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet & )
+bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * )
{
// persona
OUString aPersona( "default" );
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 40661f83e98a..b41beca5155a 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -32,7 +32,7 @@ public:
static SfxTabPage* Create( Window *pParent, const SfxItemSet &rSet );
/// Apply the settings ([OK] button).
- virtual bool FillItemSet( SfxItemSet &rSet ) SAL_OVERRIDE;
+ virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
/// Reset to default settings ([Revert] button).
virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 69f68513a910..95bd35308fc8 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -696,7 +696,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl)
{
OptionsGroupInfo* pGroupInfo =
(OptionsGroupInfo*)aTreeLB.GetParent(pEntry)->GetUserData();
- pPageInfo->m_pPage->FillItemSet(*pGroupInfo->m_pOutItemSet);
+ pPageInfo->m_pPage->FillItemSet(pGroupInfo->m_pOutItemSet);
}
if ( pPageInfo->m_pExtPage )