diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2021-10-06 16:17:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-10-10 11:33:38 +0200 |
| commit | dbd49cf90b175a3c3d7a4f25ad366f9bc4c716db (patch) | |
| tree | 1c9ee40dc72d468f4b35dd83f62966844aabcf62 /chart2/source/controller/main | |
| parent | b972aa8727da6eb2d5d9740b18450d8706df0874 (diff) | |
use SfxItemSetFixed in sw
Change-Id: I69e188d7599b7fc439f613cec0a0967ccb748b7e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123313
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'chart2/source/controller/main')
| -rw-r--r-- | chart2/source/controller/main/DrawCommandDispatch.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/controller/main/ShapeController.cxx | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index 1de375c1f281..06fcf0ac4e57 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -124,9 +124,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj ) if ( pSourceObj ) { const SfxItemSet& rSource = pSourceObj->GetMergedItemSet(); - SfxItemSet aDest( - pObj->getSdrModelFromSdrObject().GetItemPool(), - svl::Items< + SfxItemSetFixed< // Ranges from SdrAttrObj: SDRATTR_START, SDRATTR_SHADOW_LAST, SDRATTR_MISC_FIRST, @@ -139,7 +137,8 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj ) SDRATTR_GRAF_FIRST, SDRATTR_CUSTOMSHAPE_LAST, // Range from SdrTextObj: - EE_ITEMS_START, EE_ITEMS_END>); + EE_ITEMS_START, EE_ITEMS_END> + aDest(pObj->getSdrModelFromSdrObject().GetItemPool()); aDest.Set( rSource ); pObj->SetMergedItemSet( aDest ); Degree100 nAngle = pSourceObj->GetRotateAngle(); diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index f2ea87f399f7..a526abc60527 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -533,11 +533,9 @@ void ShapeController::executeDispatch_ParagraphDialog() SfxItemSet aAttr( rPool ); pDrawViewWrapper->GetAttributes( aAttr ); - SfxItemSet aNewAttr( - rPool, - svl::Items< + SfxItemSetFixed< EE_ITEMS_START, EE_ITEMS_END, - SID_ATTR_PARA_PAGEBREAK, SID_ATTR_PARA_WIDOWS>); + SID_ATTR_PARA_PAGEBREAK, SID_ATTR_PARA_WIDOWS> aNewAttr(rPool); aNewAttr.Put( aAttr ); aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) ); aNewAttr.Put( SvxFormatBreakItem( SvxBreak::NONE, SID_ATTR_PARA_PAGEBREAK ) ); |