[Libreoffice-commits] core.git: chart2/source cui/source dbaccess/source include/sfx2 include/svx sc/source sd/source sfx2/source starmath/inc starmath/source svx/source sw/source

Stephan Bergmann sbergman at redhat.com
Wed Jun 11 01:39:39 PDT 2014


 chart2/source/controller/dialogs/tp_AxisLabel.cxx      |   16 +-
 chart2/source/controller/dialogs/tp_AxisLabel.hxx      |    2 
 chart2/source/controller/dialogs/tp_AxisPositions.cxx  |   14 +-
 chart2/source/controller/dialogs/tp_AxisPositions.hxx  |    2 
 chart2/source/controller/dialogs/tp_DataLabel.cxx      |    4 
 chart2/source/controller/dialogs/tp_DataLabel.hxx      |    2 
 chart2/source/controller/dialogs/tp_ErrorBars.cxx      |    4 
 chart2/source/controller/dialogs/tp_ErrorBars.hxx      |    2 
 chart2/source/controller/dialogs/tp_LegendPosition.cxx |    6 -
 chart2/source/controller/dialogs/tp_LegendPosition.hxx |    2 
 chart2/source/controller/dialogs/tp_PointGeometry.cxx  |    4 
 chart2/source/controller/dialogs/tp_PointGeometry.hxx  |    2 
 chart2/source/controller/dialogs/tp_PolarOptions.cxx   |    8 -
 chart2/source/controller/dialogs/tp_PolarOptions.hxx   |    2 
 chart2/source/controller/dialogs/tp_Scale.cxx          |   40 +++----
 chart2/source/controller/dialogs/tp_Scale.hxx          |    2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx   |   20 +--
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx   |    2 
 chart2/source/controller/dialogs/tp_TitleRotation.cxx  |    8 -
 chart2/source/controller/dialogs/tp_TitleRotation.hxx  |    2 
 chart2/source/controller/dialogs/tp_Trendline.cxx      |    4 
 chart2/source/controller/dialogs/tp_Trendline.hxx      |    2 
 cui/source/customize/acccfg.cxx                        |    8 -
 cui/source/customize/cfg.cxx                           |    2 
 cui/source/customize/macropg.cxx                       |    2 
 cui/source/inc/acccfg.hxx                              |    2 
 cui/source/inc/align.hxx                               |    2 
 cui/source/inc/autocdlg.hxx                            |   14 +-
 cui/source/inc/backgrnd.hxx                            |    2 
 cui/source/inc/border.hxx                              |    2 
 cui/source/inc/cfg.hxx                                 |    2 
 cui/source/inc/chardlg.hxx                             |    8 -
 cui/source/inc/connect.hxx                             |    2 
 cui/source/inc/cuigaldlg.hxx                           |    4 
 cui/source/inc/cuioptgenrl.hxx                         |    2 
 cui/source/inc/cuitabarea.hxx                          |   14 +-
 cui/source/inc/cuitabline.hxx                          |    6 -
 cui/source/inc/dbregister.hxx                          |    2 
 cui/source/inc/dstribut.hxx                            |    2 
 cui/source/inc/grfpage.hxx                             |    2 
 cui/source/inc/labdlg.hxx                              |    2 
 cui/source/inc/macroass.hxx                            |    2 
 cui/source/inc/macropg.hxx                             |    2 
 cui/source/inc/measure.hxx                             |    2 
 cui/source/inc/numfmt.hxx                              |    2 
 cui/source/inc/numpages.hxx                            |   12 +-
 cui/source/inc/optasian.hxx                            |    2 
 cui/source/inc/optlingu.hxx                            |    2 
 cui/source/inc/optpath.hxx                             |    2 
 cui/source/inc/page.hxx                                |    2 
 cui/source/inc/paragrph.hxx                            |    8 -
 cui/source/inc/swpossizetabpage.hxx                    |    2 
 cui/source/inc/tabstpge.hxx                            |    2 
 cui/source/inc/textanim.hxx                            |    2 
 cui/source/inc/textattr.hxx                            |    2 
 cui/source/inc/transfrm.hxx                            |    6 -
 cui/source/options/connpooloptions.cxx                 |    4 
 cui/source/options/connpooloptions.hxx                 |    2 
 cui/source/options/dbregister.cxx                      |    4 
 cui/source/options/fontsubs.cxx                        |    2 
 cui/source/options/fontsubs.hxx                        |    2 
 cui/source/options/optaccessibility.cxx                |    2 
 cui/source/options/optaccessibility.hxx                |    2 
 cui/source/options/optasian.cxx                        |    2 
 cui/source/options/optbasic.cxx                        |    2 
 cui/source/options/optbasic.hxx                        |    2 
 cui/source/options/optchart.cxx                        |    2 
 cui/source/options/optchart.hxx                        |    2 
 cui/source/options/optcolor.cxx                        |    2 
 cui/source/options/optcolor.hxx                        |    2 
 cui/source/options/optctl.cxx                          |    2 
 cui/source/options/optctl.hxx                          |    2 
 cui/source/options/optfltr.cxx                         |    4 
 cui/source/options/optfltr.hxx                         |    4 
 cui/source/options/optgdlg.cxx                         |   16 +-
 cui/source/options/optgdlg.hxx                         |    6 -
 cui/source/options/optgenrl.cxx                        |    6 -
 cui/source/options/opthtml.cxx                         |    2 
 cui/source/options/opthtml.hxx                         |    2 
 cui/source/options/optinet2.cxx                        |    8 -
 cui/source/options/optinet2.hxx                        |    8 -
 cui/source/options/optjava.cxx                         |    2 
 cui/source/options/optjava.hxx                         |    2 
 cui/source/options/optjsearch.cxx                      |    2 
 cui/source/options/optjsearch.hxx                      |    2 
 cui/source/options/optlingu.cxx                        |    8 -
 cui/source/options/optmemory.cxx                       |    4 
 cui/source/options/optmemory.hxx                       |    2 
 cui/source/options/optpath.cxx                         |    2 
 cui/source/options/optsave.cxx                         |    2 
 cui/source/options/optsave.hxx                         |    2 
 cui/source/options/optupdt.cxx                         |    2 
 cui/source/options/optupdt.hxx                         |    2 
 cui/source/options/personalization.cxx                 |    2 
 cui/source/options/personalization.hxx                 |    2 
 cui/source/options/treeopt.cxx                         |    8 -
 cui/source/tabpages/align.cxx                          |    6 -
 cui/source/tabpages/autocdlg.cxx                       |   14 +-
 cui/source/tabpages/backgrnd.cxx                       |   40 +++----
 cui/source/tabpages/border.cxx                         |   12 +-
 cui/source/tabpages/chardlg.cxx                        |   96 ++++++++---------
 cui/source/tabpages/connect.cxx                        |   22 +--
 cui/source/tabpages/dstribut.cxx                       |    2 
 cui/source/tabpages/grfpage.cxx                        |   22 +--
 cui/source/tabpages/labdlg.cxx                         |    2 
 cui/source/tabpages/macroass.cxx                       |    6 -
 cui/source/tabpages/measure.cxx                        |   42 +++----
 cui/source/tabpages/numfmt.cxx                         |   24 ++--
 cui/source/tabpages/numpages.cxx                       |   62 +++++-----
 cui/source/tabpages/page.cxx                           |   34 +++---
 cui/source/tabpages/paragrph.cxx                       |   90 +++++++--------
 cui/source/tabpages/swpossizetabpage.cxx               |   34 +++---
 cui/source/tabpages/tabstpge.cxx                       |   10 -
 cui/source/tabpages/textanim.cxx                       |   18 +--
 cui/source/tabpages/textattr.cxx                       |   44 +++----
 cui/source/tabpages/tparea.cxx                         |   84 +++++++-------
 cui/source/tabpages/tpbitmap.cxx                       |    4 
 cui/source/tabpages/tpcolor.cxx                        |    8 -
 cui/source/tabpages/tpgradnt.cxx                       |    4 
 cui/source/tabpages/tphatch.cxx                        |    8 -
 cui/source/tabpages/tpline.cxx                         |   74 ++++++-------
 cui/source/tabpages/tplnedef.cxx                       |   10 -
 cui/source/tabpages/tplneend.cxx                       |    4 
 cui/source/tabpages/tpshadow.cxx                       |   22 +--
 cui/source/tabpages/transfrm.cxx                       |   16 +-
 dbaccess/source/ui/dlg/adminpages.cxx                  |    6 -
 dbaccess/source/ui/dlg/adminpages.hxx                  |    2 
 dbaccess/source/ui/dlg/dbadmin.cxx                     |    2 
 dbaccess/source/ui/dlg/generalpage.cxx                 |    2 
 dbaccess/source/ui/dlg/generalpage.hxx                 |    2 
 include/sfx2/dinfdlg.hxx                               |    8 -
 include/sfx2/mgetempl.hxx                              |    2 
 include/sfx2/printopt.hxx                              |    2 
 include/sfx2/securitypage.hxx                          |    2 
 include/sfx2/tabdlg.hxx                                |    2 
 include/svx/hdft.hxx                                   |    2 
 include/svx/optgrid.hxx                                |    2 
 sc/source/ui/attrdlg/tabpages.cxx                      |    6 -
 sc/source/ui/dbgui/tpsort.cxx                          |    4 
 sc/source/ui/dbgui/tpsubt.cxx                          |   10 -
 sc/source/ui/dbgui/validate.cxx                        |   32 ++---
 sc/source/ui/docshell/tpstat.cxx                       |    2 
 sc/source/ui/inc/opredlin.hxx                          |    2 
 sc/source/ui/inc/scuitphfedit.hxx                      |    2 
 sc/source/ui/inc/tabpages.hxx                          |    2 
 sc/source/ui/inc/tpcalc.hxx                            |    2 
 sc/source/ui/inc/tpcompatibility.hxx                   |    2 
 sc/source/ui/inc/tpdefaults.hxx                        |    2 
 sc/source/ui/inc/tpformula.hxx                         |    2 
 sc/source/ui/inc/tphf.hxx                              |    2 
 sc/source/ui/inc/tpprint.hxx                           |    2 
 sc/source/ui/inc/tpsort.hxx                            |    4 
 sc/source/ui/inc/tpstat.hxx                            |    2 
 sc/source/ui/inc/tpsubt.hxx                            |    8 -
 sc/source/ui/inc/tptable.hxx                           |    2 
 sc/source/ui/inc/tpusrlst.hxx                          |    2 
 sc/source/ui/inc/tpview.hxx                            |    4 
 sc/source/ui/inc/validate.hxx                          |    6 -
 sc/source/ui/optdlg/opredlin.cxx                       |    2 
 sc/source/ui/optdlg/tpcalc.cxx                         |    2 
 sc/source/ui/optdlg/tpcompatibility.cxx                |    4 
 sc/source/ui/optdlg/tpdefaults.cxx                     |    4 
 sc/source/ui/optdlg/tpformula.cxx                      |    4 
 sc/source/ui/optdlg/tpprint.cxx                        |    6 -
 sc/source/ui/optdlg/tpusrlst.cxx                       |    6 -
 sc/source/ui/optdlg/tpview.cxx                         |   34 +++---
 sc/source/ui/pagedlg/scuitphfedit.cxx                  |    4 
 sc/source/ui/pagedlg/tphf.cxx                          |    2 
 sc/source/ui/pagedlg/tptable.cxx                       |   34 +++---
 sd/source/ui/dlg/paragr.cxx                            |   12 +-
 sd/source/ui/dlg/prntopts.cxx                          |    4 
 sd/source/ui/dlg/tpaction.cxx                          |   10 -
 sd/source/ui/dlg/tpoption.cxx                          |   32 ++---
 sd/source/ui/inc/prntopts.hxx                          |    2 
 sd/source/ui/inc/tpaction.hxx                          |    2 
 sd/source/ui/inc/tpoption.hxx                          |    6 -
 sfx2/source/dialog/basedlgs.cxx                        |    2 
 sfx2/source/dialog/dinfdlg.cxx                         |   22 +--
 sfx2/source/dialog/documentfontsdialog.cxx             |    2 
 sfx2/source/dialog/mgetempl.cxx                        |    2 
 sfx2/source/dialog/printopt.cxx                        |    2 
 sfx2/source/dialog/securitypage.cxx                    |    4 
 sfx2/source/dialog/styledlg.cxx                        |    2 
 sfx2/source/dialog/tabdlg.cxx                          |   18 +--
 sfx2/source/inc/documentfontsdialog.hxx                |    2 
 sfx2/source/view/printer.cxx                           |    4 
 starmath/inc/dialog.hxx                                |    2 
 starmath/source/dialog.cxx                             |   18 +--
 svx/source/dialog/hdft.cxx                             |   14 +-
 svx/source/dialog/optgrid.cxx                          |    6 -
 sw/source/ui/chrdlg/chardlg.cxx                        |    6 -
 sw/source/ui/chrdlg/drpcps.cxx                         |    4 
 sw/source/ui/chrdlg/numpara.cxx                        |   22 +--
 sw/source/ui/chrdlg/swuiccoll.cxx                      |    2 
 sw/source/ui/config/mailconfigpage.cxx                 |    2 
 sw/source/ui/config/optcomp.cxx                        |    2 
 sw/source/ui/config/optload.cxx                        |   16 +-
 sw/source/ui/config/optpage.cxx                        |   48 ++++----
 sw/source/ui/dialog/docstdlg.cxx                       |    2 
 sw/source/ui/dialog/uiregionsw.cxx                     |   14 +-
 sw/source/ui/envelp/envfmt.cxx                         |    6 -
 sw/source/ui/envelp/envfmt.hxx                         |    2 
 sw/source/ui/envelp/envlop1.cxx                        |    6 -
 sw/source/ui/envelp/envprt.cxx                         |    6 -
 sw/source/ui/envelp/envprt.hxx                         |    2 
 sw/source/ui/envelp/label1.cxx                         |   24 ++--
 sw/source/ui/envelp/labfmt.cxx                         |    4 
 sw/source/ui/envelp/labfmt.hxx                         |    2 
 sw/source/ui/envelp/labprt.cxx                         |    4 
 sw/source/ui/envelp/labprt.hxx                         |    2 
 sw/source/ui/envelp/swuilabimp.hxx                     |    8 -
 sw/source/ui/fldui/flddb.cxx                           |    2 
 sw/source/ui/fldui/flddb.hxx                           |    2 
 sw/source/ui/fldui/flddinf.cxx                         |    2 
 sw/source/ui/fldui/flddinf.hxx                         |    2 
 sw/source/ui/fldui/flddok.cxx                          |    2 
 sw/source/ui/fldui/flddok.hxx                          |    2 
 sw/source/ui/fldui/fldfunc.cxx                         |    2 
 sw/source/ui/fldui/fldfunc.hxx                         |    2 
 sw/source/ui/fldui/fldpage.cxx                         |    2 
 sw/source/ui/fldui/fldref.cxx                          |    2 
 sw/source/ui/fldui/fldref.hxx                          |    2 
 sw/source/ui/fldui/fldvar.cxx                          |    2 
 sw/source/ui/fldui/fldvar.hxx                          |    2 
 sw/source/ui/frmdlg/column.cxx                         |   18 +--
 sw/source/ui/frmdlg/frmpage.cxx                        |   50 ++++----
 sw/source/ui/frmdlg/wrap.cxx                           |   16 +-
 sw/source/ui/index/cnttab.cxx                          |    8 -
 sw/source/ui/misc/docfnote.cxx                         |    2 
 sw/source/ui/misc/impfnote.hxx                         |    2 
 sw/source/ui/misc/num.cxx                              |    4 
 sw/source/ui/misc/outline.cxx                          |    6 -
 sw/source/ui/misc/pgfnote.cxx                          |    6 -
 sw/source/ui/misc/pggrid.cxx                           |    8 -
 sw/source/ui/table/tabledlg.cxx                        |   26 ++--
 sw/source/uibase/inc/chrdlg.hxx                        |    2 
 sw/source/uibase/inc/column.hxx                        |    2 
 sw/source/uibase/inc/docstdlg.hxx                      |    2 
 sw/source/uibase/inc/drpcps.hxx                        |    2 
 sw/source/uibase/inc/envlop.hxx                        |    2 
 sw/source/uibase/inc/frmpage.hxx                       |    8 -
 sw/source/uibase/inc/mailconfigpage.hxx                |    2 
 sw/source/uibase/inc/num.hxx                           |    2 
 sw/source/uibase/inc/numpara.hxx                       |    2 
 sw/source/uibase/inc/optcomp.hxx                       |    2 
 sw/source/uibase/inc/optload.hxx                       |    4 
 sw/source/uibase/inc/optpage.hxx                       |   16 +-
 sw/source/uibase/inc/outline.hxx                       |    2 
 sw/source/uibase/inc/pgfnote.hxx                       |    2 
 sw/source/uibase/inc/pggrid.hxx                        |    2 
 sw/source/uibase/inc/regionsw.hxx                      |    6 -
 sw/source/uibase/inc/swuiccoll.hxx                     |    2 
 sw/source/uibase/inc/swuicnttab.hxx                    |    6 -
 sw/source/uibase/inc/wrap.hxx                          |    2 
 sw/source/uibase/table/tablepg.hxx                     |    6 -
 255 files changed, 1032 insertions(+), 1032 deletions(-)

