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 /sc/source/ui/attrdlg | |
| 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 'sc/source/ui/attrdlg')
| -rw-r--r-- | sc/source/ui/attrdlg/tabpages.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 71a30d40315c..d03198ad899c 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -116,11 +116,11 @@ void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) UpdateButtons(); } -bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) +bool ScTabPageProtection::FillItemSet( SfxItemSet* rCoreAttrs ) { bool bAttrsChanged = false; sal_uInt16 nWhich = GetWhich( SID_SCATTR_PROTECTION ); - const SfxPoolItem* pOldItem = GetOldItem( rCoreAttrs, SID_SCATTR_PROTECTION ); + const SfxPoolItem* pOldItem = GetOldItem( *rCoreAttrs, SID_SCATTR_PROTECTION ); const SfxItemSet& rOldSet = GetItemSet(); SfxItemState eItemState = rOldSet.GetItemState( nWhich, false ); ScProtectionAttr aProtAttr; @@ -139,9 +139,9 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) } if ( bAttrsChanged ) - rCoreAttrs.Put( aProtAttr ); + rCoreAttrs->Put( aProtAttr ); else if ( eItemState == SFX_ITEM_DEFAULT ) - rCoreAttrs.ClearItem( nWhich ); + rCoreAttrs->ClearItem( nWhich ); return bAttrsChanged; } @@ -149,7 +149,7 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) - FillItemSet( *pSetP ); + FillItemSet( pSetP ); return LEAVE_PAGE; } |