summaryrefslogtreecommitdiff
path: root/svx/source/dialog
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-11 14:34:46 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-11 14:39:04 +0200
commitbb761be472ea9a590837dc6c1ca295387ac4c0b7 (patch)
tree178b4187effe2a05f3d77660ad83eea97144a287 /svx/source/dialog
parent4d120b6ab181f530d3fedc963b1c6ec777f2608a (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 'svx/source/dialog')
-rw-r--r--svx/source/dialog/hdft.cxx10
-rw-r--r--svx/source/dialog/optgrid.cxx2
2 files changed, 6 insertions, 6 deletions
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index dd67155f5233..6e8c26cc1ff8 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -114,9 +114,9 @@ const sal_uInt16* SvxHeaderPage::GetRanges()
-SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet* rSet )
{
- return new SvxHeaderPage( pParent, rSet );
+ return new SvxHeaderPage( pParent, *rSet );
}
@@ -128,9 +128,9 @@ const sal_uInt16* SvxFooterPage::GetRanges()
-SfxTabPage* SvxFooterPage::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* SvxFooterPage::Create( Window* pParent, const SfxItemSet* rSet )
{
- return new SvxFooterPage( pParent, rSet );
+ return new SvxFooterPage( pParent, *rSet );
}
@@ -155,7 +155,7 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) :
SvxHFPage::SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) :
- SfxTabPage( pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", rSet ),
+ SfxTabPage( pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", &rSet ),
nId ( nSetId ),
pBBSet ( NULL ),
bDisableQueryBox ( false ),
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 86cbc461809b..67bb8b7d56c0 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -128,7 +128,7 @@ SfxItemPresentation SvxGridItem::GetPresentation
// TabPage Screen Settings
SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
- SfxTabPage( pParent, "OptGridPage" , "svx/ui/optgridpage.ui", rCoreSet ),
+ SfxTabPage( pParent, "OptGridPage" , "svx/ui/optgridpage.ui", &rCoreSet ),
bAttrModified( false )
{
get(pCbxUseGridsnap,"usegridsnap");