diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-02-28 14:59:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-03-01 07:46:32 +0100 |
| commit | e13a8c7df2d11814a0a4669aad88e68e27835934 (patch) | |
| tree | e1669f58faa656da59261b7a24329ae368e43475 /filter | |
| parent | 5a64b618d84edb65465950d54e3b4afc952a301c (diff) | |
use SfxItemSet::GetItemIfSet in desktop..reportdesign
Change-Id: Iaa0ddf4e97866d537a478e668e3c651a9eabc465
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130708
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 15 |
2 files changed, 7 insertions, 12 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 76813d38df24..745a085c7dce 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -5518,9 +5518,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt, SfxItemSet aSet( pSdrModel->GetItemPool() ); ApplyAttributes( rSt, aSet, rObjData ); - const SfxPoolItem* pPoolItem=nullptr; - SfxItemState eState = aSet.GetItemState( XATTR_FILLCOLOR, - false, &pPoolItem ); + SfxItemState eState = aSet.GetItemState( XATTR_FILLCOLOR ); if( SfxItemState::DEFAULT == eState ) aSet.Put( XFillColorItem( OUString(), mnDefaultColor ) ); pObj->SetMergedItemSet(aSet); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 5dee2e32e509..b4b9f3371b14 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5748,27 +5748,24 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T const SfxItemSet* pItemSet = pTextObj->GetBackground(); if ( pItemSet ) { - const SfxPoolItem* pFillStyleItem = nullptr; - pItemSet->GetItemState( XATTR_FILLSTYLE, false, &pFillStyleItem ); + const XFillStyleItem* pFillStyleItem = pItemSet->GetItemIfSet( XATTR_FILLSTYLE, false ); if ( pFillStyleItem ) { - drawing::FillStyle eFillStyle = static_cast<const XFillStyleItem*>(pFillStyleItem)->GetValue(); + drawing::FillStyle eFillStyle = pFillStyleItem->GetValue(); switch( eFillStyle ) { case drawing::FillStyle_SOLID : { - const SfxPoolItem* pFillColorItem = nullptr; - pItemSet->GetItemState( XATTR_FILLCOLOR, false, &pFillColorItem ); + const XColorItem* pFillColorItem = pItemSet->GetItemIfSet( XATTR_FILLCOLOR, false ); if ( pFillColorItem ) - aDefColor = static_cast<const XColorItem*>(pFillColorItem)->GetColorValue(); + aDefColor = pFillColorItem->GetColorValue(); } break; case drawing::FillStyle_GRADIENT : { - const SfxPoolItem* pGradientItem = nullptr; - pItemSet->GetItemState( XATTR_FILLGRADIENT, false, &pGradientItem ); + const XFillGradientItem* pGradientItem = pItemSet->GetItemIfSet( XATTR_FILLGRADIENT, false ); if ( pGradientItem ) - aDefColor = static_cast<const XFillGradientItem*>(pGradientItem)->GetGradientValue().GetStartColor(); + aDefColor = pGradientItem->GetGradientValue().GetStartColor(); } break; case drawing::FillStyle_HATCH : |