diff options
Diffstat (limited to 'cui/source/options')
40 files changed, 68 insertions, 68 deletions
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 613c8a4e750a..95402c909d7f 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -397,9 +397,9 @@ namespace offapp } - void ConnectionPoolOptionsPage::Reset(const SfxItemSet& _rSet) + void ConnectionPoolOptionsPage::Reset(const SfxItemSet* _rSet) { - implInitControls(_rSet, true); + implInitControls(*_rSet, true); } diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 064999cbb121..f65bb8c027ac 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -57,7 +57,7 @@ namespace offapp virtual bool Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE; virtual bool FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE; - virtual void Reset(const SfxItemSet& _rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet* _rSet) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE; protected: diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 151d65457314..666d1b9992fc 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -210,10 +210,10 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet ) -void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet ) +void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet ) { // the settings for the single drivers - SFX_ITEMSET_GET( rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true ); + SFX_ITEMSET_GET( *rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true ); if ( !pRegistrations ) return; diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index be2dd1c79481..d140fe876680 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -192,7 +192,7 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* ) return false; } -void SvxFontSubstTabPage::Reset( const SfxItemSet& ) +void SvxFontSubstTabPage::Reset( const SfxItemSet* ) { m_pCheckLB->SetUpdateMode(false); m_pCheckLB->Clear(); diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index bad9084f829f..b505904f1ffe 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -97,7 +97,7 @@ class SvxFontSubstTabPage : public SfxTabPage public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 4b260d36fae1..588d2c9dea73 100644 --- a/cui/source/options/optaccessibility.cxx +++ b/cui/source/options/optaccessibility.cxx @@ -94,7 +94,7 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* ) return false; } -void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& ) +void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* ) { //set controls from aConfig.Get... diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index cd65854ed230..5239470d7e43 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -47,7 +47,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 44d8cbb8dd65..8f578660c00a 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -215,7 +215,7 @@ bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* ) return false; } -void SvxAsianLayoutPage::Reset( const SfxItemSet& ) +void SvxAsianLayoutPage::Reset( const SfxItemSet* ) { SfxViewFrame* pCurFrm = SfxViewFrame::Current(); SfxObjectShell* pDocSh = pCurFrm ? pCurFrm->GetObjectShell() : 0; diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx index 317d52666cb5..a3c6f2227837 100644 --- a/cui/source/options/optbasic.cxx +++ b/cui/source/options/optbasic.cxx @@ -120,7 +120,7 @@ bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) return bModified; } -void SvxBasicIDEOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) +void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) { LoadConfig(); pCodeCompleteChk->SaveValue(); diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx index d065ea6ac006..4727ab72d9f3 100644 --- a/cui/source/options/optbasic.hxx +++ b/cui/source/options/optbasic.hxx @@ -42,7 +42,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 74b9b605c55a..799fb0afda25 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -116,7 +116,7 @@ bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs ) return true; } -void SvxDefaultColorOptPage::Reset( const SfxItemSet& ) +void SvxDefaultColorOptPage::Reset( const SfxItemSet* ) { m_pLbChartColors->SelectEntryPos( 0 ); ListClickedHdl(m_pLbChartColors); diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 7a1bd24337d8..5ec9299deb05 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -60,7 +60,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 9abfde7728a4..df3755b464aa 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -1094,7 +1094,7 @@ bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* ) return true; } -void SvxColorOptionsTabPage::Reset( const SfxItemSet& ) +void SvxColorOptionsTabPage::Reset( const SfxItemSet* ) { if(pColorConfig) { diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx index d3553785a686..7df087f8a304 100644 --- a/cui/source/options/optcolor.hxx +++ b/cui/source/options/optcolor.hxx @@ -53,7 +53,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; virtual void FillUserData() SAL_OVERRIDE; diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index e5501136c20a..68936978afbf 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -112,7 +112,7 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* ) return bModified; } -void SvxCTLOptionsPage::Reset( const SfxItemSet& ) +void SvxCTLOptionsPage::Reset( const SfxItemSet* ) { SvtCTLOptions aCTLOptions; diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index e2396e2e3366..e49a7a1de9a4 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -49,7 +49,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 8c5e47160ff4..391a2427c670 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -102,7 +102,7 @@ bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* ) return false; } -void OfaMSFilterTabPage::Reset( const SfxItemSet& ) +void OfaMSFilterTabPage::Reset( const SfxItemSet* ) { const SvtFilterOptions& rOpt = SvtFilterOptions::Get(); @@ -223,7 +223,7 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* ) return true; } -void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) +void OfaMSFilterTabPage2::Reset( const SfxItemSet* ) { SvtFilterOptions& rOpt = SvtFilterOptions::Get(); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index da22fe558f83..71a6204fcf7a 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -47,7 +47,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; class OfaMSFilterTabPage2 : public SfxTabPage @@ -96,7 +96,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 6bb145a60b57..980bfa8d0e6d 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -296,7 +296,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) -void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) +void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) { SvtHelpOptions aHelpOptions; m_pToolTipsCB->Check( aHelpOptions.IsHelpTips() ); @@ -318,7 +318,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) m_pDocStatusCB->SaveValue(); const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) ) + if ( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem ) ) { m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() ); TwoFigureConfigHdl(m_pYearValueField); @@ -851,7 +851,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) return bModified; } -void OfaViewTabPage::Reset( const SfxItemSet& ) +void OfaViewTabPage::Reset( const SfxItemSet* ) { SvtMiscOptions aMiscOptions; @@ -1416,7 +1416,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) return false; } -void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) +void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) { OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); if ( !sLang.isEmpty() ) @@ -1509,21 +1509,21 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) m_pCurrentDocCB->Enable(true); m_pCurrentDocCB->Check(bLanguageCurrentDoc_Impl); const SfxPoolItem* pLang; - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang) eCurLang = eTempCurLang; } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang) eCurLangCJK = eTempCurLang; } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang) @@ -1568,7 +1568,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) // check the box "For the current document only" // set the focus to the Western Language box const SfxPoolItem* pLang = 0; - if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) + if ( SFX_ITEM_SET == rSet->GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) { m_pWesternLanguageLB->GrabFocus(); m_pCurrentDocCB->Enable(true); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 28a7a581f252..93985aa77d12 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -71,7 +71,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; // class OfaViewTabPage -------------------------------------------------- @@ -126,7 +126,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; struct LanguageConfig_Impl; @@ -170,7 +170,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 af517dcdbf17..b3ae874b7134 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -323,15 +323,15 @@ bool SvxGeneralTabPage::FillItemSet( SfxItemSet* ) -void SvxGeneralTabPage::Reset( const SfxItemSet& rSet ) +void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) { SetAddress_Impl(); sal_uInt16 const nWhich = GetWhich(SID_FIELD_GRABFOCUS); - if (rSet.GetItemState(nWhich) == SFX_ITEM_SET) + if (rSet->GetItemState(nWhich) == SFX_ITEM_SET) { - if (sal_uInt16 const nField = ((SfxUInt16Item&)rSet.Get(nWhich)).GetValue()) + if (sal_uInt16 const nField = ((SfxUInt16Item&)rSet->Get(nWhich)).GetValue()) { for (unsigned i = 0; i != vFields.size(); ++i) if (nField == vFieldInfo[vFields[i]->iField].nGrabFocusId) diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index a7a4e3388fec..7d5386c50c8b 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -142,7 +142,7 @@ bool OfaHtmlTabPage::FillItemSet( SfxItemSet* ) return false; } -void OfaHtmlTabPage::Reset( const SfxItemSet& ) +void OfaHtmlTabPage::Reset( const SfxItemSet* ) { SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get(); aSize1NF->SetValue(rHtmlOpt.GetFontSize(0)); diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index a91a4ed507be..47c8d083ec31 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -60,7 +60,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 ad94515a8cd9..1d71abeae3a8 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -375,7 +375,7 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl() } } -void SvxProxyTabPage::Reset(const SfxItemSet&) +void SvxProxyTabPage::Reset(const SfxItemSet*) { ReadConfigData_Impl(); @@ -909,7 +909,7 @@ bool SvxSecurityTabPage::FillItemSet( SfxItemSet* ) /*--------------------------------------------------------------------*/ -void SvxSecurityTabPage::Reset( const SfxItemSet& ) +void SvxSecurityTabPage::Reset( const SfxItemSet* ) { } @@ -947,7 +947,7 @@ bool MozPluginTabPage::FillItemSet( SfxItemSet* ) return true; } -void MozPluginTabPage::Reset( const SfxItemSet& ) +void MozPluginTabPage::Reset( const SfxItemSet* ) { m_pWBasicCodeCB->Check( isInstalled()); m_pWBasicCodeCB->SaveValue(); @@ -1248,7 +1248,7 @@ bool SvxEMailTabPage::FillItemSet( SfxItemSet* ) /* -------------------------------------------------------------------------*/ -void SvxEMailTabPage::Reset( const SfxItemSet& ) +void SvxEMailTabPage::Reset( const SfxItemSet* ) { m_pMailerURLED->Enable(true ); m_pMailerURLPB->Enable(true ); diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 105bce864705..362f84568b2d 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -106,7 +106,7 @@ private: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; // #98647# class SvxScriptExecListBox ------------------------------------ @@ -176,7 +176,7 @@ protected: public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; class MozPluginTabPage : public SfxTabPage @@ -196,7 +196,7 @@ public: const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; @@ -221,7 +221,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 39ec6a3b1f85..15030f1db968 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -749,7 +749,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ ) -void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) +void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ ) { ClearJavaInfo(); ClearJavaList(); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 421c1e49067e..6b9bf7a14179 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -110,7 +110,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 b3951b850691..b8f68d98e329 100644 --- a/cui/source/options/optjsearch.cxx +++ b/cui/source/options/optjsearch.cxx @@ -160,7 +160,7 @@ sal_Int32 SvxJSearchOptionsPage::GetTransliterationFlags_Impl() } -void SvxJSearchOptionsPage::Reset( const SfxItemSet& ) +void SvxJSearchOptionsPage::Reset( const SfxItemSet* ) { SvtSearchOptions aOpt; diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx index 9173c24ca156..266790619520 100644 --- a/cui/source/options/optjsearch.hxx +++ b/cui/source/options/optjsearch.hxx @@ -66,7 +66,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; bool IsSaveOptions() const { return bSaveOptions; } diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 3481b7553fd4..ae66374f4887 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1406,7 +1406,7 @@ void SvxLinguTabPage::UpdateModulesBox_Impl() -void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) +void SvxLinguTabPage::Reset( const SfxItemSet* rSet ) { // if not HideGroups was called with GROUP_MODULES... if (m_pLinguModulesCLB->IsVisible()) @@ -1435,7 +1435,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) pEntry = CreateEntry( sSpellAuto, CBCOL_FIRST ); aLngCfg.GetProperty( UPN_IS_SPELL_AUTO ) >>= bVal; - const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK ); + const SfxPoolItem* pItem = GetItem( *rSet, SID_AUTOSPELL_CHECK ); if (pItem) bVal = ((SfxBoolItem *) pItem)->GetValue(); nUserData = OptionsUserData( EID_SPELL_AUTO, false, 0, true, bVal).GetUserData(); @@ -1479,8 +1479,8 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) const SfxHyphenRegionItem *pHyp = NULL; sal_uInt16 nWhich = GetWhich( SID_ATTR_HYPHENREGION ); - if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET ) - pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) ); + if ( rSet->GetItemState( nWhich, false ) == SFX_ITEM_SET ) + pHyp = &( (const SfxHyphenRegionItem &) rSet->Get( nWhich ) ); pEntry = CreateEntry( sNumPreBreak, CBCOL_SECOND ); aLngCfg.GetProperty( UPN_HYPH_MIN_LEADING ) >>= nVal; diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 1e1a97daa8b0..a3918658d86c 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -207,7 +207,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet ) -void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) +void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet ) { const SfxPoolItem* pItem; @@ -239,7 +239,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet ) (officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects:: get()))); - SfxItemState eState = rSet.GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem ); + SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem ); if ( SFX_ITEM_SET == eState ) m_pQuickLaunchCB->Check( ( (SfxBoolItem*)pItem )->GetValue() ); else if ( SFX_ITEM_DISABLED == eState ) diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx index b1564fbaa5f6..327cc541b682 100644 --- a/cui/source/options/optmemory.hxx +++ b/cui/source/options/optmemory.hxx @@ -62,7 +62,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 5b44550ba650..de014e756eb2 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -278,7 +278,7 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* ) -void SvxPathTabPage::Reset( const SfxItemSet& ) +void SvxPathTabPage::Reset( const SfxItemSet* ) { pPathBox->Clear(); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 42e744fe62fb..9c27762b7fa7 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -379,7 +379,7 @@ bool isODFFormat( const OUString& sFilter ) return bRet; } -void SfxSaveTabPage::Reset( const SfxItemSet& ) +void SfxSaveTabPage::Reset( const SfxItemSet* ) { SvtSaveOptions aSaveOpt; aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings()); diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 189240ca7ad0..7b5158f9e672 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -77,7 +77,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; }; #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 2ac7d83986bd..a8ab4c63a7d5 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -220,7 +220,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* ) -void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& ) +void SvxOnlineUpdateTabPage::Reset( const SfxItemSet* ) { bool bValue = false; m_xUpdateAccess->getByName( "AutoCheckEnabled" ) >>= bValue; diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index 525fbcad56f5..996d1b261094 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -57,7 +57,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE; - virtual void Reset( const 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 57cffe7e2d29..60a77453e386 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -144,7 +144,7 @@ bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * ) return bModified; } -void SvxPersonalizationTabPage::Reset( const SfxItemSet & ) +void SvxPersonalizationTabPage::Reset( const SfxItemSet * ) { uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() ); diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx index b41beca5155a..66d94f262143 100644 --- a/cui/source/options/personalization.hxx +++ b/cui/source/options/personalization.hxx @@ -35,7 +35,7 @@ public: virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE; /// Reset to default settings ([Revert] button). - virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE; private: /// Handle the Persona selection diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 95bd35308fc8..23979b4235ff 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -651,9 +651,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl) OptionsGroupInfo* pGroupInfo = (OptionsGroupInfo*)aTreeLB.GetParent( pCurrentPageEntry )->GetUserData(); if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) - pPageInfo->m_pPage->Reset( *pColorPageItemSet ); + pPageInfo->m_pPage->Reset( pColorPageItemSet ); else - pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet ); + pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet ); } else if ( pPageInfo->m_pExtPage ) pPageInfo->m_pExtPage->ResetPage(); @@ -1117,12 +1117,12 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() pPageInfo->m_pPage->SetPosPixel( aPagePos ); if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId ) { - pPageInfo->m_pPage->Reset( *pColorPageItemSet ); + pPageInfo->m_pPage->Reset( pColorPageItemSet ); pPageInfo->m_pPage->ActivatePage( *pColorPageItemSet ); } else { - pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet ); + pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet ); } if (::isLayoutEnabled(pPageInfo->m_pPage)) SetPaneSize(pPageInfo->m_pPage); |