Change SfxTabPage::Reset param from ref to pointer

...there was a call site that passed undefined "null pointer reference"
(apparently in a case where the passed argument was actually unused)

Change-Id: I663d4264b7a84f44ca69c732f3bc502f614b2b2a

32 files changed, 101 insertions, 101 deletions

diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index d03198ad899c..2df9dedf9e06 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -73,18 +73,18 @@ SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet& rAtt
     return ( new ScTabPageProtection( pParent, rAttrSet ) );
 }
 
-void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs )
+void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs )
 {
     //  Initialize variables
 
     sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION );
     const ScProtectionAttr* pProtAttr = NULL;
-    SfxItemState eItemState = rCoreAttrs.GetItemState( nWhich, false,
+    SfxItemState eItemState = rCoreAttrs->GetItemState( nWhich, false,
                                           (const SfxPoolItem**)&pProtAttr );
 
     // Is this a Default-Item?
     if ( eItemState == SFX_ITEM_DEFAULT )
-        pProtAttr = (const ScProtectionAttr*)&(rCoreAttrs.Get(nWhich));
+        pProtAttr = (const ScProtectionAttr*)&(rCoreAttrs->Get(nWhich));
     // At SFX_ITEM_DONTCARE let to 0
 
     bTriEnabled = ( pProtAttr == NULL );                // TriState, when DontCare
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index d87aa1a81185..aec819c06a9e 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -142,7 +142,7 @@ SfxTabPage* ScTabPageSortFields::Create( Window*    pParent,
     return ( new ScTabPageSortFields( pParent, rArgSet ) );
 }
 
-void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ )
 {
     bSortByRows = aSortData.bByRow;
     bHasHeader  = aSortData.bHasHeader;
@@ -621,7 +621,7 @@ SfxTabPage* ScTabPageSortOptions::Create(
     return ( new ScTabPageSortOptions( pParent, rArgSet ) );
 }
 
-void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ )
 {
     if ( aSortData.bUserDef )
     {
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index d76bc51992a2..086c3c794eb4 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -407,10 +407,10 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS
 {}
 
 
-#define RESET(i) (ScTpSubTotalGroup::DoReset( (i), rArgSet ))
-void ScTpSubTotalGroup1::Reset( const SfxItemSet& rArgSet ) { RESET(1); }
-void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); }
-void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); }
+#define RESET(i) (ScTpSubTotalGroup::DoReset( (i), *rArgSet ))
+void ScTpSubTotalGroup1::Reset( const SfxItemSet* rArgSet ) { RESET(1); }
+void ScTpSubTotalGroup2::Reset( const SfxItemSet* rArgSet ) { RESET(2); }
+void ScTpSubTotalGroup3::Reset( const SfxItemSet* rArgSet ) { RESET(3); }
 #undef RESET
 
 #define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), *rArgSet ))
@@ -474,7 +474,7 @@ SfxTabPage* ScTpSubTotalOptions::Create( Window*                 pParent,
     return ( new ScTpSubTotalOptions( pParent, rArgSet ) );
 }
 
-void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ )
 {
     pBtnPagebreak->Check ( rSubTotalData.bPagebreak );
     pBtnCase->Check      ( rSubTotalData.bCaseSens );
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 19708bff48b7..c59155ec8e66 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -385,42 +385,42 @@ const sal_uInt16* ScTPValidationValue::GetRanges()
     return pValueRanges;
 }
 