New commits:
commit a92e973b6d0a9ad87fe014442e1678af2ce0c7d0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jun 11 10:35:24 2014 +0200

    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

diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 2c9a466..9883b64 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -135,12 +135,12 @@ bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
     return true;
 }
 
-void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
+void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs )
 {
    const SfxPoolItem* pPoolItem = NULL;
 
     // show description
-    SfxItemState aState = rInAttrs.GetItemState( SCHATTR_AXIS_SHOWDESCR, false, &pPoolItem );
+    SfxItemState aState = rInAttrs->GetItemState( SCHATTR_AXIS_SHOWDESCR, false, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
         m_pCbShowDescription->EnableTriState( true );
@@ -162,7 +162,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
 
     // check new degree item
     m_nInitialDegrees = 0;
-    aState = rInAttrs.GetItemState( SCHATTR_TEXT_DEGREES, false, &pPoolItem );
+    aState = rInAttrs->GetItemState( SCHATTR_TEXT_DEGREES, false, &pPoolItem );
     if( aState == SFX_ITEM_SET )
         m_nInitialDegrees = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
 
@@ -174,7 +174,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
 
     // check stacked item
     m_bInitialStacking = false;
-    aState = rInAttrs.GetItemState( SCHATTR_TEXT_STACKED, false, &pPoolItem );
+    aState = rInAttrs->GetItemState( SCHATTR_TEXT_STACKED, false, &pPoolItem );
     if( aState == SFX_ITEM_SET )
         m_bInitialStacking = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
 
@@ -184,11 +184,11 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     else
         m_pOrientHlp->SetStackedState( TRISTATE_INDET );
 
-    if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET )
         m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
 
     // Text overlap ----------
-    aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, false, &pPoolItem );
+    aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_OVERLAP, false, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
         m_pCbTextOverlap->EnableTriState( true );
