summaryrefslogtreecommitdiff
path: root/sd/source/ui/dlg/tpoption.cxx
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 /sd/source/ui/dlg/tpoption.cxx
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 'sd/source/ui/dlg/tpoption.cxx')
-rw-r--r--sd/source/ui/dlg/tpoption.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 44aced815aeb..254a13d0f7d1 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -108,9 +108,9 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow,
- const SfxItemSet& rAttrs )
+ const SfxItemSet* rAttrs )
{
- return( new SdTpOptionsSnap( pWindow, rAttrs ) );
+ return( new SdTpOptionsSnap( pWindow, *rAttrs ) );
}
/*************************************************************************
@@ -120,7 +120,7 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow,
\************************************************************************/
SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet& rInAttrs ) :
- SfxTabPage ( pParent, "SdViewPage", "modules/simpress/ui/sdviewpage.ui", rInAttrs )
+ SfxTabPage ( pParent, "SdViewPage", "modules/simpress/ui/sdviewpage.ui", &rInAttrs )
{
get( m_pCbxRuler, "ruler");
get( m_pCbxDragStripes, "dragstripes");
@@ -182,9 +182,9 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs )
SfxTabPage* SdTpOptionsContents::Create( Window* pWindow,
- const SfxItemSet& rAttrs )
+ const SfxItemSet* rAttrs )
{
- return( new SdTpOptionsContents( pWindow, rAttrs ) );
+ return( new SdTpOptionsContents( pWindow, *rAttrs ) );
}
/*************************************************************************
@@ -196,7 +196,7 @@ SfxTabPage* SdTpOptionsContents::Create( Window* pWindow,
#define TOKEN ':'
SdTpOptionsMisc::SdTpOptionsMisc(Window* pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "OptSavePage", "modules/simpress/ui/optimpressgeneralpage.ui", rInAttrs)
+ : SfxTabPage(pParent, "OptSavePage", "modules/simpress/ui/optimpressgeneralpage.ui", &rInAttrs)
, nWidth(0)
, nHeight(0)
{
@@ -514,9 +514,9 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
SfxTabPage* SdTpOptionsMisc::Create( Window* pWindow,
- const SfxItemSet& rAttrs )
+ const SfxItemSet* rAttrs )
{
- return( new SdTpOptionsMisc( pWindow, rAttrs ) );
+ return( new SdTpOptionsMisc( pWindow, *rAttrs ) );
}