From bb761be472ea9a590837dc6c1ca295387ac4c0b7 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 11 Jun 2014 14:34:46 +0200
Subject: 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
---
 sc/source/ui/optdlg/tpview.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sc/source/ui/optdlg/tpview.cxx')

diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 1c0b23a862e7..9c74b954f0d9 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -41,7 +41,7 @@
 
 ScTpContentOptions::ScTpContentOptions( Window*         pParent,
                              const SfxItemSet&  rArgSet ) :
-    SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", rArgSet),
+    SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", &rArgSet),
     pLocalOptions(0)
 {
     get(pGridLB,"grid");
@@ -101,9 +101,9 @@ ScTpContentOptions::~ScTpContentOptions()
 }
 
 SfxTabPage* ScTpContentOptions::Create( Window*     pParent,
-                              const SfxItemSet&     rCoreSet )
+                              const SfxItemSet*     rCoreSet )
 {
-    return new ScTpContentOptions(pParent, rCoreSet);
+    return new ScTpContentOptions(pParent, *rCoreSet);
 }
 
 bool    ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
@@ -353,7 +353,7 @@ IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb )
 ScTpLayoutOptions::ScTpLayoutOptions(   Window* pParent,
                                         const SfxItemSet&   rArgSet ) :
     SfxTabPage( pParent, "ScGeneralPage",
-                "modules/scalc/ui/scgeneralpage.ui", rArgSet),
+                "modules/scalc/ui/scgeneralpage.ui", &rArgSet),
     aUnitArr(               ScResId(SCSTR_UNIT           )),
     pDoc(NULL)
 {
@@ -413,9 +413,9 @@ ScTpLayoutOptions::~ScTpLayoutOptions()
 }
 
 SfxTabPage* ScTpLayoutOptions::Create( Window*          pParent,
-                                    const SfxItemSet&   rCoreSet )
+                                    const SfxItemSet*   rCoreSet )
 {
-    ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, rCoreSet);
+    ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, *rCoreSet);
     ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current());
 
     if(pDocSh!=NULL)
-- 
cgit