@@ -207,7 +207,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     }
 
     // text break ----------
-    aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_BREAK, false, &pPoolItem );
+    aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_BREAK, false, &pPoolItem );
     if( aState == SFX_ITEM_DONTCARE )
     {
         m_pCbTextBreak->EnableTriState( true );
@@ -232,7 +232,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
     // text order ----------
     if( m_bShowStaggeringControls )
     {
-        aState = rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_ORDER, false, &pPoolItem );
+        aState = rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_ORDER, false, &pPoolItem );
         if( aState == SFX_ITEM_SET )
         {
             SvxChartTextOrder eOrder = static_cast< const SvxChartTextOrderItem * >( pPoolItem )->GetValue();
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 115da27..838ea1b 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -76,7 +76,7 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
 
     void ShowStaggeringControls( bool bShowStaggeringControls );
     void SetComplexCategories( bool bComplexCategories );
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 461ba55..a43a104 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -131,7 +131,7 @@ bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
     return true;
 }
 
-void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
+void AxisPositionsTabPage::Reset(const SfxItemSet* rInAttrs)
 {
     //init and enable controls
     m_pED_CrossesAt->Show( !m_bCrossingAxisIsCategoryAxis );
@@ -160,7 +160,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
     const SfxPoolItem *pPoolItem = NULL;
 
     //axis line
-    if(rInAttrs.GetItemState(SCHATTR_AXIS_POSITION,true, &pPoolItem)== SFX_ITEM_SET)
+    if(rInAttrs->GetItemState(SCHATTR_AXIS_POSITION,true, &pPoolItem)== SFX_ITEM_SET)
     {
         bool bZero = false;
         sal_Int32 nPos = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
@@ -177,7 +177,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
             m_pLB_CrossesAt->SelectEntryPos( nPos );
         CrossesAtSelectHdl( (void*)0 );
 
-        if( rInAttrs.GetItemState(SCHATTR_AXIS_POSITION_VALUE,true, &pPoolItem)== SFX_ITEM_SET || bZero )
+        if( rInAttrs->GetItemState(SCHATTR_AXIS_POSITION_VALUE,true, &pPoolItem)== SFX_ITEM_SET || bZero )
         {
             double fCrossover = 0.0;
             if( !bZero )
@@ -200,7 +200,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
     }
 
     // Labels
-    if( rInAttrs.GetItemState( SCHATTR_AXIS_LABEL_POSITION, false, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs->GetItemState( SCHATTR_AXIS_LABEL_POSITION, false, &pPoolItem ) == SFX_ITEM_SET )
     {
         sal_Int32 nPos = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
         if( nPos < m_pLB_PlaceLabels->GetEntryCount() )
@@ -212,9 +212,9 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
 
     // Tick marks
     long nTicks = 0, nMinorTicks = 0;
-    if(rInAttrs.GetItemState(SCHATTR_AXIS_TICKS,true, &pPoolItem)== SFX_ITEM_SET)
+    if(rInAttrs->GetItemState(SCHATTR_AXIS_TICKS,true, &pPoolItem)== SFX_ITEM_SET)
         nTicks = ((const SfxInt32Item*)pPoolItem)->GetValue();
-    if(rInAttrs.GetItemState(SCHATTR_AXIS_HELPTICKS,true, &pPoolItem)== SFX_ITEM_SET)
+    if(rInAttrs->GetItemState(SCHATTR_AXIS_HELPTICKS,true, &pPoolItem)== SFX_ITEM_SET)
         nMinorTicks = ((const SfxInt32Item*)pPoolItem)->GetValue();
 
     m_pCB_TicksInner->Check(bool(nTicks&CHAXIS_MARK_INNER));
@@ -223,7 +223,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
     m_pCB_MinorOuter->Check(bool(nMinorTicks&CHAXIS_MARK_OUTER));
 
     // Tick position
-    if( rInAttrs.GetItemState( SCHATTR_AXIS_MARK_POSITION, false, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs->GetItemState( SCHATTR_AXIS_MARK_POSITION, false, &pPoolItem ) == SFX_ITEM_SET )
     {
         sal_Int32 nPos = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
         if( nPos < m_pLB_PlaceTicks->GetEntryCount() )
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index d34997b..d05bbab 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -36,7 +36,7 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
     using TabPage::DeactivatePage;
     virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE;
 
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 417544d..5c77535 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -48,9 +48,9 @@ bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
     return m_aDataLabelResources.FillItemSet(rOutAttrs);
 }
 
-void DataLabelsTabPage::Reset(const SfxItemSet& rInAttrs)
+void DataLabelsTabPage::Reset(const SfxItemSet* rInAttrs)
 {
-    m_aDataLabelResources.Reset(rInAttrs);
+    m_aDataLabelResources.Reset(*rInAttrs);
 }
 
 void DataLabelsTabPage::SetNumberFormatter( SvNumberFormatter* pFormatter )
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index 7494677..32981ce 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -40,7 +40,7 @@ public:
 
     void SetNumberFormatter( SvNumberFormatter* pFormatter );
 
-    virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
 
 private:
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index f0fc68d..225c607 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -52,9 +52,9 @@ bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
     return m_aErrorBarResources.FillItemSet( *rOutAttrs );
 }
 
-void ErrorBarsTabPage::Reset( const SfxItemSet& rInAttrs )
+void ErrorBarsTabPage::Reset( const SfxItemSet* rInAttrs )
 {
-    m_aErrorBarResources.Reset( rInAttrs );
+    m_aErrorBarResources.Reset( *rInAttrs );
 }
 
 void ErrorBarsTabPage::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index 838310c..96b14dc 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -39,7 +39,7 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index eba17ae..b932a53 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -56,12 +56,12 @@ bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)
     return true;
 }
 
-void SchLegendPosTabPage::Reset(const SfxItemSet& rInAttrs)
+void SchLegendPosTabPage::Reset(const SfxItemSet* rInAttrs)
 {
-    m_aLegendPositionResources.initFromItemSet(rInAttrs);
+    m_aLegendPositionResources.initFromItemSet(*rInAttrs);
 
     const SfxPoolItem* pPoolItem = 0;
-    if( rInAttrs.GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET )
+    if( rInAttrs->GetItemState( EE_PARA_WRITINGDIR, true, &pPoolItem ) == SFX_ITEM_SET )
         m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pPoolItem)->GetValue()) );
 }
 
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index 091f639..2c4a855 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -40,7 +40,7 @@ public:
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
-    virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index cbdd532..03b2214 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -65,11 +65,11 @@ bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
     return true;
 }
 
