diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2019-10-04 18:12:04 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-05 09:10:21 +0200 |
| commit | faec1a870e671e79d1cdc532a509c345e3731c16 (patch) | |
| tree | f5941546fc95153d5301c294b7ab653fce23deb1 | |
| parent | 85091c7bf5c3f2fcf409fd2691f227ca7f353945 (diff) | |
Convert SID_PAPER_START/END to SfxUInt16Item
Change-Id: I62067075853b1d5c893c14d72a247b07a3cc5585
Reviewed-on: https://gerrit.libreoffice.org/80248
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | cui/source/tabpages/page.cxx | 6 | ||||
| -rw-r--r-- | include/svx/svxids.hrc | 4 | ||||
| -rw-r--r-- | sd/source/ui/dlg/dlgpage.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 41e65c3c2b59..9ba650f5ffea 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -1520,8 +1520,8 @@ bool SvxPageDescPage::IsMarginOutOfRange() const void SvxPageDescPage::PageCreated(const SfxAllItemSet& aSet) { const SfxUInt16Item* pModeItem = aSet.GetItem(SID_ENUM_PAGE_MODE, false); - const SfxAllEnumItem* pPaperStartItem = aSet.GetItem<SfxAllEnumItem>(SID_PAPER_START, false); - const SfxAllEnumItem* pPaperEndItem = aSet.GetItem<SfxAllEnumItem>(SID_PAPER_END, false); + const SfxUInt16Item* pPaperStartItem = aSet.GetItem(SID_PAPER_START, false); + const SfxUInt16Item* pPaperEndItem = aSet.GetItem(SID_PAPER_END, false); const SfxStringListItem* pCollectListItem = aSet.GetItem<SfxStringListItem>(SID_COLLECT_LIST, false); const SfxBoolItem* pSupportDrawingLayerFillStyleItem = aSet.GetItem<SfxBoolItem>(SID_DRAWINGLAYER_FILLSTYLES, false); @@ -1532,7 +1532,7 @@ void SvxPageDescPage::PageCreated(const SfxAllItemSet& aSet) if(pPaperStartItem && pPaperEndItem) { - SetPaperFormatRanges(static_cast<Paper>(pPaperStartItem->GetEnumValue())); + SetPaperFormatRanges(static_cast<Paper>(pPaperStartItem->GetValue())); } if(pCollectListItem) diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index cbcbc7461438..1045ec364044 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -824,8 +824,8 @@ class SvxSetItem; #define SID_DISABLE_CTL ( SID_SVX_START + 1036 ) #define SID_INSERT_HYPERLINKCONTROL ( SID_SVX_START + 1037 ) #define SID_ENUM_PAGE_MODE TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1038 ) -#define SID_PAPER_START ( SID_SVX_START + 1039 ) -#define SID_PAPER_END ( SID_SVX_START + 1040 ) +#define SID_PAPER_START TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1039 ) +#define SID_PAPER_END TypedWhichId<SfxUInt16Item>( SID_SVX_START + 1040 ) #define SID_COLLECT_LIST ( SID_SVX_START + 1041 ) #define SID_GROW_FONT_SIZE ( SID_SVX_START + 1042 ) #define SID_SHRINK_FONT_SIZE ( SID_SVX_START + 1043 ) diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx index f9fa0db66778..77dbd01af706 100644 --- a/sd/source/ui/dlg/dlgpage.cxx +++ b/sd/source/ui/dlg/dlgpage.cxx @@ -68,8 +68,8 @@ void SdPageDlg::PageCreated(const OString& rId, SfxTabPage& rPage) if (rId == "RID_SVXPAGE_PAGE") { aSet.Put (SfxUInt16Item(sal_uInt16(SID_ENUM_PAGE_MODE), SVX_PAGE_MODE_PRESENTATION)); - aSet.Put (SfxAllEnumItem(sal_uInt16(SID_PAPER_START), PAPER_A0)); - aSet.Put (SfxAllEnumItem(sal_uInt16(SID_PAPER_END), PAPER_E)); + aSet.Put (SfxUInt16Item(SID_PAPER_START, PAPER_A0)); + aSet.Put (SfxUInt16Item(SID_PAPER_END, PAPER_E)); rPage.PageCreated(aSet); } else if (rId == "RID_SVXPAGE_AREA") |