-void ScTPValidationValue::Reset( const SfxItemSet& rArgSet )
+void ScTPValidationValue::Reset( const SfxItemSet* rArgSet )
 {
     const SfxPoolItem* pItem;
 
     sal_uInt16 nLbPos = SC_VALIDDLG_ALLOW_ANY;
-    if( rArgSet.GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet->GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET )
         nLbPos = lclGetPosFromValMode( static_cast< ScValidationMode >(
             static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
     m_pLbAllow->SelectEntryPos( nLbPos );
 
     nLbPos = SC_VALIDDLG_DATA_EQUAL;
-    if( rArgSet.GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet->GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET )
         nLbPos = lclGetPosFromCondMode( static_cast< ScConditionMode >(
             static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
     m_pLbValue->SelectEntryPos( nLbPos );
 
     // *** check boxes ***
     bool bCheck = true;
-    if( rArgSet.GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet->GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET )
         bCheck = static_cast< const SfxBoolItem* >( pItem )->GetValue();
     m_pCbAllow->Check( bCheck );
 
     sal_Int32 nListType = ValidListType::UNSORTED;
-    if( rArgSet.GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET )
+    if( rArgSet->GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET )
         nListType = static_cast< const SfxInt16Item* >( pItem )->GetValue();
     m_pCbShow->Check( nListType != ValidListType::INVISIBLE );
     m_pCbSort->Check( nListType == ValidListType::SORTEDASCENDING );
 
     // *** formulas ***
     OUString aFmlaStr;
-    if ( rArgSet.GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET )
         aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
     SetFirstFormula( aFmlaStr );
 
     aFmlaStr= "";
-    if ( rArgSet.GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET )
         aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
     SetSecondFormula( aFmlaStr );
 
@@ -677,21 +677,21 @@ SfxTabPage* ScTPValidationHelp::Create( Window* pParent,
     return ( new ScTPValidationHelp( pParent, rArgSet ) );
 }
 
-void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
+void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet )
 {
     const SfxPoolItem* pItem;
 
-    if ( rArgSet.GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET )
         pTsbHelp->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
     else
         pTsbHelp->SetState( TRISTATE_FALSE );
 
-    if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET )
         pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         pEdtTitle->SetText( EMPTY_OUSTRING );
 
-    if ( rArgSet.GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET )
         pEdInputHelp->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         pEdInputHelp->SetText( EMPTY_OUSTRING );
@@ -747,26 +747,26 @@ SfxTabPage* ScTPValidationError::Create( Window*    pParent,
     return ( new ScTPValidationError( pParent, rArgSet ) );
 }
 
-void ScTPValidationError::Reset( const SfxItemSet& rArgSet )
+void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
 {
     const SfxPoolItem* pItem;
 
-    if ( rArgSet.GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET )
         m_pTsbShow->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
     else
         m_pTsbShow->SetState( TRISTATE_TRUE );   // check by default
 
-    if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET )
         m_pLbAction->SelectEntryPos( ((const SfxAllEnumItem*)pItem)->GetValue() );
     else
         m_pLbAction->SelectEntryPos( 0 );
 
-    if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET )
         m_pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         m_pEdtTitle->SetText( EMPTY_OUSTRING );
 
-    if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET )
+    if ( rArgSet->GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET )
         m_pEdError->SetText( ((const SfxStringItem*)pItem)->GetValue() );
     else
         m_pEdError->SetText( EMPTY_OUSTRING );
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 1602531b7b36..35c28f8dcef7 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -65,7 +65,7 @@ bool ScDocStatPage::FillItemSet( SfxItemSet* /* rSet */ )
     return false;
 }
 
-void ScDocStatPage::Reset( const SfxItemSet& /* rSet */ )
+void ScDocStatPage::Reset( const SfxItemSet* /* rSet */ )
 {
 }
 
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index 04da009d50cb..95eebca67341 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -52,7 +52,7 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 };
 #endif
 
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 758915aa2d15..58f6eab58a84 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -47,7 +47,7 @@ class ScHFEditPage : public SfxTabPage
 {
 public:
     virtual bool    FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
-    virtual void        Reset       ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE;
+    virtual void        Reset       ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
 
     void            SetNumType(SvxNumType eNumType);
     void            ClearTextAreas();
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index eed164d10da4..346489ffb056 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -31,7 +31,7 @@ public:
                                           const SfxItemSet&     rAttrSet );
     static  const sal_uInt16*     GetRanges       ();
     virtual bool        FillItemSet     ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
-    virtual void        Reset           ( const SfxItemSet& ) SAL_OVERRIDE;
+    virtual void        Reset           ( const SfxItemSet* ) SAL_OVERRIDE;
 
 protected:
     using SfxTabPage::DeactivatePage;
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index fbc56eaf8159..9ddab8887fc8 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -36,7 +36,7 @@ public:
     static  SfxTabPage* Create          ( Window*               pParent,
                                           const SfxItemSet&     rCoreSet );
     virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