-void SchLayoutTabPage::Reset(const SfxItemSet& rInAttrs)
+void SchLayoutTabPage::Reset(const SfxItemSet* rInAttrs)
 {
     const SfxPoolItem *pPoolItem = NULL;
 
-    if (rInAttrs.GetItemState(SCHATTR_STYLE_SHAPE,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_STYLE_SHAPE,true, &pPoolItem) == SFX_ITEM_SET)
     {
         long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
         if(m_pGeometryResources)
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index 69139520..fda04f3 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -33,7 +33,7 @@ public:
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
-    virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
 
 private:
     BarGeometryResources*   m_pGeometryResources;
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 566ac73..f273160 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -70,11 +70,11 @@ bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
     return true;
 }
 
-void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
+void PolarOptionsTabPage::Reset(const SfxItemSet* rInAttrs)
 {
     const SfxPoolItem *pPoolItem = NULL;
 
-    if (rInAttrs.GetItemState(SCHATTR_STARTING_ANGLE, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_STARTING_ANGLE, true, &pPoolItem) == SFX_ITEM_SET)
     {
         long nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
         m_pAngleDial->SetRotation( nTmp*100 );
@@ -83,7 +83,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
     {
         m_pFL_StartingAngle->Show(false);
     }
-    if (rInAttrs.GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == SFX_ITEM_SET)
     {
         bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         m_pCB_Clockwise->Check(bCheck);
@@ -92,7 +92,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
     {
         m_pCB_Clockwise->Show(false);
     }
-    if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET)
     {
         bool bVal = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue();
         m_pCB_IncludeHiddenCells->Check(bVal);
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index 3af8f46..dbdb157 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -37,7 +37,7 @@ public:
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
-    virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
 
 private:
     CheckBox*         m_pCB_Clockwise;
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 7f4b17a..0f3a8ce 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -273,24 +273,24 @@ bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)
     return true;
 }
 
-void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
+void ScaleTabPage::Reset(const SfxItemSet* rInAttrs)
 {
     OSL_PRECOND( pNumFormatter, "No NumberFormatter available" );
     if(!pNumFormatter)
         return;
 
     const SfxPoolItem *pPoolItem = NULL;
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_ALLOW_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET)
         m_bAllowDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
     m_nAxisType=chart2::AxisType::REALNUMBER;
-    if (rInAttrs.GetItemState(SCHATTR_AXISTYPE, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXISTYPE, true, &pPoolItem) == SFX_ITEM_SET)
         m_nAxisType = (int) ((const SfxInt32Item*)pPoolItem)->GetValue();
     if( m_nAxisType==chart2::AxisType::DATE && !m_bAllowDateAxis )
         m_nAxisType=chart2::AxisType::CATEGORY;
     if( m_bAllowDateAxis )
     {
         bool bAutoDateAxis = false;
-        if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET)
+        if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_DATEAXIS, true, &pPoolItem) == SFX_ITEM_SET)
             bAutoDateAxis = (bool) ((const SfxBoolItem*)pPoolItem)->GetValue();
 
         sal_uInt16 nPos = 0;
@@ -310,66 +310,66 @@ void ScaleTabPage::Reset(const SfxItemSet& rInAttrs)
     m_pCbxAutoOrigin->Check( true );
     m_pCbx_AutoTimeResolution->Check( true );
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MIN,true,&pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_MIN,true,&pPoolItem) == SFX_ITEM_SET)
         m_pCbxAutoMin->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_MIN,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_MIN,true, &pPoolItem) == SFX_ITEM_SET)
     {
         fMin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
         lcl_setValue( *m_pFmtFldMin, fMin );
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_MAX,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_MAX,true, &pPoolItem) == SFX_ITEM_SET)
         m_pCbxAutoMax->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_MAX,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_MAX,true, &pPoolItem) == SFX_ITEM_SET)
     {
         fMax = ((const SvxDoubleItem*)pPoolItem)->GetValue();
         lcl_setValue( *m_pFmtFldMax, fMax );
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET)
         m_pCbxAutoStepMain->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_STEP_MAIN,true, &pPoolItem) == SFX_ITEM_SET)
     {
         fStepMain = ((const SvxDoubleItem*)pPoolItem)->GetValue();
         lcl_setValue( *m_pFmtFldStepMain, fStepMain );
         m_pMt_MainDateStep->SetValue( static_cast<sal_Int32>(fStepMain) );
     }
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET)
         m_pCbxAutoStepHelp->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_LOGARITHM,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_LOGARITHM,true, &pPoolItem) == SFX_ITEM_SET)
         m_pCbxLogarithm->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_REVERSE,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_REVERSE,true, &pPoolItem) == SFX_ITEM_SET)
         m_pCbxReverse->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_STEP_HELP,true, &pPoolItem) == SFX_ITEM_SET)
     {
         nStepHelp = ((const SfxInt32Item*)pPoolItem)->GetValue();
         m_pMtStepHelp->SetValue( nStepHelp );
     }
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET)
         m_pCbxAutoOrigin->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_ORIGIN,true, &pPoolItem) == SFX_ITEM_SET)
     {
         fOrigin = ((const SvxDoubleItem*)pPoolItem)->GetValue();
         lcl_setValue( *m_pFmtFldOrigin, fOrigin );
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_AUTO_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET)
         m_pCbx_AutoTimeResolution->Check(((const SfxBoolItem*)pPoolItem)->GetValue());
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_TIME_RESOLUTION,true, &pPoolItem) == SFX_ITEM_SET)
     {
         m_nTimeResolution = ((const SfxInt32Item*)pPoolItem)->GetValue();
         m_pLB_TimeResolution->SelectEntryPos( m_nTimeResolution );
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_MAIN_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET)
     {
         m_nMainTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
         m_pLB_MainTimeUnit->SelectEntryPos( m_nMainTimeUnit );
     }
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_HELP_TIME_UNIT,true, &pPoolItem) == SFX_ITEM_SET)
     {
         m_nHelpTimeUnit = ((const SfxInt32Item*)pPoolItem)->GetValue();
         m_pLB_HelpTimeUnit->SelectEntryPos( m_nHelpTimeUnit );
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index b4980c3..9e754f7 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -36,7 +36,7 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
     using TabPage::DeactivatePage;
     virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE;
 
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index d981cbc..b2c5cbb 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -115,13 +115,13 @@ bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs)
     return true;
 }
 
-void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
+void SchOptionTabPage::Reset(const SfxItemSet* rInAttrs)
 {
     const SfxPoolItem *pPoolItem = NULL;
 
     m_pRbtAxis1->Check(true);
     m_pRbtAxis2->Check(false);
-    if (rInAttrs.GetItemState(SCHATTR_AXIS,true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS,true, &pPoolItem) == SFX_ITEM_SET)
     {
         long nVal=((const SfxInt32Item*)pPoolItem)->GetValue();
         if(nVal==CHART_AXIS_SECONDARY_Y)
@@ -132,30 +132,30 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
     }
 
     long nTmp;
-    if (rInAttrs.GetItemState(SCHATTR_BAR_GAPWIDTH, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_BAR_GAPWIDTH, true, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
         m_pMTGap->SetValue(nTmp);
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_BAR_OVERLAP, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_BAR_OVERLAP, true, &pPoolItem) == SFX_ITEM_SET)
     {
         nTmp = (long)((const SfxInt32Item*)pPoolItem)->GetValue();
         m_pMTOverlap->SetValue(nTmp);
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) == SFX_ITEM_SET)
     {
         bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
         m_pCBConnect->Check(bCheck);
     }
 
-    if (rInAttrs.GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_AXIS_FOR_ALL_SERIES, true, &pPoolItem) == SFX_ITEM_SET)
     {
         m_nAllSeriesAxisIndex = static_cast< const SfxInt32Item * >( pPoolItem )->GetValue();
         m_pCBAxisSideBySide->Disable();
     }
-    if (rInAttrs.GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_GROUP_BARS_PER_AXIS, true, &pPoolItem) == SFX_ITEM_SET)
     {
         // model property is "group bars per axis", UI feature is the other way
         // round: "show bars side by side"
@@ -170,10 +170,10 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
     //missing value treatment
     {
         ::com::sun::star::uno::Sequence < sal_Int32 > aMissingValueTreatments;
-        if( rInAttrs.GetItemState(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, true, &pPoolItem) == SFX_ITEM_SET )
+        if( rInAttrs->GetItemState(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, true, &pPoolItem) == SFX_ITEM_SET )
             aMissingValueTreatments =((const SfxIntegerListItem*)pPoolItem)->GetConstSequence();
 
-        if ( aMissingValueTreatments.getLength()>1 && rInAttrs.GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,true, &pPoolItem) == SFX_ITEM_SET)
+        if ( aMissingValueTreatments.getLength()>1 && rInAttrs->GetItemState(SCHATTR_MISSING_VALUE_TREATMENT,true, &pPoolItem) == SFX_ITEM_SET)
         {
             m_pRB_DontPaint->Enable(false);
             m_pRB_AssumeZero->Enable(false);
@@ -205,7 +205,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
     }
 
     // Include hidden cells
-    if (rInAttrs.GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET)
+    if (rInAttrs->GetItemState(SCHATTR_INCLUDE_HIDDEN_CELLS, true, &pPoolItem) == SFX_ITEM_SET)
     {
         bool bVal = static_cast<const SfxBoolItem*>(pPoolItem)->GetValue();
         m_pCBIncludeHiddenCells->Check(bVal);
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 04f59dc..af969f7 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -35,7 +35,7 @@ public:
 
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
-    virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
 
     void Init( bool bProvidesSecondaryYAxis, bool bProvidesOverlapAndGapWidth, bool bProvidesBarConnectors );
 
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 5b9d404..06e0ba1 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -87,18 +87,18 @@ bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs)
     return true;
 }
 
