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 /svx | |
| 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 'svx')
| -rw-r--r-- | svx/source/dialog/hdft.cxx | 6 | ||||
| -rw-r--r-- | svx/source/dialog/optgrid.cxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 0b8831bcc690..99ddba702096 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -215,7 +215,7 @@ SvxHFPage::~SvxHFPage() -bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) +bool SvxHFPage::FillItemSet( SfxItemSet* rSet ) { const sal_uInt16 nWSize = GetWhich( SID_ATTR_PAGE_SIZE ); const sal_uInt16 nWLRSpace = GetWhich( SID_ATTR_LRSPACE ); @@ -313,7 +313,7 @@ bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) // Flush the SetItem SvxSetItem aSetItem( GetWhich( nId ), aSet ); - rSet.Put( aSetItem ); + rSet->Put( aSetItem ); return true; } @@ -873,7 +873,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) int SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 8337461131d3..2ab8df62cd36 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -191,7 +191,7 @@ SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet -bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) +bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet ) { if ( bAttrModified ) { @@ -202,7 +202,7 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) aGridItem.bGridVisible = pCbxGridVisible->IsChecked(); SfxMapUnit eUnit = - rCoreSet.GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) ); + rCoreSet->GetPool()->GetMetric( GetWhich( SID_ATTR_GRID_OPTIONS ) ); long nX =GetCoreValue( *pMtrFldDrawX, eUnit ); long nY = GetCoreValue( *pMtrFldDrawY, eUnit ); @@ -211,7 +211,7 @@ bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) aGridItem.nFldDivisionX = static_cast<long>(pNumFldDivisionX->GetValue()-1); aGridItem.nFldDivisionY = static_cast<long>(pNumFldDivisionY->GetValue()-1); - rCoreSet.Put( aGridItem ); + rCoreSet->Put( aGridItem ); } return bAttrModified; } @@ -292,7 +292,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) { if ( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return( LEAVE_PAGE ); } |