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/options/optgdlg.cxx | |
parent | fdo#79817:Fix for corruption having databinding have duplicates attributes (diff) | |
download | core-a92e973b6d0a9ad87fe014442e1678af2ce0c7d0.tar.gz core-a92e973b6d0a9ad87fe014442e1678af2ce0c7d0.zip |
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/options/optgdlg.cxx')
-rw-r--r-- | cui/source/options/optgdlg.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 6bb145a60b57..980bfa8d0e6d 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -296,7 +296,7 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) -void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) +void OfaMiscTabPage::Reset( const SfxItemSet* rSet ) { SvtHelpOptions aHelpOptions; m_pToolTipsCB->Check( aHelpOptions.IsHelpTips() ); @@ -318,7 +318,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) m_pDocStatusCB->SaveValue(); const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, false, &pItem ) ) + if ( SFX_ITEM_SET == rSet->GetItemState( SID_ATTR_YEAR2000, false, &pItem ) ) { m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() ); TwoFigureConfigHdl(m_pYearValueField); @@ -851,7 +851,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet* ) return bModified; } -void OfaViewTabPage::Reset( const SfxItemSet& ) +void OfaViewTabPage::Reset( const SfxItemSet* ) { SvtMiscOptions aMiscOptions; @@ -1416,7 +1416,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet ) return false; } -void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) +void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) { OUString sLang = pLangConfig->aSysLocaleOptions.GetLocaleConfigString(); if ( !sLang.isEmpty() ) @@ -1509,21 +1509,21 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) m_pCurrentDocCB->Enable(true); m_pCurrentDocCB->Check(bLanguageCurrentDoc_Impl); const SfxPoolItem* pLang; - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang) eCurLang = eTempCurLang; } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang) eCurLangCJK = eTempCurLang; } - if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang)) + if( SFX_ITEM_SET == rSet->GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, false, &pLang)) { LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue(); if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang) @@ -1568,7 +1568,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet ) // check the box "For the current document only" // set the focus to the Western Language box const SfxPoolItem* pLang = 0; - if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) + if ( SFX_ITEM_SET == rSet->GetItemState(SID_SET_DOCUMENT_LANGUAGE, false, &pLang ) && ((const SfxBoolItem*)pLang)->GetValue() ) { m_pWesternLanguageLB->GrabFocus(); m_pCurrentDocCB->Enable(true); |