diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 14:34:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 14:39:04 +0200 |
| commit | bb761be472ea9a590837dc6c1ca295387ac4c0b7 (patch) | |
| tree | 178b4187effe2a05f3d77660ad83eea97144a287 /cui/source/options/optgdlg.cxx | |
| parent | DOCX import: fix additional empty paragraphs around footnote text (diff) | |
| download | core-bb761be472ea9a590837dc6c1ca295387ac4c0b7.tar.gz core-bb761be472ea9a590837dc6c1ca295387ac4c0b7.zip | |
Change SfxTabPage ctor SfxItemSet param from ref to pointer
...and also corresponding param of CreateTabPage function type and corresponding
Craete functions. There were some call sites that passed undefined "null
pointer references" and SfxTabPage internally uses a pointer member pSet that is
checked for null anyway.
Change-Id: I4eb3636155eac46c9c9d26e6e6e842e85d7e95af
Diffstat (limited to 'cui/source/options/optgdlg.cxx')
| -rw-r--r-- | cui/source/options/optgdlg.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 980bfa8d0e6d..b083e68574fb 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -184,7 +184,7 @@ namespace OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", rSet) + : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", &rSet) { get(m_pToolTipsCB, "tooltips"); get(m_pExtHelpCB, "exthelp"); @@ -236,9 +236,9 @@ OfaMiscTabPage::~OfaMiscTabPage() -SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return new OfaMiscTabPage( pParent, rAttrSet ); + return new OfaMiscTabPage( pParent, *rAttrSet ); } @@ -536,7 +536,7 @@ void CanvasSettings::EnabledHardwareAcceleration( bool _bEnabled ) const // class OfaViewTabPage -------------------------------------------------- OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", rSet) + : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", &rSet) , nSizeLB_InitialSelection(0) , nStyleLB_InitialSelection(0) , pAppearanceCfg(new SvtTabAppearanceCfg) @@ -647,9 +647,9 @@ IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) return 0; } -SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return new OfaViewTabPage(pParent, rAttrSet); + return new OfaViewTabPage(pParent, *rAttrSet); } bool OfaViewTabPage::FillItemSet( SfxItemSet* ) @@ -998,7 +998,7 @@ static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper& rLocal } OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSet ) : - SfxTabPage( pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui", rSet ), + SfxTabPage( pParent,"OptLanguagesPage","cui/ui/optlanguagespage.ui", &rSet ), pLangConfig(new LanguageConfig_Impl) { get(m_pUserInterfaceLB, "userinterface"); @@ -1149,9 +1149,9 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage() delete pLangConfig; } -SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +SfxTabPage* OfaLanguagesTabPage::Create( Window* pParent, const SfxItemSet* rAttrSet ) { - return new OfaLanguagesTabPage(pParent, rAttrSet); + return new OfaLanguagesTabPage(pParent, *rAttrSet); } static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount) |