diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-16 10:11:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-16 11:20:38 +0200 |
| commit | 32be55414da2af0ea796a57c7f15d18a3fd756cb (patch) | |
| tree | a10b9b3f2c0bfe62fe914cadd7a0a019f97f8178 /cui/source/inc/iconcdlg.hxx | |
| parent | 4dc823990ab217cb9d07a0555d3015d43380fdf5 (diff) | |
cleanup code in IconChoiceDialog::ActivatePageImpl
which has been this way ever since
commit d32b3a714fe55892bdead03502c5a9b0e77fa61d
Author: Mathias Bauer <mba@openoffice.org>
Date: Sat Oct 31 00:36:06 2009 +0100
#i106421#: move svx/source/cui to cui
And pass the SfxItemSet as a pointer up the constructor hierarchy,
instead of a reference, since the base class wants a pointer anyway
Change-Id: Iac4081fb5f3fc9cb9b0223f903d74ba84cdd5f6c
Reviewed-on: https://gerrit.libreoffice.org/37664
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'cui/source/inc/iconcdlg.hxx')
| -rw-r--r-- | cui/source/inc/iconcdlg.hxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index ba8ac1d02bcd..adfdf0941a06 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -38,7 +38,7 @@ class SfxItemPool; class SfxItemSet; // Create-Function -typedef VclPtr<IconChoicePage> (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet &rAttrSet); +typedef VclPtr<IconChoicePage> (*CreatePage)(vcl::Window *pParent, IconChoiceDialog* pDlg, const SfxItemSet* pAttrSet); /// Data-structure for pages in dialog struct IconChoicePageData @@ -71,7 +71,7 @@ protected: using TabPage::ActivatePage; using TabPage::DeactivatePage; - IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); + IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet* pItemSet ); public: virtual ~IconChoicePage() override; @@ -137,7 +137,6 @@ protected: static void HidePageImpl ( IconChoicePageData* pData ); virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ); - static SfxItemSet* CreateInputItemSet( sal_uInt16 nId ); IconChoicePage* GetTabPage( sal_uInt16 nPageId ) { return ( GetPageData (nPageId)->pPage ? GetPageData (nPageId)->pPage.get() : nullptr); } |