summaryrefslogtreecommitdiff
path: root/sc/source/ui/dbgui
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-11 10:35:24 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-11 10:39:03 +0200
commita92e973b6d0a9ad87fe014442e1678af2ce0c7d0 (patch)
treeb39139c7992a853cc5e4d836fc35cd45c01a3f6d /sc/source/ui/dbgui
parent88f84eb1b0eebbb7e0a072f1e7001a9207ebbe9e (diff)
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
Diffstat (limited to 'sc/source/ui/dbgui')
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx4
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx10
-rw-r--r--sc/source/ui/dbgui/validate.cxx32
3 files changed, 23 insertions, 23 deletions
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index d87aa1a81185..aec819c06a9e 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -142,7 +142,7 @@ SfxTabPage* ScTabPageSortFields::Create( Window* pParent,
return ( new ScTabPageSortFields( pParent, rArgSet ) );
}
-void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ )
{
bSortByRows = aSortData.bByRow;
bHasHeader = aSortData.bHasHeader;
@@ -621,7 +621,7 @@ SfxTabPage* ScTabPageSortOptions::Create(
return ( new ScTabPageSortOptions( pParent, rArgSet ) );
}
-void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ )
{
if ( aSortData.bUserDef )
{
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index d76bc51992a2..086c3c794eb4 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -407,10 +407,10 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS
{}
-#define RESET(i) (ScTpSubTotalGroup::DoReset( (i), rArgSet ))
-void ScTpSubTotalGroup1::Reset( const SfxItemSet& rArgSet ) { RESET(1); }
-void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); }
-void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); }
+#define RESET(i) (ScTpSubTotalGroup::DoReset( (i), *rArgSet ))
+void ScTpSubTotalGroup1::Reset( const SfxItemSet* rArgSet ) { RESET(1); }
+void ScTpSubTotalGroup2::Reset( const SfxItemSet* rArgSet ) { RESET(2); }
+void ScTpSubTotalGroup3::Reset( const SfxItemSet* rArgSet ) { RESET(3); }
#undef RESET
#define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), *rArgSet ))
@@ -474,7 +474,7 @@ SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent,
return ( new ScTpSubTotalOptions( pParent, rArgSet ) );
}
-void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ )
+void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ )
{
pBtnPagebreak->Check ( rSubTotalData.bPagebreak );
pBtnCase->Check ( rSubTotalData.bCaseSens );
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index 19708bff48b7..c59155ec8e66 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -385,42 +385,42 @@ const sal_uInt16* ScTPValidationValue::GetRanges()
return pValueRanges;
}
-void ScTPValidationValue::Reset( const SfxItemSet& rArgSet )
+void ScTPValidationValue::Reset( const SfxItemSet* rArgSet )
{
const SfxPoolItem* pItem;
sal_uInt16 nLbPos = SC_VALIDDLG_ALLOW_ANY;
- if( rArgSet.GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET )
+ if( rArgSet->GetItemState( FID_VALID_MODE, true, &pItem ) == SFX_ITEM_SET )
nLbPos = lclGetPosFromValMode( static_cast< ScValidationMode >(
static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
m_pLbAllow->SelectEntryPos( nLbPos );
nLbPos = SC_VALIDDLG_DATA_EQUAL;
- if( rArgSet.GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET )
+ if( rArgSet->GetItemState( FID_VALID_CONDMODE, true, &pItem ) == SFX_ITEM_SET )
nLbPos = lclGetPosFromCondMode( static_cast< ScConditionMode >(
static_cast< const SfxAllEnumItem* >( pItem )->GetValue() ) );
m_pLbValue->SelectEntryPos( nLbPos );
// *** check boxes ***
bool bCheck = true;
- if( rArgSet.GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET )
+ if( rArgSet->GetItemState( FID_VALID_BLANK, true, &pItem ) == SFX_ITEM_SET )
bCheck = static_cast< const SfxBoolItem* >( pItem )->GetValue();
m_pCbAllow->Check( bCheck );
sal_Int32 nListType = ValidListType::UNSORTED;
- if( rArgSet.GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET )
+ if( rArgSet->GetItemState( FID_VALID_LISTTYPE, true, &pItem ) == SFX_ITEM_SET )
nListType = static_cast< const SfxInt16Item* >( pItem )->GetValue();
m_pCbShow->Check( nListType != ValidListType::INVISIBLE );
m_pCbSort->Check( nListType == ValidListType::SORTEDASCENDING );
// *** formulas ***
OUString aFmlaStr;
- if ( rArgSet.GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET )
+ if ( rArgSet->GetItemState( FID_VALID_VALUE1, true, &pItem ) == SFX_ITEM_SET )
aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
SetFirstFormula( aFmlaStr );
aFmlaStr= "";
- if ( rArgSet.GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET )
+ if ( rArgSet->GetItemState( FID_VALID_VALUE2, true, &pItem ) == SFX_ITEM_SET )
aFmlaStr = static_cast< const SfxStringItem* >( pItem )->GetValue();
SetSecondFormula( aFmlaStr );
@@ -677,21 +677,21 @@ SfxTabPage* ScTPValidationHelp::Create( Window* pParent,
return ( new ScTPValidationHelp( pParent, rArgSet ) );
}
-void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
+void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet )
{
const SfxPoolItem* pItem;
- if ( rArgSet.GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET )
+ if ( rArgSet->GetItemState( FID_VALID_SHOWHELP, true, &pItem ) == SFX_ITEM_SET )
pTsbHelp->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
else
pTsbHelp->SetState( TRISTATE_FALSE );
- if ( rArgSet.GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET )
+ if ( rArgSet->GetItemState( FID_VALID_HELPTITLE, true, &pItem ) == SFX_ITEM_SET )
pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() );
else
pEdtTitle->SetText( EMPTY_OUSTRING );
- if ( rArgSet.GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET )
+ if ( rArgSet->GetItemState( FID_VALID_HELPTEXT, true, &pItem ) == SFX_ITEM_SET )
pEdInputHelp->SetText( ((const SfxStringItem*)pItem)->GetValue() );
else
pEdInputHelp->SetText( EMPTY_OUSTRING );
@@ -747,26 +747,26 @@ SfxTabPage* ScTPValidationError::Create( Window* pParent,
return ( new ScTPValidationError( pParent, rArgSet ) );
}
-void ScTPValidationError::Reset( const SfxItemSet& rArgSet )
+void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
{
const SfxPoolItem* pItem;
- if ( rArgSet.GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET )
+ if ( rArgSet->GetItemState( FID_VALID_SHOWERR, true, &pItem ) == SFX_ITEM_SET )
m_pTsbShow->SetState( ((const SfxBoolItem*)pItem)->GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
else
m_pTsbShow->SetState( TRISTATE_TRUE ); // check by default
- if ( rArgSet.GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET )
+ if ( rArgSet->GetItemState( FID_VALID_ERRSTYLE, true, &pItem ) == SFX_ITEM_SET )
m_pLbAction->SelectEntryPos( ((const SfxAllEnumItem*)pItem)->GetValue() );
else
m_pLbAction->SelectEntryPos( 0 );
- if ( rArgSet.GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET )
+ if ( rArgSet->GetItemState( FID_VALID_ERRTITLE, true, &pItem ) == SFX_ITEM_SET )
m_pEdtTitle->SetText( ((const SfxStringItem*)pItem)->GetValue() );
else
m_pEdtTitle->SetText( EMPTY_OUSTRING );
- if ( rArgSet.GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET )
+ if ( rArgSet->GetItemState( FID_VALID_ERRTEXT, true, &pItem ) == SFX_ITEM_SET )
m_pEdError->SetText( ((const SfxStringItem*)pItem)->GetValue() );
else
m_pEdError->SetText( EMPTY_OUSTRING );