-void SchAlignmentTabPage::Reset(const SfxItemSet& rInAttrs)
+void SchAlignmentTabPage::Reset(const SfxItemSet* rInAttrs)
 {
-    const SfxPoolItem* pItem = GetItem( rInAttrs, SCHATTR_TEXT_DEGREES );
+    const SfxPoolItem* pItem = GetItem( *rInAttrs, SCHATTR_TEXT_DEGREES );
 
     sal_Int32 nDegrees = pItem ? ((const SfxInt32Item*)pItem)->GetValue() : 0;
     m_pCtrlDial->SetRotation( nDegrees );
 
-    pItem = GetItem( rInAttrs, SCHATTR_TEXT_STACKED );
+    pItem = GetItem( *rInAttrs, SCHATTR_TEXT_STACKED );
     bool bStacked = pItem && ((const SfxBoolItem*)pItem)->GetValue();
     m_pOrientHlp->SetStackedState( bStacked ? TRISTATE_TRUE : TRISTATE_FALSE );
 
-    if( rInAttrs.GetItemState(EE_PARA_WRITINGDIR, true, &pItem) == SFX_ITEM_SET)
+    if( rInAttrs->GetItemState(EE_PARA_WRITINGDIR, true, &pItem) == SFX_ITEM_SET)
         m_pLbTextDirection->SelectEntryValue( SvxFrameDirection(((const SvxFrameDirectionItem*)pItem)->GetValue()) );
 }
 
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index dc46819..4ec3900 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -48,7 +48,7 @@ public:
     static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs);
     static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet& rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) SAL_OVERRIDE;
-    virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet* rInAttrs) SAL_OVERRIDE;
 };
 
 } //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index b95acf9..d375330 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -46,9 +46,9 @@ bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs )
     return m_aTrendlineResources.FillItemSet( rOutAttrs );
 }
 
-void TrendlineTabPage::Reset( const SfxItemSet& rInAttrs )
+void TrendlineTabPage::Reset( const SfxItemSet* rInAttrs )
 {
-    m_aTrendlineResources.Reset( rInAttrs );
+    m_aTrendlineResources.Reset( *rInAttrs );
 }
 
 void TrendlineTabPage::DataChanged( const DataChangedEvent& rDCEvt )
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index b50a7d0..580dcc8 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -34,7 +34,7 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
 
     virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
     void SetNumFormatter( SvNumberFormatter* pFormatter );
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 50519d6..3708c8c 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1441,7 +1441,7 @@ bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet* )
 }
 
 
-void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
+void SfxAcceleratorConfigPage::Reset( const SfxItemSet* rSet )
 {
     // open accelerator configs
     // Note: It initialize some other members too, which are needed here ...
@@ -1465,7 +1465,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
     RadioHdl(0);
 
     const SfxPoolItem* pMacroItem=0;
-    if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, true, &pMacroItem ) )
+    if( SFX_ITEM_SET == rSet->GetItemState( SID_MACROINFO, true, &pMacroItem ) )
     {
         m_pMacroInfoItem = PTR_CAST( SfxMacroInfoItem, pMacroItem );
         m_pGroupLBox->SelectMacro( m_pMacroInfoItem );
@@ -1473,11 +1473,11 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
     else
     {
         const SfxPoolItem* pStringItem=0;
-        if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, true, &pStringItem ) )
+        if( SFX_ITEM_SET == rSet->GetItemState( SID_CHARMAP, true, &pStringItem ) )
             m_pStringItem = PTR_CAST( SfxStringItem, pStringItem );
 
         const SfxPoolItem* pFontItem=0;
-        if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) )
+        if( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) )
             m_pFontItem = PTR_CAST( SfxStringItem, pFontItem );
     }
 }
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 10bc134..c8374d7 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1545,7 +1545,7 @@ SvxConfigPage::SvxConfigPage(Window *pParent, const SfxItemSet& rSet)
     m_pDescriptionField->EnableCursor( false );
 }
 
-void SvxConfigPage::Reset( const SfxItemSet& )
+void SvxConfigPage::Reset( const SfxItemSet* )
 {
     // If we haven't initialised our XMultiServiceFactory reference
     // then Reset is being called at the opening of the dialog.
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 5f4117b..0f486d4 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -369,7 +369,7 @@ bool _SvxMacroTabPage::FillItemSet( SfxItemSet* /*rSet*/ )
 }
 
 // the following method clears the bindings in the hashes for both doc & app
-void _SvxMacroTabPage::Reset( const SfxItemSet& )
+void _SvxMacroTabPage::Reset( const SfxItemSet* )
 {
     // called once in creation - don't reset the data this time
     if(!bInitialized)
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index db5b54c..9a3a1a3 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -174,7 +174,7 @@ public:
     virtual                     ~SfxAcceleratorConfigPage();
 
     virtual bool                FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void                Reset( const SfxItemSet& ) SAL_OVERRIDE;
+    virtual void                Reset( const SfxItemSet* ) SAL_OVERRIDE;
 
     void                        Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
 };
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 76412fb..8ad7b66 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -63,7 +63,7 @@ public:
     static const sal_uInt16*  GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual int         DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
     virtual void        DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 652328b..9644319 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -114,7 +114,7 @@ public:
                                 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;
     virtual void        ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
 
 };
@@ -173,7 +173,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
         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;
         virtual void        ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
 };
 
@@ -266,7 +266,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;
     virtual void        ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
     virtual void        Resize() SAL_OVERRIDE;
@@ -325,7 +325,7 @@ public:
                                 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;
     virtual void        ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
     virtual int         DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
     void                SetLanguage(LanguageType eSet);
@@ -391,7 +391,7 @@ public:
                                 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;
     virtual void        ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
 };
 
@@ -441,7 +441,7 @@ public:
                                 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;
     virtual void        ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
 
     void CopyToClipboard() const;
@@ -507,7 +507,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;
     virtual void        ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
 };
 
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 1fbdb81..f66f5c3 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -50,7 +50,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        FillUserData() SAL_OVERRIDE;
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
 
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 47ecbb1..9ec26bd 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -48,7 +48,7 @@ public:
     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;
 
     void                HideShadowControls();
     virtual void        PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 3da574f..529b4ea 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -437,7 +437,7 @@ public:
                                     SvTreeListEntry* pTargetEntry );
 
     bool            FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    void            Reset( const SfxItemSet& ) SAL_OVERRIDE;
+    void            Reset( const SfxItemSet* ) SAL_OVERRIDE;
 
     virtual bool    DeleteSelectedContent() = 0;
     virtual void    DeleteSelectedTopLevel() = 0;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 8bc60fb..39e5557 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -155,7 +155,7 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
     static const sal_uInt16*      GetRanges();
 
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                SetFontList( const SvxFontListItem& rItem );
@@ -234,7 +234,7 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
     static const sal_uInt16*      GetRanges();
 
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                DisableControls( sal_uInt16 nDisable );
@@ -313,7 +313,7 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
     static const sal_uInt16*      GetRanges();
 
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        FillUserData() SAL_OVERRIDE;
     ///                  the writer uses SID_ATTR_BRUSH as font background
@@ -356,7 +356,7 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
     static const sal_uInt16*      GetRanges();
 
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
     ///                  the writer uses SID_ATTR_BRUSH as font background
     void                SetPreviewBackgroundToCharacter();
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index c807f21..6519ce6 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -67,7 +67,7 @@ public:
     static  const sal_uInt16*     GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     void         Construct();
     void         SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index af65251..f55c6e2 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -213,7 +213,7 @@ private:
     FixedText*          m_pFtMSShowChangeDate;
     ExchangeData*       pData;
 
-    virtual void        Reset( const SfxItemSet& ) SAL_OVERRIDE {}
+    virtual void        Reset( const SfxItemSet* ) SAL_OVERRIDE {}
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
 
 
@@ -262,7 +262,7 @@ class TPGalleryThemeProperties : public SfxTabPage
     ::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer >             xMediaPlayer;
     ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker2 > xFolderPicker;
 
-    virtual void        Reset( const SfxItemSet& /*rSet*/ ) SAL_OVERRIDE {}
+    virtual void        Reset( const SfxItemSet* /*rSet*/ ) SAL_OVERRIDE {}
     virtual bool        FillItemSet( SfxItemSet* /*rSet*/ ) SAL_OVERRIDE { return true; }
     OUString     addExtension( const OUString&, const OUString& );
     void                FillFilterList();
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 9149dd2..8db3409 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -70,7 +70,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 // INCLUDED_CUI_SOURCE_INC_CUIOPTGENRL_HXX
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index e8e5fb6..0b0dbad 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -166,7 +166,7 @@ public:
     static const sal_uInt16* GetRanges();
 
     virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
-    virtual void Reset(const SfxItemSet&) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet*) SAL_OVERRIDE;
     virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int  DeactivatePage(SfxItemSet* pSet) SAL_OVERRIDE;
     virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
