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 /sd/source/ui/dlg/tpaction.cxx | |
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 'sd/source/ui/dlg/tpaction.cxx')
-rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index f08751c5363a..2c4084aca333 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -310,15 +310,15 @@ bool SdTPAction::FillItemSet( SfxItemSet* rAttrs ) -void SdTPAction::Reset( const SfxItemSet& rAttrs ) +void SdTPAction::Reset( const SfxItemSet* rAttrs ) { presentation::ClickAction eCA = presentation::ClickAction_NONE; OUString aFileName; // m_pLbAction - if( rAttrs.GetItemState( ATTR_ACTION ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( ATTR_ACTION ) != SFX_ITEM_DONTCARE ) { - eCA = (presentation::ClickAction) ( ( const SfxAllEnumItem& ) rAttrs. + eCA = (presentation::ClickAction) ( ( const SfxAllEnumItem& ) rAttrs-> Get( ATTR_ACTION ) ).GetValue(); SetActualClickAction( eCA ); } @@ -326,9 +326,9 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs ) m_pLbAction->SetNoSelection(); // m_pEdtSound - if( rAttrs.GetItemState( ATTR_ACTION_FILENAME ) != SFX_ITEM_DONTCARE ) + if( rAttrs->GetItemState( ATTR_ACTION_FILENAME ) != SFX_ITEM_DONTCARE ) { - aFileName = ( ( const SfxStringItem& ) rAttrs.Get( ATTR_ACTION_FILENAME ) ).GetValue(); + aFileName = ( ( const SfxStringItem& ) rAttrs->Get( ATTR_ACTION_FILENAME ) ).GetValue(); SetEditText( aFileName ); } |