summaryrefslogtreecommitdiff
path: root/sc/source/ui/dbgui/validate.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-06-10 17:23:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-06-10 17:25:23 +0200
commit4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40 (patch)
treea71acd0d466e02c18bf78ffdcfea748135805d21 /sc/source/ui/dbgui/validate.cxx
parent2f8fd888b42dc41662b54a16d62575c2b15e844a (diff)
Change SfxTabPage::FillItemSet param from ref to pointer
...there were a number of call sites that passed undefined "null pointer references" (apparently in cases where the passed argument was actually unused) Change-Id: I19799e90f0cd8e98367782441a5ea9df27b59830
Diffstat (limited to 'sc/source/ui/dbgui/validate.cxx')
-rw-r--r--sc/source/ui/dbgui/validate.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index df23c4b4a15f..19708bff48b7 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -428,20 +428,20 @@ void ScTPValidationValue::Reset( const SfxItemSet& rArgSet )
CheckHdl( NULL );
}
-bool ScTPValidationValue::FillItemSet( SfxItemSet& rArgSet )
+bool ScTPValidationValue::FillItemSet( SfxItemSet* rArgSet )
{
sal_Int16 nListType = m_pCbShow->IsChecked() ?
(m_pCbSort->IsChecked() ? ValidListType::SORTEDASCENDING : ValidListType::UNSORTED) :
ValidListType::INVISIBLE;
- rArgSet.Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<sal_uInt16>(
+ rArgSet->Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<sal_uInt16>(
lclGetValModeFromPos( m_pLbAllow->GetSelectEntryPos() ) ) ) );
- rArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<sal_uInt16>(
+ rArgSet->Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<sal_uInt16>(
lclGetCondModeFromPos( m_pLbValue->GetSelectEntryPos() ) ) ) );
- rArgSet.Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) );
- rArgSet.Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) );
- rArgSet.Put( SfxBoolItem( FID_VALID_BLANK, m_pCbAllow->IsChecked() ) );
- rArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) );
+ rArgSet->Put( SfxStringItem( FID_VALID_VALUE1, GetFirstFormula() ) );
+ rArgSet->Put( SfxStringItem( FID_VALID_VALUE2, GetSecondFormula() ) );
+ rArgSet->Put( SfxBoolItem( FID_VALID_BLANK, m_pCbAllow->IsChecked() ) );
+ rArgSet->Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) );
return true;
}
@@ -697,11 +697,11 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet )
pEdInputHelp->SetText( EMPTY_OUSTRING );
}
-bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet )
+bool ScTPValidationHelp::FillItemSet( SfxItemSet* rArgSet )
{
- rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == TRISTATE_TRUE ) );
- rArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, pEdtTitle->GetText() ) );
- rArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, pEdInputHelp->GetText() ) );
+ rArgSet->Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == TRISTATE_TRUE ) );
+ rArgSet->Put( SfxStringItem( FID_VALID_HELPTITLE, pEdtTitle->GetText() ) );
+ rArgSet->Put( SfxStringItem( FID_VALID_HELPTEXT, pEdInputHelp->GetText() ) );
return true;
}
@@ -774,12 +774,12 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet )
SelectActionHdl( NULL );
}
-bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet )
+bool ScTPValidationError::FillItemSet( SfxItemSet* rArgSet )
{
- rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) );
- rArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectEntryPos() ) );
- rArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) );
- rArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) );
+ rArgSet->Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) );
+ rArgSet->Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, m_pLbAction->GetSelectEntryPos() ) );
+ rArgSet->Put( SfxStringItem( FID_VALID_ERRTITLE, m_pEdtTitle->GetText() ) );
+ rArgSet->Put( SfxStringItem( FID_VALID_ERRTEXT, m_pEdError->GetText() ) );
return true;
}