-    virtual void        Reset           ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE;
+    virtual void        Reset           ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
     using SfxTabPage::DeactivatePage;
     virtual int         DeactivatePage  ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 
diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx
index f4ed342c43ef..9f594a1348d6 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -22,7 +22,7 @@ public:
     static  SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreAttrs);
 
     virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE;
-    virtual void Reset(const SfxItemSet& rCoreAttrs) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE;
     virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE;
 
 private:
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index 7122263428d5..13340e5edd4d 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -22,7 +22,7 @@ public:
     static  SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet);
 
     virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE;
-    virtual void Reset(const SfxItemSet& rCoreSet) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet* rCoreSet) SAL_OVERRIDE;
     virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE;
 
 private:
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 15352a5b6fce..e30c268d5ede 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -36,7 +36,7 @@ public:
     static  SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet);
 
     virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet& rCoreSet ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
     virtual int DeactivatePage(SfxItemSet* pSet = NULL) SAL_OVERRIDE;
 
 private:
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 1061e4139128..7469cf52a852 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -29,7 +29,7 @@ class ScHFPage : public SvxHFPage
 public:
     virtual         ~ScHFPage();
 
-    virtual void    Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void    Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool    FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE;
 
     void            SetPageStyle( const OUString& rName )    { aStrPageStyle = rName; }
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index 24ca945c5c35..c99f7b032b32 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -35,7 +35,7 @@ class ScTpPrintOptions : public SfxTabPage
 public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rCoreSet );
     virtual bool        FillItemSet( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rCoreSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
     using SfxTabPage::DeactivatePage;
     virtual int         DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 };
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index f654a88e4509..77533f8712d2 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -55,7 +55,7 @@ public:
     static  SfxTabPage* Create      ( Window*               pParent,
                                       const SfxItemSet&     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
-    virtual void        Reset       ( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
+    virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 
     virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) SAL_OVERRIDE;
     virtual void SetSizePixel(const Size& rAllocation) SAL_OVERRIDE;
@@ -117,7 +117,7 @@ public:
     static  SfxTabPage* Create      ( Window*               pParent,
                                       const SfxItemSet&     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
-    virtual void        Reset       ( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
+    virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 
 protected:
     virtual void        ActivatePage    ( const SfxItemSet& rSet ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index 6b2c18fd0fcb..fb1fa0d3a011 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -38,7 +38,7 @@ private:
 
 protected:
     virtual bool    FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void    Reset      ( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void    Reset      ( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
 private:
     FixedText*       m_pFtTables;
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index f6d48d5b5d03..794cb9f7786c 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -85,7 +85,7 @@ public:
     static  SfxTabPage* Create      ( Window*               pParent,
                                       const SfxItemSet&     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
-    virtual void        Reset       ( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
+    virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 };
 
 class ScTpSubTotalGroup2 : public ScTpSubTotalGroup
@@ -100,7 +100,7 @@ public:
     static  SfxTabPage* Create      ( Window*               pParent,
                                       const SfxItemSet&     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
-    virtual void        Reset       ( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
+    virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 };
 
 class ScTpSubTotalGroup3 : public ScTpSubTotalGroup
@@ -115,7 +115,7 @@ public:
     static  SfxTabPage* Create      ( Window*               pParent,
                                       const SfxItemSet&     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
-    virtual void        Reset       ( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
+    virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 };
 
 class ScTpSubTotalOptions : public SfxTabPage
@@ -130,7 +130,7 @@ public:
     static SfxTabPage*  Create      ( Window*               pParent,
                                       const SfxItemSet&     rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
-    virtual void        Reset       ( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
+    virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 
 private:
     CheckBox*    pBtnPagebreak;
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index 9ea189edd6fb..d342b00e8d47 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -32,7 +32,7 @@ public:
                                           const SfxItemSet& rCoreSet );
     static  const sal_uInt16* GetRanges       ();
     virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
-    virtual void        Reset           ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE;
+    virtual void        Reset           ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
     using SfxTabPage::DeactivatePage;
     virtual int         DeactivatePage  ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
     virtual void        DataChanged     ( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index 3c82200eb610..e5d2aff788d8 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -36,7 +36,7 @@ public:
     static  SfxTabPage* Create          ( Window*               pParent,
                                           const SfxItemSet&     rAttrSet );
     virtual bool        FillItemSet     ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
-    virtual void        Reset           ( const SfxItemSet& rCoreAttrs ) SAL_OVERRIDE;
+    virtual void        Reset           ( const SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
     using SfxTabPage::DeactivatePage;
     virtual int         DeactivatePage  ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 02a6c6a5ba78..8f115e3c5f1d 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -72,7 +72,7 @@ public:
     static  SfxTabPage* Create          ( Window*               pParent,
                                           const SfxItemSet&     rCoreSet );
     virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
-    virtual void        Reset           ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE;
+    virtual void        Reset           ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
     virtual void        ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
@@ -120,7 +120,7 @@ public:
     static  SfxTabPage* Create          ( Window*               pParent,
                                           const SfxItemSet&     rCoreSet );
     virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
-    virtual void        Reset           ( const SfxItemSet& rCoreSet ) SAL_OVERRIDE;
+    virtual void        Reset           ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
     using SfxTabPage::ActivatePage;
     using SfxTabPage::DeactivatePage;
     virtual void        ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 183cf00a1e59..e496d779e771 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -183,7 +183,7 @@ public:
     static const sal_uInt16*              GetRanges();
 
     virtual bool                FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE;
-    virtual void                Reset( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
+    virtual void                Reset( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 
 private:
     void                        Init();
@@ -277,7 +277,7 @@ public:
 
     static  SfxTabPage* Create      ( Window* pParent, const SfxItemSet& rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
-    virtual void        Reset       ( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
+    virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 };
 
 class ScTPValidationError : public SfxTabPage
@@ -302,7 +302,7 @@ public:
 
     static  SfxTabPage* Create      ( Window* pParent, const SfxItemSet& rArgSet );
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
-    virtual void        Reset       ( const SfxItemSet& rArgSet ) SAL_OVERRIDE;
+    virtual void        Reset       ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_SC_SOURCE_UI_INC_VALIDATE_HXX
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 9caa442e2edf..7bf8636ffbc6 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -128,7 +128,7 @@ bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ )
     return false;
 }
 
-void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ )
+void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ )
 {
     m_pContentColorLB->InsertEntry(aAuthorStr);
     m_pMoveColorLB->InsertEntry(aAuthorStr);
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index cff06b6995c7..27337df0a914 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -84,7 +84,7 @@ SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet
     return ( new ScTpCalcOptions( pParent, rAttrSet ) );
 }
 
-void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ )
+void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ )
 {
     sal_uInt16  d,m,y;
 
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 2c6dfdf1d6a1..709faaddc696 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -43,10 +43,10 @@ bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs)
     return bRet;
 }
 
-void ScTpCompatOptions::Reset(const SfxItemSet &rCoreAttrs)
+void ScTpCompatOptions::Reset(const SfxItemSet *rCoreAttrs)
 {
     const SfxPoolItem* pItem;
-    if (rCoreAttrs.HasItem(SID_SC_OPT_KEY_BINDING_COMPAT, &pItem))
+    if (rCoreAttrs->HasItem(SID_SC_OPT_KEY_BINDING_COMPAT, &pItem))
     {
         const SfxUInt16Item* p16Item = static_cast<const SfxUInt16Item*>(pItem);
         ScOptionsUtil::KeyBindingType eKeyB =
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index f68ee2f79046..a20f1c21e24b 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -60,12 +60,12 @@ bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet)
     return bRet;
 }
 
-void ScTpDefaultsOptions::Reset(const SfxItemSet& rCoreSet)
+void ScTpDefaultsOptions::Reset(const SfxItemSet* rCoreSet)
 {
     ScDefaultsOptions aOpt;
     const SfxPoolItem* pItem = NULL;
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCDEFAULTSOPTIONS, false , &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCDEFAULTSOPTIONS, false , &pItem))
         aOpt = ((const ScTpDefaultsItem*)pItem)->GetDefaultsOptions();
 
     m_pEdNSheets->SetValue( static_cast<sal_uInt16>( aOpt.GetInitTabCount()) );
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 587928018961..b2aaff2aa24c 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -285,12 +285,12 @@ bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet)
     return bRet;
 }
 
-void ScTpFormulaOptions::Reset(const SfxItemSet& rCoreSet)
+void ScTpFormulaOptions::Reset(const SfxItemSet* rCoreSet)
 {
     ScFormulaOptions aOpt;
     const SfxPoolItem* pItem = NULL;
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCFORMULAOPTIONS, false , &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCFORMULAOPTIONS, false , &pItem))
         aOpt = ((const ScTpFormulaItem*)pItem)->GetFormulaOptions();
 
     // formula grammar.
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index eb49658e800d..f96e88b3fcb9 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -57,12 +57,12 @@ int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP )
     return LEAVE_PAGE;
 }
 
-void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
+void ScTpPrintOptions::Reset( const SfxItemSet* rCoreSet )
 {
     ScPrintOptions aOptions;
 
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCPRINTOPTIONS, false , &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCPRINTOPTIONS, false , &pItem))
         aOptions = ((const ScTpPrintItem*)pItem)->GetPrintOptions();
     else
     {
@@ -70,7 +70,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet )
         aOptions = SC_MOD()->GetPrintOptions();
     }
 