@@ -296,7 +296,7 @@ public:
     static  const sal_uInt16*     GetRanges();
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
@@ -361,7 +361,7 @@ public:
     static  const sal_uInt16*     GetRanges();
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
@@ -439,7 +439,7 @@ public:
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -515,7 +515,7 @@ public:
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -601,7 +601,7 @@ public:
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -736,7 +736,7 @@ public:
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index ed3f09c..a6055b3 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -211,7 +211,7 @@ public:
     static  const sal_uInt16*    GetRanges();
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet* ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -307,7 +307,7 @@ public:
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -377,7 +377,7 @@ public:
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 4c5d0ee..ebfb390 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -96,7 +96,7 @@ namespace svx
         static const sal_uInt16*      GetRanges();
 
         virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-        virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+        virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
         virtual void        FillUserData() SAL_OVERRIDE;
     };
 
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index ebc34ee..ad54f93 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -48,7 +48,7 @@ public:
     static SfxTabPage* Create(Window*, const SfxItemSet&,
         SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
     virtual bool FillItemSet(SfxItemSet*) SAL_OVERRIDE;
-    virtual void Reset(const SfxItemSet&) SAL_OVERRIDE;
+    virtual void Reset(const SfxItemSet*) SAL_OVERRIDE;
     virtual void PointChanged(Window* pWindow, RECT_POINT eRP) SAL_OVERRIDE;
 
     SvxDistributeHorizontal GetDistributeHor() const { return m_eDistributeHor; }
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index f429005..2fe1d13 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -114,7 +114,7 @@ public:
     static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet );
 
     virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE;
     virtual int DeactivatePage( SfxItemSet *pSet ) SAL_OVERRIDE;
 };
 
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 633f19a..ccd5d7a 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -79,7 +79,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet * ) SAL_OVERRIDE;
     void                Construct();
     void                SetView( const SdrView* pSdrView )
                             { pView = pSdrView; }
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index c5355f2..bdb5919 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -71,7 +71,7 @@ public:
 
     // --------- inherit from the base -------------
     virtual bool                FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void                Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void                Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     bool                        IsReadOnly() const SAL_OVERRIDE;
 };
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index cc59a5c..19ee9d2 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -86,7 +86,7 @@ public:
     void                        InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable );
     virtual bool                FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
 
-    virtual void                Reset( const SfxItemSet& ) SAL_OVERRIDE;
+    virtual void                Reset( const SfxItemSet* ) SAL_OVERRIDE;
 
     void                        DisplayAppEvents( bool appEvents);
     void                        SetReadOnly( bool bSet );
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 8903946..f97e026e 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -71,7 +71,7 @@ public:
     static  const sal_uInt16*     GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
 
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 8520f60..2a3a153 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -75,7 +75,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void            Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual int             DeactivatePage  ( SfxItemSet* pSet = NULL ) SAL_OVERRIDE;
 
     void                    SetInfoItem( const SvxNumberInfoItem& rItem );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index d0fe941..7d08a9f 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -116,7 +116,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int         DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;}
 };
@@ -152,7 +152,7 @@ class SvxBulletPickTabPage : public SfxTabPage
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int         DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;}
     virtual void        PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -195,7 +195,7 @@ class SvxNumPickTabPage : public SfxTabPage
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int         DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                SetCharFmtNames(const OUString& rCharName, const OUString& rBulName)
                             {   sNumCharFmtName = rCharName;
@@ -240,7 +240,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int         DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                SetNumCharFmtName(const OUString& rName){sNumCharFmtName = rName;}
 };
@@ -352,7 +352,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int         DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
                         {
@@ -452,7 +452,7 @@ public:
     virtual void        ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual int         DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     static SfxTabPage*  Create( Window* pParent,
                                 const SfxItemSet& rAttrSet);
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 458965a..ecbfbf2 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -60,7 +60,7 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
     static const sal_uInt16*  GetRanges();
     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/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 20846c51..9128931 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -152,7 +152,7 @@ public:
     static const sal_uInt16*  GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                HideGroups( sal_uInt16 nGrp );
 };
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index d87961f..7ee28ae 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -76,7 +76,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        FillUserData() SAL_OVERRIDE;
 };
 
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 37c54cc..2d8c72a 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -181,7 +181,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void        FillUserData() SAL_OVERRIDE;
 
     virtual ~SvxPageDescPage();
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index fa15f7d..245b10d 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -103,7 +103,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void            Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
 
     void                    SetPageWidth( sal_uInt16 nPageWidth );
@@ -164,7 +164,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void            Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                    EnableJustifyExt();
     virtual void            PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -196,7 +196,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                DisablePageBreak();
 
@@ -276,7 +276,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
 };
 
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 03b81ff..95a1b61 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -129,7 +129,7 @@ public:
     static const sal_uInt16*     GetRanges();
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
 
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 6cf3a1d..1a11c86 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -54,7 +54,7 @@ public:
     static const sal_uInt16*      GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
 
     void                DisableControls( const sal_uInt16 nFlag );
 
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 7a71b15..d584df6 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -80,7 +80,7 @@ public:
     static  const sal_uInt16*     GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     void         Construct();
 };
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index fe8eddd..ad4c45f 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -81,7 +81,7 @@ public:
     static  const sal_uInt16*     GetRanges();
 
     virtual bool        FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void        PointChanged( Window* pWindow, RECT_POINT eRP ) SAL_OVERRIDE;
 
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 2f44a15..47b8d33 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -151,7 +151,7 @@ public:
     static const sal_uInt16*     GetRanges();
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -206,7 +206,7 @@ public:
     static const sal_uInt16*     GetRanges();
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
@@ -250,7 +250,7 @@ public:
     static const sal_uInt16*     GetRanges();
 
     virtual bool FillItemSet( SfxItemSet* ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet & ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet * ) SAL_OVERRIDE;
 
     virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
     virtual int  DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 613c8a4..95402c9 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -397,9 +397,9 @@ namespace offapp
     }
 
 
-    void ConnectionPoolOptionsPage::Reset(const SfxItemSet& _rSet)
+    void ConnectionPoolOptionsPage::Reset(const SfxItemSet* _rSet)
     {
-        implInitControls(_rSet, true);
+        implInitControls(*_rSet, true);
     }
 
 
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 064999c..f65bb8c 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -57,7 +57,7 @@ namespace offapp
         virtual bool        Notify( NotifyEvent& _rNEvt ) SAL_OVERRIDE;
 
         virtual bool        FillItemSet(SfxItemSet* _rSet) SAL_OVERRIDE;
-        virtual void        Reset(const SfxItemSet& _rSet) SAL_OVERRIDE;
+        virtual void        Reset(const SfxItemSet* _rSet) SAL_OVERRIDE;
         virtual void        ActivatePage( const SfxItemSet& _rSet) SAL_OVERRIDE;
 
     protected:
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 151d654..666d1b9 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -210,10 +210,10 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet )
 
 
 
-void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
+void DbRegistrationOptionsPage::Reset( const SfxItemSet* rSet )
 {
     // the settings for the single drivers
-    SFX_ITEMSET_GET( rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true );
+    SFX_ITEMSET_GET( *rSet, pRegistrations, DatabaseMapItem, SID_SB_DB_REGISTER, true );
     if ( !pRegistrations )
         return;
 
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index be2dd1c..d140fe8 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -192,7 +192,7 @@ bool  SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
     return false;
 }
 
-void  SvxFontSubstTabPage::Reset( const SfxItemSet& )
+void  SvxFontSubstTabPage::Reset( const SfxItemSet* )
 {
     m_pCheckLB->SetUpdateMode(false);
     m_pCheckLB->Clear();
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index bad9084..b505904 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -97,7 +97,7 @@ class SvxFontSubstTabPage : public SfxTabPage
 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;
 };
 
 
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 4b260d3..588d2c9 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -94,7 +94,7 @@ bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
     return false;
 }
 
-void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& )
+void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet* )
 {
     //set controls from aConfig.Get...
 
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index cd65854..5239470 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -47,7 +47,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/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 44d8cbb..8f57866 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -215,7 +215,7 @@ bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
     return false;
 }
 
-void SvxAsianLayoutPage::Reset( const SfxItemSet& )
+void SvxAsianLayoutPage::Reset( const SfxItemSet* )
 {
     SfxViewFrame* pCurFrm = SfxViewFrame::Current();
     SfxObjectShell* pDocSh = pCurFrm ? pCurFrm->GetObjectShell() : 0;
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 317d526..a3c6f22 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -120,7 +120,7 @@ bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
     return bModified;
 }
 
-void SvxBasicIDEOptionsPage::Reset( const SfxItemSet& /*rSet*/ )
+void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
 {
     LoadConfig();
     pCodeCompleteChk->SaveValue();
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index d065ea6..4727ab7 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -42,7 +42,7 @@ public:
 
     static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
     virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void FillUserData() SAL_OVERRIDE;
 };
 
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 74b9b60..799fb0a 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -116,7 +116,7 @@ bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
     return true;
 }
 
-void SvxDefaultColorOptPage::Reset( const SfxItemSet& )
+void SvxDefaultColorOptPage::Reset( const SfxItemSet* )
 {
     m_pLbChartColors->SelectEntryPos( 0 );
     ListClickedHdl(m_pLbChartColors);
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 7a1bd24..5ec9299 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -60,7 +60,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rInAttrs );
     virtual bool        FillItemSet( SfxItemSet* rOutAttrs ) SAL_OVERRIDE;
-    virtual void        Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rInAttrs ) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_CUI_SOURCE_OPTIONS_OPTCHART_HXX
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 9abfde7..df3755b 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1094,7 +1094,7 @@ bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet*  )
     return true;
 }
 
