diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-10 17:23:12 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-10 17:25:23 +0200 |
commit | 4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40 (patch) | |
tree | a71acd0d466e02c18bf78ffdcfea748135805d21 /sw/source/ui/chrdlg/numpara.cxx | |
parent | 2f8fd888b42dc41662b54a16d62575c2b15e844a (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 'sw/source/ui/chrdlg/numpara.cxx')
-rw-r--r-- | sw/source/ui/chrdlg/numpara.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 240d5d704146..8dfdcb9b8b92 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -101,17 +101,17 @@ const sal_uInt16* SwParagraphNumTabPage::GetRanges() return aPageRg; } -bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) +bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) { if( m_pOutlineLvLB->IsValueChangedFromSaved()) { const sal_uInt16 aOutlineLv = m_pOutlineLvLB->GetSelectEntryPos(); - const SfxUInt16Item* pOldOutlineLv = (const SfxUInt16Item*)GetOldItem( rSet, SID_ATTR_PARA_OUTLINE_LEVEL); + const SfxUInt16Item* pOldOutlineLv = (const SfxUInt16Item*)GetOldItem( *rSet, SID_ATTR_PARA_OUTLINE_LEVEL); if (pOldOutlineLv) { SfxUInt16Item* pOutlineLv = (SfxUInt16Item*)pOldOutlineLv->Clone(); pOutlineLv->SetValue( aOutlineLv ); - rSet.Put(*pOutlineLv); + rSet->Put(*pOutlineLv); delete pOutlineLv; bModified = true; } @@ -122,12 +122,12 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) OUString aStyle; if(m_pNumberStyleLB->GetSelectEntryPos()) aStyle = m_pNumberStyleLB->GetSelectEntry(); - const SfxStringItem* pOldRule = (const SfxStringItem*)GetOldItem( rSet, SID_ATTR_PARA_NUMRULE); + const SfxStringItem* pOldRule = (const SfxStringItem*)GetOldItem( *rSet, SID_ATTR_PARA_NUMRULE); SfxStringItem* pRule = pOldRule ? (SfxStringItem*)pOldRule->Clone() : NULL; if (pRule) { pRule->SetValue(aStyle); - rSet.Put(*pRule); + rSet->Put(*pRule); delete pRule; bModified = true; } @@ -139,8 +139,8 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) bModified = true; bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState(); bool bNumberNewStartChecked = TRISTATE_TRUE == m_pNewStartNumberCB->GetState(); - rSet.Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked)); - rSet.Put(SfxUInt16Item(FN_NUMBER_NEWSTART_AT, + rSet->Put(SfxBoolItem(FN_NUMBER_NEWSTART, bNewStartChecked)); + rSet->Put(SfxUInt16Item(FN_NUMBER_NEWSTART_AT, bNumberNewStartChecked && bNewStartChecked ? (sal_uInt16)m_pNewStartNF->GetValue() : USHRT_MAX)); } @@ -152,7 +152,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) aFmt.SetStartValue( static_cast< sal_uLong >(m_pRestartParaCountCB->GetState() == TRISTATE_TRUE ? m_pRestartNF->GetValue() : 0 )); aFmt.SetCountLines( m_pCountParaCB->IsChecked() ); - rSet.Put(aFmt); + rSet->Put(aFmt); bModified = true; } return bModified; |