-    if ( SFX_ITEM_SET == rCoreSet.GetItemState( SID_PRINT_SELECTEDSHEET, false , &pItem ) )
+    if ( SFX_ITEM_SET == rCoreSet->GetItemState( SID_PRINT_SELECTEDSHEET, false , &pItem ) )
     {
         bool bChecked = ( (const SfxBoolItem*)pItem )->GetValue();
         m_pSelectedSheetsCB->Check( bChecked );
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 06abb7ae9d53..dd8bb5070793 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -81,7 +81,7 @@ ScTpUserLists::ScTpUserLists( Window*               pParent,
 
     SetExchangeSupport();
     Init();
-    Reset(rCoreAttrs);
+    Reset(&rCoreAttrs);
 }
 
 ScTpUserLists::~ScTpUserLists()
@@ -142,10 +142,10 @@ SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet )
     return ( new ScTpUserLists( pParent, rAttrSet ) );
 }
 
-void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
+void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs )
 {
     const ScUserListItem& rUserListItem = (const ScUserListItem&)
-                                           rCoreAttrs.Get( nWhichUserLists );
+                                           rCoreAttrs->Get( nWhichUserLists );
     const ScUserList*     pCoreList     = rUserListItem.GetUserList();
 
     OSL_ENSURE( pCoreList, "UserList not found :-/" );
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 2bf7d4d62f28..1c0b23a862e7 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -148,10 +148,10 @@ bool    ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
     return bRet;
 }
 
