diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2019-10-03 21:35:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-04 10:24:24 +0200 |
| commit | 01619f03f3b369e2ccdd42b53eb275d3048807d1 (patch) | |
| tree | 60805ba790bba06bbb8919d7224b8521b9bda43f /sd/source | |
| parent | 92a435a3fea1fda933c1d418e4711a9bfb3bdb2a (diff) | |
use SfxUInt16Item for SID_METRIC_ITEM
because we aren't using the array of values in SfxAllEnumItem
Change-Id: I67ccb7737c52f9949495c53881e052d5005882aa
Reviewed-on: https://gerrit.libreoffice.org/80165
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/dlg/BulletAndPositionDlg.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/dlgolbul.cxx | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index e1daf7661942..7ce6a227fe3f 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -185,11 +185,11 @@ SvxBulletAndPositionDlg::SvxBulletAndPositionDlg(weld::Window* pWindow, const Sf // PageCreated FieldUnit eMetric = pView->GetDoc().GetUIUnit(); SfxAllItemSet aSet(*(rSet.GetPool())); - aSet.Put(SfxAllEnumItem(SID_METRIC_ITEM, static_cast<sal_uInt16>(eMetric))); + aSet.Put(SfxUInt16Item(SID_METRIC_ITEM, static_cast<sal_uInt16>(eMetric))); const SfxStringItem* pNumCharFmt = aSet.GetItem<SfxStringItem>(SID_NUM_CHAR_FMT, false); const SfxStringItem* pBulletCharFmt = aSet.GetItem<SfxStringItem>(SID_BULLET_CHAR_FMT, false); - const SfxAllEnumItem* pMetricItem = aSet.GetItem<SfxAllEnumItem>(SID_METRIC_ITEM, false); + const SfxUInt16Item* pMetricItem = aSet.GetItem<SfxUInt16Item>(SID_METRIC_ITEM, false); if (pNumCharFmt && pBulletCharFmt) SetCharFmts(pNumCharFmt->GetValue(), pBulletCharFmt->GetValue()); diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx index f62057f8ce41..0f8f46c4a5fd 100644 --- a/sd/source/ui/dlg/dlgolbul.cxx +++ b/sd/source/ui/dlg/dlgolbul.cxx @@ -31,6 +31,7 @@ #include <View.hxx> #include <svx/svdobj.hxx> #include <svl/style.hxx> +#include <svl/intitem.hxx> #include <drawdoc.hxx> #include <strings.hxx> @@ -135,14 +136,14 @@ void OutlineBulletDlg::PageCreated(const OString& rId, SfxTabPage &rPage) { FieldUnit eMetric = m_pSdView->GetDoc().GetUIUnit(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,static_cast<sal_uInt16>(eMetric))); + aSet.Put ( SfxUInt16Item(SID_METRIC_ITEM,static_cast<sal_uInt16>(eMetric))); rPage.PageCreated(aSet); } else if (rId == "position") { FieldUnit eMetric = m_pSdView->GetDoc().GetUIUnit(); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - aSet.Put ( SfxAllEnumItem(SID_METRIC_ITEM,static_cast<sal_uInt16>(eMetric))); + aSet.Put ( SfxUInt16Item(SID_METRIC_ITEM,static_cast<sal_uInt16>(eMetric))); rPage.PageCreated(aSet); } } |