diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 10:35:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-11 10:39:03 +0200 |
| commit | a92e973b6d0a9ad87fe014442e1678af2ce0c7d0 (patch) | |
| tree | b39139c7992a853cc5e4d836fc35cd45c01a3f6d /cui/source/customize | |
| parent | 88f84eb1b0eebbb7e0a072f1e7001a9207ebbe9e (diff) | |
Change SfxTabPage::Reset param from ref to pointer
...there was a call site that passed undefined "null pointer reference"
(apparently in a case where the passed argument was actually unused)
Change-Id: I663d4264b7a84f44ca69c732f3bc502f614b2b2a
Diffstat (limited to 'cui/source/customize')
| -rw-r--r-- | cui/source/customize/acccfg.cxx | 8 | ||||
| -rw-r--r-- | cui/source/customize/cfg.cxx | 2 | ||||
| -rw-r--r-- | cui/source/customize/macropg.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 50519d6666b7..3708c8ce650e 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1441,7 +1441,7 @@ bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet* ) } -void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) +void SfxAcceleratorConfigPage::Reset( const SfxItemSet* rSet ) { // open accelerator configs // Note: It initialize some other members too, which are needed here ... @@ -1465,7 +1465,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) RadioHdl(0); const SfxPoolItem* pMacroItem=0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, true, &pMacroItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_MACROINFO, true, &pMacroItem ) ) { m_pMacroInfoItem = PTR_CAST( SfxMacroInfoItem, pMacroItem ); m_pGroupLBox->SelectMacro( m_pMacroInfoItem ); @@ -1473,11 +1473,11 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet ) else { const SfxPoolItem* pStringItem=0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, true, &pStringItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_CHARMAP, true, &pStringItem ) ) m_pStringItem = PTR_CAST( SfxStringItem, pStringItem ); const SfxPoolItem* pFontItem=0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) ) + if( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_SPECIALCHAR, true, &pFontItem ) ) m_pFontItem = PTR_CAST( SfxStringItem, pFontItem ); } } diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 10bc1347ee31..c8374d704275 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1545,7 +1545,7 @@ SvxConfigPage::SvxConfigPage(Window *pParent, const SfxItemSet& rSet) m_pDescriptionField->EnableCursor( false ); } -void SvxConfigPage::Reset( const SfxItemSet& ) +void SvxConfigPage::Reset( const SfxItemSet* ) { // If we haven't initialised our XMultiServiceFactory reference // then Reset is being called at the opening of the dialog. diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 5f4117b83fbb..0f486d47e5f0 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -369,7 +369,7 @@ bool _SvxMacroTabPage::FillItemSet( SfxItemSet* /*rSet*/ ) } // the following method clears the bindings in the hashes for both doc & app -void _SvxMacroTabPage::Reset( const SfxItemSet& ) +void _SvxMacroTabPage::Reset( const SfxItemSet* ) { // called once in creation - don't reset the data this time if(!bInitialized) |