-void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
+void    ScTpContentOptions::Reset( const SfxItemSet* rCoreSet )
 {
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SCVIEWOPTIONS, false , &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SCVIEWOPTIONS, false , &pItem))
         pLocalOptions  = new ScViewOptions(
                             ((const ScTpViewItem*)pItem)->GetViewOptions() );
     else
@@ -178,9 +178,9 @@ void    ScTpContentOptions::Reset( const SfxItemSet& rCoreSet )
     pBreakCB->Check( pLocalOptions->GetOption(VOPT_PAGEBREAKS) );
     pGuideLineCB->Check( pLocalOptions->GetOption(VOPT_HELPLINES) );
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_RANGEFINDER, false, &pItem))
         pRangeFindCB->Check(((const SfxBoolItem*)pItem)->GetValue());
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_OPT_SYNCZOOM, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_OPT_SYNCZOOM, false, &pItem))
         pSyncZoomCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
     pRangeFindCB->SaveValue();
@@ -521,12 +521,12 @@ bool    ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet )
     return bRet;
 }
 
-void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
+void    ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet )
 {
     m_pUnitLB->SetNoSelection();
-    if ( rCoreSet.GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE )
+    if ( rCoreSet->GetItemState( SID_ATTR_METRIC ) >= SFX_ITEM_AVAILABLE )
     {
-        const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet.Get( SID_ATTR_METRIC );
+        const SfxUInt16Item& rItem = (SfxUInt16Item&)rCoreSet->Get( SID_ATTR_METRIC );
         FieldUnit eFieldUnit = (FieldUnit)rItem.GetValue();
 
         for ( sal_Int32 i = 0; i < m_pUnitLB->GetEntryCount(); ++i )
@@ -542,7 +542,7 @@ void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
     m_pUnitLB->SaveValue();
 
     const SfxPoolItem* pItem;
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_ATTR_DEFTABSTOP, false, &pItem))
         m_pTabMF->SetValue(m_pTabMF->Normalize(((SfxUInt16Item*)pItem)->GetValue()), FUNIT_TWIP);
     m_pTabMF->SaveValue();
 