-void SvxColorOptionsTabPage::Reset( const SfxItemSet& )
+void SvxColorOptionsTabPage::Reset( const SfxItemSet* )
 {
     if(pColorConfig)
     {
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index d355378..7df087f 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -53,7 +53,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;
 
     virtual int         DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
     virtual void        FillUserData() SAL_OVERRIDE;
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index e550113..6893697 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -112,7 +112,7 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
     return bModified;
 }
 
-void SvxCTLOptionsPage::Reset( const SfxItemSet& )
+void SvxCTLOptionsPage::Reset( const SfxItemSet* )
 {
     SvtCTLOptions aCTLOptions;
 
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index e2396e2..e49a7a1 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -49,7 +49,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 // INCLUDED_CUI_SOURCE_OPTIONS_OPTCTL_HXX
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 8c5e471..391a242 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -102,7 +102,7 @@ bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
     return false;
 }
 
-void OfaMSFilterTabPage::Reset( const SfxItemSet& )
+void OfaMSFilterTabPage::Reset( const SfxItemSet* )
 {
     const SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
@@ -223,7 +223,7 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
     return true;
 }
 
-void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
+void OfaMSFilterTabPage2::Reset( const SfxItemSet* )
 {
     SvtFilterOptions& rOpt = SvtFilterOptions::Get();
 
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index da22fe5..71a6204 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -47,7 +47,7 @@ public:
                                 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;
 };
 
 class OfaMSFilterTabPage2 : public SfxTabPage
@@ -96,7 +96,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;
 };
 
 
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6bb145a..980bfa8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -296,7 +296,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
 
 
 
-void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
+void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 {
     SvtHelpOptions aHelpOptions;
     m_pToolTipsCB->Check( aHelpOptions.IsHelpTips() );
@@ -318,7 +318,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
     m_pDocStatusCB->SaveValue();
 
     const SfxPoolItem* pItem = NULL;
-    if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
+    if ( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem ) )
     {
         m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() );
         TwoFigureConfigHdl(m_pYearValueField);
@@ -851,7 +851,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* )
     return bModified;
 }
 
-void OfaViewTabPage::Reset( const SfxItemSet& )
+void OfaViewTabPage::Reset( const SfxItemSet* )
 {
     SvtMiscOptions aMiscOptions;
 
@@ -1416,7 +1416,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
     return false;
 }
 
-void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
+void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet )
 {
     OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString();
     if ( !sLang.isEmpty() )
@@ -1509,21 +1509,21 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
         m_pCurrentDocCB->Enable(true);
         m_pCurrentDocCB->Check(bLanguageCurrentDoc_Impl);
         const SfxPoolItem* pLang;
-        if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, false, &pLang))
+        if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_LANGUAGE, false, &pLang))
         {
             LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
             if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang)
                 eCurLang = eTempCurLang;
         }
 
-        if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang))
+        if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang))
         {
             LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
             if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang)
                 eCurLangCJK = eTempCurLang;
         }
 
-        if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang))
+        if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang))
         {
             LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
             if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang)
@@ -1568,7 +1568,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
     // check the box "For the current document only"
     // set the focus to the Western Language box
     const SfxPoolItem* pLang = 0;
-    if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() )
+    if ( SFX_ITEM_SET == rSet->GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() )
     {
         m_pWesternLanguageLB->GrabFocus();
         m_pCurrentDocCB->Enable(true);
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 28a7a58..93985aa 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -71,7 +71,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;
 };
 
 // class OfaViewTabPage --------------------------------------------------
@@ -126,7 +126,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;
 };
 
 struct LanguageConfig_Impl;
@@ -170,7 +170,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 // INCLUDED_CUI_SOURCE_OPTIONS_OPTGDLG_HXX
 
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index af517dc..b3ae874 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -323,15 +323,15 @@ bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
 
 
 
-void SvxGeneralTabPage::Reset( const SfxItemSet& rSet )
+void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
 {
     SetAddress_Impl();
 
     sal_uInt16 const nWhich = GetWhich(SID_FIELD_GRABFOCUS);
 
-    if (rSet.GetItemState(nWhich) == SFX_ITEM_SET)
+    if (rSet->GetItemState(nWhich) == SFX_ITEM_SET)
     {
-        if (sal_uInt16 const nField = ((SfxUInt16Item&)rSet.Get(nWhich)).GetValue())
+        if (sal_uInt16 const nField = ((SfxUInt16Item&)rSet->Get(nWhich)).GetValue())
         {
             for (unsigned i = 0; i != vFields.size(); ++i)
                 if (nField == vFieldInfo[vFields[i]->iField].nGrabFocusId)
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index a7a4e33..7d5386c 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -142,7 +142,7 @@ bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
     return false;
 }
 
-void OfaHtmlTabPage::Reset( const SfxItemSet& )
+void OfaHtmlTabPage::Reset( const SfxItemSet* )
 {
     SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
     aSize1NF->SetValue(rHtmlOpt.GetFontSize(0));
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index a91a4ed..47c8d08 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -60,7 +60,7 @@ public:
                                 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;
 
 };
 
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index ad94515..1d71abe 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -375,7 +375,7 @@ void SvxProxyTabPage::RestoreConfigDefaults_Impl()
     }
 }
 
-void SvxProxyTabPage::Reset(const SfxItemSet&)
+void SvxProxyTabPage::Reset(const SfxItemSet*)
 {
     ReadConfigData_Impl();
 
@@ -909,7 +909,7 @@ bool SvxSecurityTabPage::FillItemSet( SfxItemSet* )
 
 /*--------------------------------------------------------------------*/
 
-void SvxSecurityTabPage::Reset( const SfxItemSet& )
+void SvxSecurityTabPage::Reset( const SfxItemSet* )
 {
 }
 
@@ -947,7 +947,7 @@ bool MozPluginTabPage::FillItemSet( SfxItemSet* )
     return true;
 }
 
-void MozPluginTabPage::Reset( const SfxItemSet& )
+void MozPluginTabPage::Reset( const SfxItemSet* )
 {
         m_pWBasicCodeCB->Check( isInstalled());
         m_pWBasicCodeCB->SaveValue();
@@ -1248,7 +1248,7 @@ bool SvxEMailTabPage::FillItemSet( SfxItemSet* )
 
 /* -------------------------------------------------------------------------*/
 
-void SvxEMailTabPage::Reset( const SfxItemSet& )
+void SvxEMailTabPage::Reset( const SfxItemSet* )
 {
     m_pMailerURLED->Enable(true );
     m_pMailerURLPB->Enable(true );
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 105bce8..362f845 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -106,7 +106,7 @@ private:
 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;
 };
 
 // #98647# class SvxScriptExecListBox ------------------------------------
@@ -176,7 +176,7 @@ protected:
 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;
 };
 
 class MozPluginTabPage : public SfxTabPage
@@ -196,7 +196,7 @@ public:
                                 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;
 
 };
 
@@ -221,7 +221,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 // INCLUDED_CUI_SOURCE_OPTIONS_OPTINET2_HXX
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 39ec6a3..15030f1 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -749,7 +749,7 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
 
 
 
-void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ )
+void SvxJavaOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
 {
     ClearJavaInfo();
     ClearJavaList();
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index 421c1e4..6b9bf7a 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -110,7 +110,7 @@ public:
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void            Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void            FillUserData() SAL_OVERRIDE;
 };
 
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index b3951b8..b8f68d9 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -160,7 +160,7 @@ sal_Int32 SvxJSearchOptionsPage::GetTransliterationFlags_Impl()
 }
 
 
-void SvxJSearchOptionsPage::Reset( const SfxItemSet& )
+void SvxJSearchOptionsPage::Reset( const SfxItemSet* )
 {
     SvtSearchOptions aOpt;
 
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 9173c24..2667906 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -66,7 +66,7 @@ public:
 
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rSet );
 
-    virtual void        Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void        Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual bool        FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
 
     bool                IsSaveOptions() const           { return bSaveOptions; }
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 3481b755..ae66374 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1406,7 +1406,7 @@ void SvxLinguTabPage::UpdateModulesBox_Impl()
 
 
 
-void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
+void SvxLinguTabPage::Reset( const SfxItemSet* rSet )
 {
     // if not HideGroups was called with GROUP_MODULES...
     if (m_pLinguModulesCLB->IsVisible())
@@ -1435,7 +1435,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
 
     pEntry = CreateEntry( sSpellAuto,       CBCOL_FIRST );
     aLngCfg.GetProperty( UPN_IS_SPELL_AUTO ) >>= bVal;
-    const SfxPoolItem* pItem = GetItem( rSet, SID_AUTOSPELL_CHECK );
+    const SfxPoolItem* pItem = GetItem( *rSet, SID_AUTOSPELL_CHECK );
     if (pItem)
         bVal = ((SfxBoolItem *) pItem)->GetValue();
     nUserData = OptionsUserData( EID_SPELL_AUTO, false, 0, true, bVal).GetUserData();
@@ -1479,8 +1479,8 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
 
     const SfxHyphenRegionItem *pHyp = NULL;
     sal_uInt16 nWhich = GetWhich( SID_ATTR_HYPHENREGION );
-    if ( rSet.GetItemState( nWhich, false ) == SFX_ITEM_SET )
-        pHyp = &( (const SfxHyphenRegionItem &) rSet.Get( nWhich ) );
+    if ( rSet->GetItemState( nWhich, false ) == SFX_ITEM_SET )
+        pHyp = &( (const SfxHyphenRegionItem &) rSet->Get( nWhich ) );
 
     pEntry = CreateEntry( sNumPreBreak,     CBCOL_SECOND );
     aLngCfg.GetProperty( UPN_HYPH_MIN_LEADING ) >>= nVal;
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 1e1a97d..a391865 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -207,7 +207,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet* rSet )
 
 
 
