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 /cui/source/tabpages/align.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 'cui/source/tabpages/align.cxx')
-rw-r--r-- | cui/source/tabpages/align.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 3a8b84611309..c7063342ff0a 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -265,7 +265,7 @@ const sal_uInt16* AlignmentTabPage::GetRanges() return s_pRanges; } -bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) +bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet ) { bool bChanged = SfxTabPage::FillItemSet(rSet); @@ -273,14 +273,14 @@ bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet ) // method to 'distribute' to distinguish from the normal justification. sal_uInt16 nWhichHorJM = GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD); - lcl_SetJustifyMethodToItemSet(rSet, nWhichHorJM, *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED); + lcl_SetJustifyMethodToItemSet(*rSet, nWhichHorJM, *m_pLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED); if (!bChanged) - bChanged = HasAlignmentChanged(rSet, nWhichHorJM); + bChanged = HasAlignmentChanged(*rSet, nWhichHorJM); sal_uInt16 nWhichVerJM = GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD); - lcl_SetJustifyMethodToItemSet(rSet, nWhichVerJM, *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED); + lcl_SetJustifyMethodToItemSet(*rSet, nWhichVerJM, *m_pLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED); if (!bChanged) - bChanged = HasAlignmentChanged(rSet, nWhichVerJM); + bChanged = HasAlignmentChanged(*rSet, nWhichVerJM); return bChanged; } @@ -308,7 +308,7 @@ void AlignmentTabPage::Reset( const SfxItemSet& rCoreAttrs ) int AlignmentTabPage::DeactivatePage( SfxItemSet* _pSet ) { if( _pSet ) - FillItemSet( *_pSet ); + FillItemSet( _pSet ); return LEAVE_PAGE; } |