summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-11 14:34:46 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-11 14:39:04 +0200
commitbb761be472ea9a590837dc6c1ca295387ac4c0b7 (patch)
tree178b4187effe2a05f3d77660ad83eea97144a287 /sc
parent4d120b6ab181f530d3fedc963b1c6ec777f2608a (diff)
Change SfxTabPage ctor SfxItemSet param from ref to pointer
...and also corresponding param of CreateTabPage function type and corresponding Craete functions. There were some call sites that passed undefined "null pointer references" and SfxTabPage internally uses a pointer member pSet that is checked for null anyway. Change-Id: I4eb3636155eac46c9c9d26e6e6e842e85d7e95af
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/app/scmod.cxx18
-rw-r--r--sc/source/ui/attrdlg/tabpages.cxx6
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx12
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx20
-rw-r--r--sc/source/ui/dbgui/validate.cxx18
-rw-r--r--sc/source/ui/docshell/tpstat.cxx6
-rw-r--r--sc/source/ui/inc/opredlin.hxx2
-rw-r--r--sc/source/ui/inc/scuitphfedit.hxx8
-rw-r--r--sc/source/ui/inc/tabpages.hxx2
-rw-r--r--sc/source/ui/inc/tpcalc.hxx2
-rw-r--r--sc/source/ui/inc/tpcompatibility.hxx2
-rw-r--r--sc/source/ui/inc/tpdefaults.hxx2
-rw-r--r--sc/source/ui/inc/tpformula.hxx2
-rw-r--r--sc/source/ui/inc/tphf.hxx4
-rw-r--r--sc/source/ui/inc/tpprint.hxx2
-rw-r--r--sc/source/ui/inc/tpsort.hxx4
-rw-r--r--sc/source/ui/inc/tpstat.hxx2
-rw-r--r--sc/source/ui/inc/tpsubt.hxx8
-rw-r--r--sc/source/ui/inc/tptable.hxx2
-rw-r--r--sc/source/ui/inc/tpusrlst.hxx2
-rw-r--r--sc/source/ui/inc/tpview.hxx4
-rw-r--r--sc/source/ui/inc/validate.hxx6
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx6
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx6
-rw-r--r--sc/source/ui/optdlg/tpcompatibility.cxx6
-rw-r--r--sc/source/ui/optdlg/tpdefaults.cxx6
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx6
-rw-r--r--sc/source/ui/optdlg/tpprint.cxx6
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx6
-rw-r--r--sc/source/ui/optdlg/tpview.cxx12
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx18
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx16
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx6
-rw-r--r--sc/source/ui/view/prevwsh.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx2
35 files changed, 116 insertions, 116 deletions
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 951b43fb0d1b..a64d075b2541 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2120,14 +2120,14 @@ SfxTabPage* ScModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const Sfx
{
::CreateTabPage ScTpLayoutOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_LAYOUT );
if ( ScTpLayoutOptionsCreate )
- pRet = (*ScTpLayoutOptionsCreate) (pParent, rSet);
+ pRet = (*ScTpLayoutOptionsCreate) (pParent, &rSet);
}
break;
case SID_SC_TP_CONTENT:
{
::CreateTabPage ScTpContentOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SCPAGE_CONTENT);
if ( ScTpContentOptionsCreate )
- pRet = (*ScTpContentOptionsCreate)(pParent, rSet);
+ pRet = (*ScTpContentOptionsCreate)(pParent, &rSet);
}
break;
case SID_SC_TP_GRID: pRet = SvxGridTabPage::Create(pParent, rSet); break;
@@ -2135,49 +2135,49 @@ SfxTabPage* ScModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const Sfx
{
::CreateTabPage ScTpUserListsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_USERLISTS );
if ( ScTpUserListsCreate )
- pRet = (*ScTpUserListsCreate)( pParent, rSet);
+ pRet = (*ScTpUserListsCreate)( pParent, &rSet);
}
break;
case SID_SC_TP_CALC:
{
::CreateTabPage ScTpCalcOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_CALC );
if ( ScTpCalcOptionsCreate )
- pRet = (*ScTpCalcOptionsCreate)(pParent, rSet);
+ pRet = (*ScTpCalcOptionsCreate)(pParent, &rSet);
}
break;
case SID_SC_TP_FORMULA:
{
::CreateTabPage ScTpFormulaOptionsCreate = pFact->GetTabPageCreatorFunc (RID_SCPAGE_FORMULA);
if (ScTpFormulaOptionsCreate)
- pRet = (*ScTpFormulaOptionsCreate)(pParent, rSet);
+ pRet = (*ScTpFormulaOptionsCreate)(pParent, &rSet);
}
break;
case SID_SC_TP_COMPATIBILITY:
{
::CreateTabPage ScTpCompatOptionsCreate = pFact->GetTabPageCreatorFunc (RID_SCPAGE_COMPATIBILITY);
if (ScTpCompatOptionsCreate)
- pRet = (*ScTpCompatOptionsCreate)(pParent, rSet);
+ pRet = (*ScTpCompatOptionsCreate)(pParent, &rSet);
}
break;
case SID_SC_TP_CHANGES:
{
::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_OPREDLINE );
if ( ScRedlineOptionsTabPageCreate )
- pRet =(*ScRedlineOptionsTabPageCreate)(pParent, rSet);
+ pRet =(*ScRedlineOptionsTabPageCreate)(pParent, &rSet);
}
break;
case RID_SC_TP_PRINT:
{
::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
if ( ScTpPrintOptionsCreate )
- pRet = (*ScTpPrintOptionsCreate)( pParent, rSet);
+ pRet = (*ScTpPrintOptionsCreate)( pParent, &rSet);
}
break;
case RID_SC_TP_DEFAULTS:
{
::CreateTabPage ScTpDefaultsOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_DEFAULTS );
if ( ScTpDefaultsOptionsCreate )
- pRet = (*ScTpDefaultsOptionsCreate)( pParent, rSet);
+ pRet = (*ScTpDefaultsOptionsCreate)( pParent, &rSet);
}
break;
}
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 2df9dedf9e06..8c728c512d19 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -44,7 +44,7 @@ static const sal_uInt16 pProtectionRanges[] =
ScTabPageProtection::ScTabPageProtection(Window* pParent, const SfxItemSet& rCoreAttrs)
: SfxTabPage(pParent, "CellProtectionPage",
- "modules/scalc/ui/cellprotectionpage.ui", rCoreAttrs)
+ "modules/scalc/ui/cellprotectionpage.ui", &rCoreAttrs)
{
get(m_pBtnHideCell,"checkHideAll");
get(m_pBtnProtect,"checkProtected");
@@ -68,9 +68,9 @@ const sal_uInt16* ScTabPageProtection::GetRanges()
return pProtectionRanges;
}
-SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return ( new ScTabPageProtection( pParent, rAttrSet ) );
+ return ( new ScTabPageProtection( pParent, *rAttrSet ) );
}
void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs )
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index aec819c06a9e..d10ed8ae545f 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -71,7 +71,7 @@ using namespace com::sun::star;
ScTabPageSortFields::ScTabPageSortFields(Window* pParent,
const SfxItemSet& rArgSet)
: SfxTabPage(pParent, "SortCriteriaPage",
- "modules/scalc/ui/sortcriteriapage.ui", rArgSet)
+ "modules/scalc/ui/sortcriteriapage.ui", &rArgSet)
,
aStrUndefined ( SC_RESSTR( SCSTR_UNDEFINED ) ),
@@ -137,9 +137,9 @@ void ScTabPageSortFields::Init()
}
SfxTabPage* ScTabPageSortFields::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+ const SfxItemSet* rArgSet )
{
- return ( new ScTabPageSortFields( pParent, rArgSet ) );
+ return ( new ScTabPageSortFields( pParent, *rArgSet ) );
}
void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ )
@@ -486,7 +486,7 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb )
ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
const SfxItemSet& rArgSet )
: SfxTabPage(pParent, "SortOptionsPage",
- "modules/scalc/ui/sortoptionspage.ui", rArgSet)
+ "modules/scalc/ui/sortoptionspage.ui", &rArgSet)
, aStrRowLabel(SC_RESSTR(SCSTR_ROW_LABEL))
, aStrColLabel(SC_RESSTR(SCSTR_COL_LABEL))
, aStrUndefined(SC_RESSTR(SCSTR_UNDEFINED))
@@ -616,9 +616,9 @@ void ScTabPageSortOptions::Init()
SfxTabPage* ScTabPageSortOptions::Create(
Window* pParent,
- const SfxItemSet& rArgSet )
+ const SfxItemSet* rArgSet )
{
- return ( new ScTabPageSortOptions( pParent, rArgSet ) );
+ return ( new ScTabPageSortOptions( pParent, *rArgSet ) );
}
void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ )
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 086c3c794eb4..d1e7d10c5d17 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -38,7 +38,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent,
const SfxItemSet& rArgSet )
: SfxTabPage ( pParent,
"SubTotalGrpPage", "modules/scalc/ui/subtotalgrppage.ui",
- rArgSet ),
+ &rArgSet ),
aStrNone ( SC_RESSTR( SCSTR_NONE ) ),
aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ),
pViewData ( NULL ),
@@ -383,16 +383,16 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb )
// Derived Group TabPages:
SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent,
- const SfxItemSet& rArgSet )
- { return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); }
+ const SfxItemSet* rArgSet )
+ { return ( new ScTpSubTotalGroup1( pParent, *rArgSet ) ); }
SfxTabPage* ScTpSubTotalGroup2::Create( Window* pParent,
- const SfxItemSet& rArgSet )
- { return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); }
+ const SfxItemSet* rArgSet )
+ { return ( new ScTpSubTotalGroup2( pParent, *rArgSet ) ); }
SfxTabPage* ScTpSubTotalGroup3::Create( Window* pParent,
- const SfxItemSet& rArgSet )
- { return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); }
+ const SfxItemSet* rArgSet )
+ { return ( new ScTpSubTotalGroup3( pParent, *rArgSet ) ); }
ScTpSubTotalGroup1::ScTpSubTotalGroup1( Window* pParent, const SfxItemSet& rArgSet ) :
ScTpSubTotalGroup( pParent, rArgSet )
@@ -427,7 +427,7 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent,
: SfxTabPage ( pParent,
"SubTotalOptionsPage", "modules/scalc/ui/subtotaloptionspage.ui" ,
- rArgSet ),
+ &rArgSet ),
pViewData ( NULL ),
pDoc ( NULL ),
nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ),
@@ -469,9 +469,9 @@ void ScTpSubTotalOptions::Init()
}
SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+ const SfxItemSet* rArgSet )
{
- return ( new ScTpSubTotalOptions( pParent, rArgSet ) );
+ return ( new ScTpSubTotalOptions( pParent, *rArgSet ) );
}
void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ )
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index c59155ec8e66..99b757d5b541 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -311,7 +311,7 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt
ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet )
: SfxTabPage( pParent, "ValidationCriteriaPage",
- "modules/scalc/ui/validationcriteriapage.ui", rArgSet)
+ "modules/scalc/ui/validationcriteriapage.ui", &rArgSet)
, maStrMin(ScResId(SCSTR_VALID_MINIMUM))
, maStrMax(ScResId(SCSTR_VALID_MAXIMUM))
, maStrValue(ScResId(SCSTR_VALID_VALUE))
@@ -375,9 +375,9 @@ void ScTPValidationValue::Init()
CheckHdl( NULL );
}
-SfxTabPage* ScTPValidationValue::Create( Window* pParent, const SfxItemSet& rArgSet )
+SfxTabPage* ScTPValidationValue::Create( Window* pParent, const SfxItemSet* rArgSet )
{
- return( new ScTPValidationValue( pParent, rArgSet ) );
+ return( new ScTPValidationValue( pParent, *rArgSet ) );
}
const sal_uInt16* ScTPValidationValue::GetRanges()
@@ -652,7 +652,7 @@ ScTPValidationHelp::ScTPValidationHelp( Window* pParent,
: SfxTabPage ( pParent,
"ValidationHelpTabPage" , "modules/scalc/ui/validationhelptabpage.ui" ,
- rArgSet )
+ &rArgSet )
{
get(pTsbHelp,"tsbhelp");
get(pEdtTitle,"title");
@@ -672,9 +672,9 @@ void ScTPValidationHelp::Init()
}
SfxTabPage* ScTPValidationHelp::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+ const SfxItemSet* rArgSet )
{
- return ( new ScTPValidationHelp( pParent, rArgSet ) );
+ return ( new ScTPValidationHelp( pParent, *rArgSet ) );
}
void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet )
@@ -713,7 +713,7 @@ ScTPValidationError::ScTPValidationError( Window* pParent,
: SfxTabPage ( pParent,
"ErrorAlertTabPage" , "modules/scalc/ui/erroralerttabpage.ui" ,
- rArgSet )
+ &rArgSet )
{
get(m_pTsbShow,"tsbshow");
get(m_pLbAction,"actionCB");
@@ -742,9 +742,9 @@ void ScTPValidationError::Init()
}
SfxTabPage* ScTPValidationError::Create( Window* pParent,
- const SfxItemSet& rArgSet )
+ const SfxItemSet* rArgSet )
{
- return ( new ScTPValidationError( pParent, rArgSet ) );
+ return ( new ScTPValidationError( pParent, *rArgSet ) );
}
void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 35c28f8dcef7..a13a09fa0527 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -29,13 +29,13 @@
// Dokumentinfo-Tabpage:
-SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet )
+SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet* rSet )
{
- return new ScDocStatPage( pParent, rSet );
+ return new ScDocStatPage( pParent, *rSet );
}
ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet )
- : SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", rSet )
+ : SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", &rSet )
{
get(m_pFtTables,"nosheets");
get(m_pFtCells,"nocells");
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index 95eebca67341..5cbb52f234e6 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -49,7 +49,7 @@ public:
ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet );
virtual ~ScRedlineOptionsTabPage();
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 58f6eab58a84..f66414175b94 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -105,7 +105,7 @@ private:
class ScRightHeaderEditPage : public ScHFEditPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet );
private:
ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -114,7 +114,7 @@ private:
class ScLeftHeaderEditPage : public ScHFEditPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet );
private:
ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -123,7 +123,7 @@ private:
class ScRightFooterEditPage : public ScHFEditPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet );
private:
ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet );
@@ -132,7 +132,7 @@ private:
class ScLeftFooterEditPage : public ScHFEditPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet );
private:
ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index 346489ffb056..5f8087506785 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -28,7 +28,7 @@ class ScTabPageProtection : public SfxTabPage
{
public:
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rAttrSet );
+ const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges ();
virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 9ddab8887fc8..7ca20de74cd3 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -34,7 +34,7 @@ class ScTpCalcOptions : public SfxTabPage
{
public:
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rCoreSet );
+ const SfxItemSet* rCoreSet );
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
using SfxTabPage::DeactivatePage;
diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx
index 9f594a1348d6..07167ce8a31c 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -19,7 +19,7 @@ class ScTpCompatOptions : public SfxTabPage
public:
using SfxTabPage::DeactivatePage;
- static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreAttrs);
+ static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreAttrs);
virtual bool FillItemSet(SfxItemSet* rCoreAttrs) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rCoreAttrs) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index 13340e5edd4d..7da63f45c3e7 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -19,7 +19,7 @@ class ScTpDefaultsOptions : public SfxTabPage
public:
using SfxTabPage::DeactivatePage;
- static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet);
+ static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreSet);
virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE;
virtual void Reset(const SfxItemSet* rCoreSet) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index e30c268d5ede..a9bbd9ac5c92 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -33,7 +33,7 @@ class ScTpFormulaOptions : public SfxTabPage
public:
using SfxTabPage::DeactivatePage;
- static SfxTabPage* Create (Window* pParent, const SfxItemSet& rCoreSet);
+ static SfxTabPage* Create (Window* pParent, const SfxItemSet* rCoreSet);
virtual bool FillItemSet(SfxItemSet* rCoreSet) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 7469cf52a852..995ab4524140 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -60,7 +60,7 @@ private:
class ScHeaderPage : public ScHFPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
private:
@@ -70,7 +70,7 @@ private:
class ScFooterPage : public ScHFPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
private:
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index c99f7b032b32..35f5a68f3769 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -33,7 +33,7 @@ class ScTpPrintOptions : public SfxTabPage
virtual ~ScTpPrintOptions();
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rCoreSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rCoreSet );
virtual bool FillItemSet( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
using SfxTabPage::DeactivatePage;
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 77533f8712d2..8f6c794c2aee 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -53,7 +53,7 @@ public:
virtual ~ScTabPageSortFields();
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
+ const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
@@ -115,7 +115,7 @@ public:
#undef SfxTabPage
#define SfxTabPage ::SfxTabPage
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
+ const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index fb1fa0d3a011..b91179e1c88a 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -30,7 +30,7 @@
class ScDocStatPage: public SfxTabPage
{
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rSet );
private:
ScDocStatPage( Window *pParent, const SfxItemSet& rSet );
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 794cb9f7786c..24a6e3670d15 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -83,7 +83,7 @@ public:
virtual ~ScTpSubTotalGroup1();
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
+ const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
};
@@ -98,7 +98,7 @@ public:
virtual ~ScTpSubTotalGroup2();
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
+ const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
};
@@ -113,7 +113,7 @@ public:
virtual ~ScTpSubTotalGroup3();
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
+ const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
};
@@ -128,7 +128,7 @@ public:
virtual ~ScTpSubTotalOptions();
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rArgSet );
+ const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index d342b00e8d47..5053babb0f9e 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -29,7 +29,7 @@ class ScTablePage : public SfxTabPage
{
public:
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rCoreSet );
+ const SfxItemSet* rCoreSet );
static const sal_uInt16* GetRanges ();
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index e5d2aff788d8..8345335966c3 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -34,7 +34,7 @@ class ScTpUserLists : public SfxTabPage
{
public:
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rAttrSet );
+ const SfxItemSet* rAttrSet );
virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rCoreAttrs ) SAL_OVERRIDE;
using SfxTabPage::DeactivatePage;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 8f115e3c5f1d..41248196d03b 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -70,7 +70,7 @@ class ScTpContentOptions : public SfxTabPage
public:
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rCoreSet );
+ const SfxItemSet* rCoreSet );
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
using SfxTabPage::ActivatePage;
@@ -118,7 +118,7 @@ class ScTpLayoutOptions : public SfxTabPage
public:
static SfxTabPage* Create ( Window* pParent,
- const SfxItemSet& rCoreSet );
+ const SfxItemSet* rCoreSet );
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rCoreSet ) SAL_OVERRIDE;
using SfxTabPage::ActivatePage;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index e496d779e771..76f00c0b49a8 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -179,7 +179,7 @@ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage
public:
explicit ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rArgSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet* rArgSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rArgSet ) SAL_OVERRIDE;
@@ -275,7 +275,7 @@ public:
ScTPValidationHelp( Window* pParent, const SfxItemSet& rArgSet );
virtual ~ScTPValidationHelp();
- static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent, const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
};
@@ -300,7 +300,7 @@ public:
ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet );
virtual ~ScTPValidationError();
- static SfxTabPage* Create ( Window* pParent, const SfxItemSet& rArgSet );
+ static SfxTabPage* Create ( Window* pParent, const SfxItemSet* rArgSet );
virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE;
virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE;
};
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index 7bf8636ffbc6..42c259d03581 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -41,7 +41,7 @@
ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent,
const SfxItemSet& rSet )
- : SfxTabPage(pParent,"OptChangesPage", "modules/scalc/ui/optchangespage.ui", rSet),
+ : SfxTabPage(pParent,"OptChangesPage", "modules/scalc/ui/optchangespage.ui", &rSet),
aAuthorStr (ScResId(SCSTR_AUTHOR))
{
get(m_pContentColorLB, "changes");
@@ -60,9 +60,9 @@ ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage()
{
}
-SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet& rSet )
+SfxTabPage* ScRedlineOptionsTabPage::Create( Window* pParent, const SfxItemSet* rSet )
{
- return new ScRedlineOptionsTabPage( pParent, rSet );
+ return new ScRedlineOptionsTabPage( pParent, *rSet );
}
bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ )
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 27337df0a914..85edefbe3805 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -37,7 +37,7 @@
ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs)
: SfxTabPage(pParent, "OptCalculatePage",
- "modules/scalc/ui/optcalculatepage.ui", rCoreAttrs)
+ "modules/scalc/ui/optcalculatepage.ui", &rCoreAttrs)
, pOldOptions(new ScDocOptions(
((const ScTpCalcItem&)rCoreAttrs.Get(
GetWhich(SID_SCDOCOPTIONS))).GetDocOptions()))
@@ -79,9 +79,9 @@ void ScTpCalcOptions::Init()
m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) );
}
-SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return ( new ScTpCalcOptions( pParent, rAttrSet ) );
+ return ( new ScTpCalcOptions( pParent, *rAttrSet ) );
}
void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ )
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 709faaddc696..9dc16bacc7fe 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -16,7 +16,7 @@
#include "appoptio.hxx"
ScTpCompatOptions::ScTpCompatOptions(Window *pParent, const SfxItemSet &rCoreAttrs) :
- SfxTabPage(pParent, "OptCompatibilityPage","modules/scalc/ui/optcompatibilitypage.ui", rCoreAttrs)
+ SfxTabPage(pParent, "OptCompatibilityPage","modules/scalc/ui/optcompatibilitypage.ui", &rCoreAttrs)
{
get(m_pLbKeyBindings,"keybindings");
}
@@ -25,9 +25,9 @@ ScTpCompatOptions::~ScTpCompatOptions()
{
}
-SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet &rCoreAttrs)
+SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet *rCoreAttrs)
{
- return new ScTpCompatOptions(pParent, rCoreAttrs);
+ return new ScTpCompatOptions(pParent, *rCoreAttrs);
}
bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs)
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index a20f1c21e24b..1d7fd90c2324 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -19,7 +19,7 @@
ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet &rCoreSet) :
- SfxTabPage(pParent, "OptDefaultPage", "modules/scalc/ui/optdefaultpage.ui", rCoreSet)
+ SfxTabPage(pParent, "OptDefaultPage", "modules/scalc/ui/optdefaultpage.ui", &rCoreSet)
{
get( m_pEdNSheets, "sheetsnumber");
@@ -34,9 +34,9 @@ ScTpDefaultsOptions::~ScTpDefaultsOptions()
{
}
-SfxTabPage* ScTpDefaultsOptions::Create(Window *pParent, const SfxItemSet &rCoreAttrs)
+SfxTabPage* ScTpDefaultsOptions::Create(Window *pParent, const SfxItemSet *rCoreAttrs)
{
- return new ScTpDefaultsOptions(pParent, rCoreAttrs);
+ return new ScTpDefaultsOptions(pParent, *rCoreAttrs);
}
bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet)
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index b2aaff2aa24c..87aa63918b35 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -39,7 +39,7 @@ using ::com::sun::star::lang::Locale;
using ::com::sun::star::i18n::LocaleDataItem;
ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreAttrs) :
- SfxTabPage(pParent, "OptFormula", "modules/scalc/ui/optformula.ui", rCoreAttrs),
+ SfxTabPage(pParent, "OptFormula", "modules/scalc/ui/optformula.ui", &rCoreAttrs),
mnDecSep(0)
{
get(mpLbFormulaSyntax, "formulasyntax");
@@ -220,9 +220,9 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Edit*, pEdit )
return 0;
}
-SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet& rCoreSet)
+SfxTabPage* ScTpFormulaOptions::Create(Window* pParent, const SfxItemSet* rCoreSet)
{
- return new ScTpFormulaOptions(pParent, rCoreSet);
+ return new ScTpFormulaOptions(pParent, *rCoreSet);
}
bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet)
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index f96e88b3fcb9..015165530dc1 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -33,7 +33,7 @@ ScTpPrintOptions::ScTpPrintOptions( Window* pParent,
: SfxTabPage ( pParent,
"optCalcPrintPage",
"modules/scalc/ui/optdlg.ui",
- rCoreAttrs )
+ &rCoreAttrs )
{
get( m_pSkipEmptyPagesCB , "suppressCB" );
get( m_pSelectedSheetsCB , "printCB" );
@@ -44,9 +44,9 @@ ScTpPrintOptions::~ScTpPrintOptions()
{
}
-SfxTabPage* ScTpPrintOptions::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* ScTpPrintOptions::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return new ScTpPrintOptions( pParent, rAttrSet );
+ return new ScTpPrintOptions( pParent, *rAttrSet );
}
int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP )
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index dd8bb5070793..71515ca1916d 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -51,7 +51,7 @@ ScTpUserLists::ScTpUserLists( Window* pParent,
: SfxTabPage ( pParent,
"OptSortLists", "modules/scalc/ui/optsortlists.ui",
- rCoreAttrs ),
+ &rCoreAttrs ),
aStrQueryRemove ( ScGlobal::GetRscString( STR_QUERYREMOVE ) ),
aStrCopyList ( ScGlobal::GetRscString( STR_COPYLIST ) ),
aStrCopyFrom ( ScGlobal::GetRscString( STR_COPYFROM ) ),
@@ -137,9 +137,9 @@ void ScTpUserLists::Init()
}
-SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet )
+SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet* rAttrSet )
{
- return ( new ScTpUserLists( pParent, rAttrSet ) );
+ return ( new ScTpUserLists( pParent, *rAttrSet ) );
}
void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs )
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 1c0b23a862e7..9c74b954f0d9 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -41,7 +41,7 @@
ScTpContentOptions::ScTpContentOptions( Window* pParent,
const SfxItemSet& rArgSet ) :
- SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", rArgSet),
+ SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", &rArgSet),
pLocalOptions(0)
{
get(pGridLB,"grid");
@@ -101,9 +101,9 @@ ScTpContentOptions::~ScTpContentOptions()
}
SfxTabPage* ScTpContentOptions::Create( Window* pParent,
- const SfxItemSet& rCoreSet )
+ const SfxItemSet* rCoreSet )
{
- return new ScTpContentOptions(pParent, rCoreSet);
+ return new ScTpContentOptions(pParent, *rCoreSet);
}
bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
@@ -353,7 +353,7 @@ IMPL_LINK( ScTpContentOptions, GridHdl, ListBox*, pLb )
ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent,
const SfxItemSet& rArgSet ) :
SfxTabPage( pParent, "ScGeneralPage",
- "modules/scalc/ui/scgeneralpage.ui", rArgSet),
+ "modules/scalc/ui/scgeneralpage.ui", &rArgSet),
aUnitArr( ScResId(SCSTR_UNIT )),
pDoc(NULL)
{
@@ -413,9 +413,9 @@ ScTpLayoutOptions::~ScTpLayoutOptions()
}
SfxTabPage* ScTpLayoutOptions::Create( Window* pParent,
- const SfxItemSet& rCoreSet )
+ const SfxItemSet* rCoreSet )
{
- ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, rCoreSet);
+ ScTpLayoutOptions* pNew = new ScTpLayoutOptions(pParent, *rCoreSet);
ScDocShell* pDocSh = PTR_CAST(ScDocShell,SfxObjectShell::Current());
if(pDocSh!=NULL)
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 8cd771a35fd3..70eaac6545f0 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -62,7 +62,7 @@ ScHFEditPage::ScHFEditPage( Window* pParent,
const SfxItemSet& rCoreAttrs,
sal_uInt16 nWhichId,
bool bHeader )
- : SfxTabPage( pParent, "HeaderFooterContent", "modules/scalc/ui/headerfootercontent.ui", rCoreAttrs )
+ : SfxTabPage( pParent, "HeaderFooterContent", "modules/scalc/ui/headerfootercontent.ui", &rCoreAttrs )
, nWhich( nWhichId )
{
get(m_pWndLeft,"textviewWND_LEFT");
@@ -843,8 +843,8 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet&
true )
{}
-SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
- { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); };
+SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet )
+ { return ( new ScRightHeaderEditPage( pParent, *rCoreSet ) ); };
// class ScLeftHeaderEditPage
@@ -857,8 +857,8 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r
true )
{}
-SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
- { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); };
+SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet )
+ { return ( new ScLeftHeaderEditPage( pParent, *rCoreSet ) ); };
// class ScRightFooterEditPage
@@ -871,8 +871,8 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet&
false )
{}
-SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
- { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); };
+SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet )
+ { return ( new ScRightFooterEditPage( pParent, *rCoreSet ) ); };
// class ScLeftFooterEditPage
@@ -885,7 +885,7 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& r
false )
{}
-SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
- { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); };
+SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet )
+ { return ( new ScLeftFooterEditPage( pParent, *rCoreSet ) ); };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index d0a0af54cd45..e819be7a9dac 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -207,17 +207,17 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl)
{
aText = ScGlobal::GetRscString( STR_PAGEHEADER );
if ( bRightPage )
- pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScRightHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId );
else
- pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScLeftHeaderEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId );
}
else
{
aText = ScGlobal::GetRscString( STR_PAGEFOOTER );
if ( bRightPage )
- pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScRightFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId );
else
- pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), aDataSet ), NULL, nSettingsId );
+ pDlg->SetTabPage( ScLeftFooterEditPage::Create( pDlg->get_content_area(), &aDataSet ), NULL, nSettingsId );
}
SvxNumType eNumType = ((const SvxPageItem&)aDataSet.Get(ATTR_PAGE)).GetNumType();
@@ -246,9 +246,9 @@ ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet )
{
}
-SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
+SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet* rCoreSet )
{
- return ( new ScHeaderPage( pParent, rCoreSet ) );
+ return ( new ScHeaderPage( pParent, *rCoreSet ) );
}
const sal_uInt16* ScHeaderPage::GetRanges()
@@ -265,9 +265,9 @@ ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet )
{
}
-SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet )
+SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet* rCoreSet )
{
- return ( new ScFooterPage( pParent, rCoreSet ) );
+ return ( new ScFooterPage( pParent, *rCoreSet ) );
}
const sal_uInt16* ScFooterPage::GetRanges()
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 227e07979b1a..51ad4c9e3110 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -84,7 +84,7 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich,
ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) :
- SfxTabPage( pParent, "SheetPrintPage","modules/scalc/ui/sheetprintpage.ui", rCoreAttrs )
+ SfxTabPage( pParent, "SheetPrintPage","modules/scalc/ui/sheetprintpage.ui", &rCoreAttrs )
{
get(m_pBtnTopDown,"radioBTN_TOPDOWN");
get(m_pBtnLeftRight,"radioBTN_LEFTRIGHT");
@@ -135,9 +135,9 @@ const sal_uInt16* ScTablePage::GetRanges()
return pPageTableRanges;
}
-SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet& rCoreSet )
+SfxTabPage* ScTablePage::Create( Window* pParent, const SfxItemSet* rCoreSet )
{
- return ( new ScTablePage( pParent, rCoreSet ) );
+ return ( new ScTablePage( pParent, *rCoreSet ) );
}
void ScTablePage::Reset( const SfxItemSet* rCoreSet )
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 18eb3a79fa0c..2fe8b19669ef 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -543,7 +543,7 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
if ( ScTpPrintOptionsCreate )
- return (*ScTpPrintOptionsCreate)( pParent, rOptions);
+ return (*ScTpPrintOptionsCreate)( pParent, &rOptions);
return 0;
}
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 14ed4aec4bb7..1e583b4bc4ac 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1142,7 +1142,7 @@ SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT );
if ( ScTpPrintOptionsCreate )
- return (*ScTpPrintOptionsCreate)( pParent, rOptions);
+ return (*ScTpPrintOptionsCreate)( pParent, &rOptions);
return 0;
}