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/labdlg.cxx | |
parent | -Werror,-Wundefined-bool-conversion (diff) | |
download | core-4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40.tar.gz core-4dbeadb9c1e46ac0008f076cd6f9c5d0a38a4d40.zip |
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/labdlg.cxx')
-rw-r--r-- | cui/source/tabpages/labdlg.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index bba01e446fa0..024fdc70f5b5 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -147,21 +147,21 @@ void SvxCaptionTabPage::Construct() -bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) +bool SvxCaptionTabPage::FillItemSet( SfxItemSet* _rOutAttrs) { - SfxItemPool* pPool = _rOutAttrs.GetPool(); + SfxItemPool* pPool = _rOutAttrs->GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); SfxMapUnit eUnit; nCaptionType = m_pCT_CAPTTYPE->GetSelectItemId()-1; - _rOutAttrs.Put( SdrCaptionTypeItem( (SdrCaptionType) nCaptionType ) ); + _rOutAttrs->Put( SdrCaptionTypeItem( (SdrCaptionType) nCaptionType ) ); if( m_pMF_ABSTAND->IsValueModified() ) { eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONGAP ) ); - _rOutAttrs.Put( SdrCaptionGapItem( GetCoreValue(*m_pMF_ABSTAND, eUnit ) ) ); + _rOutAttrs->Put( SdrCaptionGapItem( GetCoreValue(*m_pMF_ABSTAND, eUnit ) ) ); } // special treatment!!! XXX @@ -174,10 +174,10 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) } } - _rOutAttrs.Put( SdrCaptionEscDirItem( (SdrCaptionEscDir)nEscDir ) ); + _rOutAttrs->Put( SdrCaptionEscDirItem( (SdrCaptionEscDir)nEscDir ) ); bEscRel = m_pLB_ANSATZ_REL->IsVisible(); - _rOutAttrs.Put( SdrCaptionEscIsRelItem( bEscRel ) ); + _rOutAttrs->Put( SdrCaptionEscIsRelItem( bEscRel ) ); if( bEscRel ) { @@ -189,26 +189,26 @@ bool SvxCaptionTabPage::FillItemSet( SfxItemSet& _rOutAttrs) case AT_MITTE: nVal=5000;break; case AT_UNTEN: nVal=10000;break; } - _rOutAttrs.Put( SdrCaptionEscRelItem( nVal ) ); + _rOutAttrs->Put( SdrCaptionEscRelItem( nVal ) ); } else { if( m_pMF_ANSATZ->IsValueModified() ) { eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONESCABS ) ); - _rOutAttrs.Put( SdrCaptionEscAbsItem( GetCoreValue(*m_pMF_ANSATZ, eUnit ) ) ); + _rOutAttrs->Put( SdrCaptionEscAbsItem( GetCoreValue(*m_pMF_ANSATZ, eUnit ) ) ); } } bFitLineLen = m_pCB_LAENGE->IsChecked(); - _rOutAttrs.Put( SdrCaptionFitLineLenItem( bFitLineLen ) ); + _rOutAttrs->Put( SdrCaptionFitLineLenItem( bFitLineLen ) ); if( ! bFitLineLen ) { if( m_pMF_LAENGE->IsValueModified() ) { eUnit = pPool->GetMetric( GetWhich( SDRATTR_CAPTIONLINELEN ) ); - _rOutAttrs.Put( SdrCaptionLineLenItem( GetCoreValue(*m_pMF_LAENGE, eUnit ) ) ); + _rOutAttrs->Put( SdrCaptionLineLenItem( GetCoreValue(*m_pMF_LAENGE, eUnit ) ) ); } } |