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 /sw/source/ui/misc | |
parent | 4d120b6ab181f530d3fedc963b1c6ec777f2608a (diff) |
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 'sw/source/ui/misc')
-rw-r--r-- | sw/source/ui/misc/docfnote.cxx | 10 | ||||
-rw-r--r-- | sw/source/ui/misc/impfnote.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/misc/num.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/outline.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/pgfnote.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 6 |
6 files changed, 19 insertions, 19 deletions
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 4d0a8ff51bf1..f1cc191491ff 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -74,7 +74,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage(Window *pParent, bool bEN, : SfxTabPage(pParent, bEN ? OString("EndnotePage") : OString("FootnotePage"), bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"), - rSet) + &rSet) , m_pNumCountBox(NULL) , m_pPosFT(NULL) , m_pPosPageBox(NULL) @@ -223,9 +223,9 @@ SwEndNoteOptionPage::~SwEndNoteOptionPage() { } -SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet &rSet ) +SfxTabPage *SwEndNoteOptionPage::Create( Window *pParent, const SfxItemSet *rSet ) { - return new SwEndNoteOptionPage( pParent, true, rSet ); + return new SwEndNoteOptionPage( pParent, true, *rSet ); } // Different kinds of numbering; because the Listbox has varying numbers of @@ -399,9 +399,9 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage() { } -SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet ) +SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet *rSet ) { - return new SwFootNoteOptionPage( pParent, rSet ); + return new SwFootNoteOptionPage( pParent, *rSet ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 14f2a2f06e7c..63d227dc41be 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -71,7 +71,7 @@ public: const SfxItemSet &rSet ); virtual ~SwEndNoteOptionPage(); - static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); + static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE; virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE; @@ -84,7 +84,7 @@ class SwFootNoteOptionPage : public SwEndNoteOptionPage virtual ~SwFootNoteOptionPage(); public: - static SfxTabPage *Create(Window *pParent, const SfxItemSet &rSet); + static SfxTabPage *Create(Window *pParent, const SfxItemSet *rSet); }; #endif diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index bd05757d7f36..fc4831177d83 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -63,7 +63,7 @@ static bool bLastRelative = false; SwNumPositionTabPage::SwNumPositionTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlinePositionPage", - "modules/swriter/ui/outlinepositionpage.ui", rSet) + "modules/swriter/ui/outlinepositionpage.ui", &rSet) , pActNum(0) , pSaveNum(0) , pWrtSh(0) @@ -513,9 +513,9 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() } SfxTabPage* SwNumPositionTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwNumPositionTabPage(pParent, rAttrSet); + return new SwNumPositionTabPage(pParent, *rAttrSet); } void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 1fe589e836c6..92e109a7e001 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -405,7 +405,7 @@ short SwOutlineTabDialog::Ok() SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OutlineNumberingPage", - "modules/swriter/ui/outlinenumberingpage.ui", rSet) + "modules/swriter/ui/outlinenumberingpage.ui", &rSet) , aNoFmtName(SW_RESSTR(SW_STR_NONE)) , pSh(NULL) , pNumRule(NULL) @@ -828,9 +828,9 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet ) } SfxTabPage* SwOutlineSettingsTabPage::Create( Window* pParent, - const SfxItemSet& rAttrSet) + const SfxItemSet* rAttrSet) { - return new SwOutlineSettingsTabPage(pParent, rAttrSet); + return new SwOutlineSettingsTabPage(pParent, *rAttrSet); } void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index a447814121bf..a4b32cbd0111 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -107,7 +107,7 @@ IMPL_LINK_NOARG(SwFootNotePage, LineColorSelected_Impl) SwFootNotePage::SwFootNotePage(Window *pParent, const SfxItemSet &rSet) : SfxTabPage(pParent, "FootnoteAreaPage", - "modules/swriter/ui/footnoteareapage.ui", rSet) + "modules/swriter/ui/footnoteareapage.ui", &rSet) , lMaxHeight(0) { get(m_pMaxHeightPageBtn, "maxheightpage"); @@ -136,9 +136,9 @@ SwFootNotePage::~SwFootNotePage() { } -SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage* SwFootNotePage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwFootNotePage(pParent, rSet); + return new SwFootNotePage(pParent, *rSet); } void SwFootNotePage::Reset(const SfxItemSet *rSet) diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 452be968e796..130a23df89b3 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -41,7 +41,7 @@ #include "view.hxx" SwTextGridPage::SwTextGridPage(Window *pParent, const SfxItemSet &rSet) : - SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", rSet), + SfxTabPage(pParent, "TextGridPage", "modules/swriter/ui/textgridpage.ui", &rSet), m_nRubyUserValue(0), m_bRubyUserValue(false), m_aPageSize(MM50, MM50), @@ -153,9 +153,9 @@ SwTextGridPage::~SwTextGridPage() { } -SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet) +SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet *rSet) { - return new SwTextGridPage(pParent, rSet); + return new SwTextGridPage(pParent, *rSet); } bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) |