diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 14:34:46 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 14:39:04 +0200 |
commit | bb761be472ea9a590837dc6c1ca295387ac4c0b7 (patch) | |
tree | 178b4187effe2a05f3d77660ad83eea97144a287 /sc/source/ui/dbgui | |
parent | 4d120b6ab181f530d3fedc963b1c6ec777f2608a (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/source/ui/dbgui')
-rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/dbgui/tpsubt.cxx | 20 | ||||
-rw-r--r-- | sc/source/ui/dbgui/validate.cxx | 18 |
3 files changed, 25 insertions, 25 deletions
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 ) |