@@ -572,32 +572,32 @@ void    ScTpLayoutOptions::Reset( const SfxItemSet& rCoreSet )
             // added to avoid warnings
         }
     }
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTION, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_SELECTION, false, &pItem))
         m_pAlignCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_SELECTIONPOS, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_SELECTIONPOS, false, &pItem))
         m_pAlignLB->SelectEntryPos(((const SfxUInt16Item*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_EDITMODE, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_EDITMODE, false, &pItem))
         m_pEditModeCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem))
         m_pFormatCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem))
         m_pExpRefCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_MARK_HEADER, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_MARK_HEADER, false, &pItem))
         m_pMarkHdrCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if(SFX_ITEM_SET == rCoreSet.GetItemState(SID_SC_INPUT_TEXTWYSIWYG, false, &pItem))
+    if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_TEXTWYSIWYG, false, &pItem))
         m_pTextFmtCB->Check(((const SfxBoolItem*)pItem)->GetValue());
 
-    if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_REPLCELLSWARN, false, &pItem ) )
+    if( SFX_ITEM_SET == rCoreSet->GetItemState( SID_SC_INPUT_REPLCELLSWARN, false, &pItem ) )
         m_pReplWarnCB->Check( ( (const SfxBoolItem*)pItem)->GetValue() );
 
-    if( SFX_ITEM_SET == rCoreSet.GetItemState( SID_SC_INPUT_LEGACY_CELL_SELECTION, false, &pItem ) )
+    if( SFX_ITEM_SET == rCoreSet->GetItemState( SID_SC_INPUT_LEGACY_CELL_SELECTION, false, &pItem ) )
         m_pLegacyCellSelectionCB->Check( ( (const SfxBoolItem*)pItem)->GetValue() );
 
 
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 1ffa69423c1d..8cd771a35fd3 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -165,10 +165,10 @@ void ScHFEditPage::SetNumType(SvxNumType eNumType)
     m_pWndRight->SetNumType(eNumType);
 }
 
-void ScHFEditPage::Reset( const SfxItemSet& rCoreSet )
+void ScHFEditPage::Reset( const SfxItemSet* rCoreSet )
 {
     const SfxPoolItem* pItem = NULL;
-    if ( rCoreSet.HasItem(nWhich, &pItem) )
+    if ( rCoreSet->HasItem(nWhich, &pItem) )
     {
         const ScPageHFItem& rItem = static_cast<const ScPageHFItem&>(*pItem);
 
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index e1cf1d5d994c..d0a0af54cd45 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -81,7 +81,7 @@ ScHFPage::~ScHFPage()
 {
 }
 
-void ScHFPage::Reset( const SfxItemSet& rSet )
+void ScHFPage::Reset( const SfxItemSet* rSet )
 {
     SvxHFPage::Reset( rSet );
     TurnOnHdl( 0 );
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index ac2453831436..227e07979b1a 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -140,45 +140,45 @@ SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet& rCoreSet )
     return ( new ScTablePage( pParent, rCoreSet ) );
 }
 
-void ScTablePage::Reset( const SfxItemSet& rCoreSet )
+void ScTablePage::Reset( const SfxItemSet* rCoreSet )
 {
-    bool    bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, rCoreSet );
+    bool    bTopDown = GET_BOOL( SID_SCATTR_PAGE_TOPDOWN, *rCoreSet );
     sal_uInt16  nWhich   = 0;
 
     // sal_Bool flags
-    m_pBtnNotes->Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,rCoreSet) );
-    m_pBtnGrid->Check( GET_BOOL(SID_SCATTR_PAGE_GRID,rCoreSet) );
-    m_pBtnHeaders->Check( GET_BOOL(SID_SCATTR_PAGE_HEADERS,rCoreSet) );
-    m_pBtnFormulas->Check( GET_BOOL(SID_SCATTR_PAGE_FORMULAS,rCoreSet) );
-    m_pBtnNullVals->Check( GET_BOOL(SID_SCATTR_PAGE_NULLVALS,rCoreSet) );
+    m_pBtnNotes->Check( GET_BOOL(SID_SCATTR_PAGE_NOTES,*rCoreSet) );
+    m_pBtnGrid->Check( GET_BOOL(SID_SCATTR_PAGE_GRID,*rCoreSet) );
+    m_pBtnHeaders->Check( GET_BOOL(SID_SCATTR_PAGE_HEADERS,*rCoreSet) );
+    m_pBtnFormulas->Check( GET_BOOL(SID_SCATTR_PAGE_FORMULAS,*rCoreSet) );
+    m_pBtnNullVals->Check( GET_BOOL(SID_SCATTR_PAGE_NULLVALS,*rCoreSet) );
     m_pBtnTopDown->Check( bTopDown );
     m_pBtnLeftRight->Check( !bTopDown );
 
     // first printed page:
-    sal_uInt16 nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,rCoreSet);
+    sal_uInt16 nPage = GET_USHORT(SID_SCATTR_PAGE_FIRSTPAGENO,*rCoreSet);
     m_pBtnPageNo->Check( nPage != 0 );
     m_pEdPageNo->SetValue( (nPage != 0) ? nPage : 1 );
     PageNoHdl( NULL );
 
     // object representation:
-    m_pBtnCharts->Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, rCoreSet ) );
-    m_pBtnObjects->Check( GET_SHOW( SID_SCATTR_PAGE_OBJECTS, rCoreSet ) );
-    m_pBtnDrawings->Check( GET_SHOW( SID_SCATTR_PAGE_DRAWINGS, rCoreSet ) );
+    m_pBtnCharts->Check( GET_SHOW( SID_SCATTR_PAGE_CHARTS, *rCoreSet ) );
+    m_pBtnObjects->Check( GET_SHOW( SID_SCATTR_PAGE_OBJECTS, *rCoreSet ) );
+    m_pBtnDrawings->Check( GET_SHOW( SID_SCATTR_PAGE_DRAWINGS, *rCoreSet ) );
 
     // scaling:
     nWhich = GetWhich(SID_SCATTR_PAGE_SCALE);
-    if ( rCoreSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+    if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
     {
-        sal_uInt16 nScale = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue();
+        sal_uInt16 nScale = ((const SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue();
         if( nScale > 0 )
             m_pLbScaleMode->SelectEntryPos( SC_TPTABLE_SCALE_PERCENT );
         m_pEdScaleAll->SetValue( (nScale > 0) ? nScale : 100 );
     }
 
     nWhich = GetWhich(SID_SCATTR_PAGE_SCALETO);
-    if ( rCoreSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+    if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
     {
-        const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet.Get( nWhich ) );
+        const ScPageScaleToItem& rItem = static_cast< const ScPageScaleToItem& >( rCoreSet->Get( nWhich ) );
         sal_uInt16 nWidth = rItem.GetWidth();
         sal_uInt16 nHeight = rItem.GetHeight();
 
@@ -192,9 +192,9 @@ void ScTablePage::Reset( const SfxItemSet& rCoreSet )
     }
 
     nWhich = GetWhich(SID_SCATTR_PAGE_SCALETOPAGES);
-    if ( rCoreSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
+    if ( rCoreSet->GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
     {
-        sal_uInt16 nPages = ((const SfxUInt16Item&)rCoreSet.Get(nWhich)).GetValue();
+        sal_uInt16 nPages = ((const SfxUInt16Item&)rCoreSet->Get(nWhich)).GetValue();
         if( nPages > 0 )
             m_pLbScaleMode->SelectEntryPos( SC_TPTABLE_SCALE_TO_PAGES );
         m_pEdScalePageNum->SetValue( (nPages > 0) ? nPages : 1 );