diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-15 21:49:50 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-16 09:24:25 +0200 |
commit | e7b632bc727413f399a4d0cbc2e92d90b04a3bf7 (patch) | |
tree | 7eee6abb8eb6a8e79a2f6bca1fc735f2b5cd94bc /sd | |
parent | 07087041610ca8351d764c838ae07fa58f3bdf9e (diff) |
use WhichRangesContainer in sd
Change-Id: I528905c14f40bee85689f24ebaef8e8fde1b107b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118999
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/func/fuolbull.cxx | 9 | ||||
-rw-r--r-- | sd/source/ui/view/drviews3.cxx | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index 5d1cf1dec398..4efb6d196263 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -79,14 +79,7 @@ void FuBulletAndPosition::DoExecute( SfxRequest& rReq ) SfxItemSet aEditAttr( mpDoc->GetPool() ); mpView->GetAttributes( aEditAttr ); - static const sal_uInt16 aAttrMap[] = - { - EE_PARA_NUMBULLET, - EE_PARA_BULLET, - 0 - }; - - SfxItemSet aNewAttr( mpViewShell->GetPool(), aAttrMap ); + SfxItemSet aNewAttr( mpViewShell->GetPool(), svl::Items<EE_PARA_NUMBULLET, EE_PARA_BULLET>{} ); aNewAttr.Put( aEditAttr, false ); auto pView = mpView; diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx index 08868977b473..6160df65004a 100644 --- a/sd/source/ui/view/drviews3.cxx +++ b/sd/source/ui/view/drviews3.cxx @@ -817,13 +817,10 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq) const SvxLRSpaceItem& rItem = static_cast<const SvxLRSpaceItem&>( pArgs->Get( nId )); - static const sal_uInt16 aWhichTable[]= - { - EE_PARA_OUTLLEVEL, EE_PARA_OUTLLEVEL, - EE_PARA_LRSPACE, EE_PARA_LRSPACE, + static const auto aWhichTable = svl::Items< EE_PARA_NUMBULLET, EE_PARA_NUMBULLET, - 0, 0 - }; + EE_PARA_OUTLLEVEL, EE_PARA_OUTLLEVEL, + EE_PARA_LRSPACE, EE_PARA_LRSPACE>{}; SfxItemSet aEditAttr( GetDoc()->GetPool(), aWhichTable ); |