-void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
+void OfaMemoryOptionsPage::Reset( const SfxItemSet* rSet )
 {
     const SfxPoolItem*  pItem;
 
@@ -239,7 +239,7 @@ void OfaMemoryOptionsPage::Reset( const SfxItemSet& rSet )
             (officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::
              get())));
 
-    SfxItemState eState = rSet.GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem );
+    SfxItemState eState = rSet->GetItemState( SID_ATTR_QUICKLAUNCHER, false, &pItem );
     if ( SFX_ITEM_SET == eState )
         m_pQuickLaunchCB->Check( ( (SfxBoolItem*)pItem )->GetValue() );
     else if ( SFX_ITEM_DISABLED == eState )
diff --git a/cui/source/options/optmemory.hxx b/cui/source/options/optmemory.hxx
index b1564fb..327cc54 100644
--- a/cui/source/options/optmemory.hxx
+++ b/cui/source/options/optmemory.hxx
@@ -62,7 +62,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;
 };
 
 
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5b44550..de014e7 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -278,7 +278,7 @@ bool SvxPathTabPage::FillItemSet( SfxItemSet* )
 
 
 
-void SvxPathTabPage::Reset( const SfxItemSet& )
+void SvxPathTabPage::Reset( const SfxItemSet* )
 {
     pPathBox->Clear();
 
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 42e744f..9c27762 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -379,7 +379,7 @@ bool isODFFormat( const OUString& sFilter )
     return bRet;
 }
 
-void SfxSaveTabPage::Reset( const SfxItemSet& )
+void SfxSaveTabPage::Reset( const SfxItemSet* )
 {
     SvtSaveOptions aSaveOpt;
     aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings());
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 189240c..7b5158f 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -77,7 +77,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 // INCLUDED_CUI_SOURCE_OPTIONS_OPTSAVE_HXX
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 2ac7d83..a8ab4c6 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -220,7 +220,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* )
 
 
 
-void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& )
+void SvxOnlineUpdateTabPage::Reset( const SfxItemSet* )
 {
     bool bValue = false;
     m_xUpdateAccess->getByName( "AutoCheckEnabled" ) >>= bValue;
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 525fbca..996d1b2 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -57,7 +57,7 @@ public:
     static SfxTabPage*      Create( Window* pParent, const SfxItemSet& rSet );
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
-    virtual void            Reset( const SfxItemSet& rSet ) SAL_OVERRIDE;
+    virtual void            Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
     virtual void            FillUserData() SAL_OVERRIDE;
 };
 
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 57cffe7..60a7745 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -144,7 +144,7 @@ bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * )
     return bModified;
 }
 
-void SvxPersonalizationTabPage::Reset( const SfxItemSet & )
+void SvxPersonalizationTabPage::Reset( const SfxItemSet * )
 {
     uno::Reference< uno::XComponentContext > xContext( comphelper::getProcessComponentContext() );
 
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index b41beca..66d94f2 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -35,7 +35,7 @@ public:
     virtual bool FillItemSet( SfxItemSet *rSet ) SAL_OVERRIDE;
 
     /// Reset to default settings ([Revert] button).
-    virtual void Reset( const SfxItemSet &rSet ) SAL_OVERRIDE;
+    virtual void Reset( const SfxItemSet *rSet ) SAL_OVERRIDE;
 
 private:
     /// Handle the Persona selection
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 95bd353..23979b4 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -651,9 +651,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, BackHdl_Impl)
             OptionsGroupInfo* pGroupInfo =
                 (OptionsGroupInfo*)aTreeLB.GetParent( pCurrentPageEntry )->GetUserData();
             if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId )
-                pPageInfo->m_pPage->Reset( *pColorPageItemSet );
+                pPageInfo->m_pPage->Reset( pColorPageItemSet );
             else
-                pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet );
+                pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet );
         }
         else if ( pPageInfo->m_pExtPage )
             pPageInfo->m_pExtPage->ResetPage();
@@ -1117,12 +1117,12 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
             pPageInfo->m_pPage->SetPosPixel( aPagePos );
             if ( RID_SVXPAGE_COLOR == pPageInfo->m_nPageId )
             {
-                pPageInfo->m_pPage->Reset( *pColorPageItemSet );
+                pPageInfo->m_pPage->Reset( pColorPageItemSet );
                 pPageInfo->m_pPage->ActivatePage( *pColorPageItemSet );
             }
             else
             {
-                pPageInfo->m_pPage->Reset( *pGroupInfo->m_pInItemSet );
+                pPageInfo->m_pPage->Reset( pGroupInfo->m_pInItemSet );
             }
             if (::isLayoutEnabled(pPageInfo->m_pPage))
                 SetPaneSize(pPageInfo->m_pPage);
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index c706334..ecf544d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -285,7 +285,7 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
     return bChanged;
 }
 
-void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
+void AlignmentTabPage::Reset( const SfxItemSet* rCoreAttrs )
 {
     SfxTabPage::Reset( rCoreAttrs );
 
@@ -293,12 +293,12 @@ void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs )
     // method to 'distribute' to distinguish from the normal justification.
 
     lcl_MaybeResetAlignToDistro<SvxCellHorJustify, SvxCellHorJustify>(
-        *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED, rCoreAttrs,
+        *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED, *rCoreAttrs,
         GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY), GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD),
         SVX_HOR_JUSTIFY_BLOCK);
 
     lcl_MaybeResetAlignToDistro<SvxCellVerJustify, SvxCellVerJustify>(
-        *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED, rCoreAttrs,
+        *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED, *rCoreAttrs,
         GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY), GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD),
         SVX_VER_JUSTIFY_BLOCK);
 
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 4b4c816..4d42674 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -227,7 +227,7 @@ void    OfaAutocorrOptionsPage::ActivatePage( const SfxItemSet& )
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false);
 }
 
-void OfaAutocorrOptionsPage::Reset( const SfxItemSet& )
+void OfaAutocorrOptionsPage::Reset( const SfxItemSet* )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
     const long nFlags = pAutoCorrect->GetFlags();
@@ -602,7 +602,7 @@ void    OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false);
 }
 
-void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& )
+void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
     SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
@@ -1073,7 +1073,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset,
     }
 }
 
-void OfaAutocorrReplacePage::Reset( const SfxItemSet& )
+void OfaAutocorrReplacePage::Reset( const SfxItemSet* )
 {
     RefillReplaceBox(true, eLang, eLang);
     m_pShortED->GrabFocus();
@@ -1606,7 +1606,7 @@ void OfaAutocorrExceptPage::RefillReplaceBoxes(bool bFromReset,
     }
 }
 
-void OfaAutocorrExceptPage::Reset( const SfxItemSet& )
+void OfaAutocorrExceptPage::Reset( const SfxItemSet* )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
     RefillReplaceBoxes(true, eLang, eLang);
@@ -1900,7 +1900,7 @@ void OfaQuoteTabPage::ActivatePage( const SfxItemSet& )
     ((OfaAutoCorrDlg*)GetTabDialog())->EnableLanguage(false);
 }
 
-void OfaQuoteTabPage::Reset( const SfxItemSet& )
+void OfaQuoteTabPage::Reset( const SfxItemSet* )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
     const long nFlags = pAutoCorrect->GetFlags();
@@ -2205,7 +2205,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
     return true;
 }
 
-void OfaAutoCompleteTabPage::Reset( const SfxItemSet&  )
+void OfaAutoCompleteTabPage::Reset( const SfxItemSet*  )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
     SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
@@ -2566,7 +2566,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
 
 /** Sets the controls based on the current settings at SmartTagMgr.
 */
-void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet&  )
+void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet*  )
 {
     SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
     SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 58a60f2..1b2314d 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -468,15 +468,15 @@ SfxTabPage* SvxBackgroundTabPage::Create( Window* pParent,
 
 
 
-void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
+void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
 {
 // os: Such a nonsense! One will always find such an item somewhere,
 //     but it must be existing in the rSet!
 //  const SfxPoolItem* pX = GetOldItem( rSet, SID_VIEW_FLD_PIC );
 //  if( pX && pX->ISA(SfxWallpaperItem))
-    if(SFX_ITEM_AVAILABLE <= rSet.GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
+    if(SFX_ITEM_AVAILABLE <= rSet->GetItemState(GetWhich(SID_VIEW_FLD_PIC), false))
     {
-        ResetFromWallpaperItem( rSet );
+        ResetFromWallpaperItem( *rSet );
         return;
     }
 
@@ -494,7 +494,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list