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 /starmath | |
| 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 'starmath')
| -rw-r--r-- | starmath/inc/dialog.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/dialog.cxx | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 7efaa1fc9160..7c1a2b9689c6 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -63,7 +63,7 @@ class SmPrintOptionsTabPage : public SfxTabPage DECL_LINK(SizeButtonClickHdl, Button *); - virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet* rSet) SAL_OVERRIDE; virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; public: diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index c329140f3275..99a8dc9c93b6 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -178,7 +178,7 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet & } -bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet) +bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet) { sal_uInt16 nPrintSize; if (m_pSizeNormal->IsChecked()) @@ -188,13 +188,13 @@ bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet) else nPrintSize = PRINT_SIZE_ZOOMED; - rSet.Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), (sal_uInt16) nPrintSize)); - rSet.Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), (sal_uInt16) m_pZoom->GetValue())); - rSet.Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_pTitle->IsChecked())); - rSet.Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_pText->IsChecked())); - rSet.Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_pFrame->IsChecked())); - rSet.Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), m_pNoRightSpaces->IsChecked())); - rSet.Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), m_pSaveOnlyUsedSymbols->IsChecked())); + rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), (sal_uInt16) nPrintSize)); + rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), (sal_uInt16) m_pZoom->GetValue())); + rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_pTitle->IsChecked())); + rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_pText->IsChecked())); + rSet->Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_pFrame->IsChecked())); + rSet->Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), m_pNoRightSpaces->IsChecked())); + rSet->Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), m_pSaveOnlyUsedSymbols->IsChecked())); return true; } |