cui/source/tabpages/page.cxx | 4 ++--
include/svx/svxids.hrc | 2 +-
sc/source/ui/styleui/styledlg.cxx | 2 +-
sd/source/ui/dlg/dlgpage.cxx | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 85091c7bf5c3f2fcf409fd2691f227ca7f353945
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Fri Oct 4 18:07:58 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Oct 5 09:10:05 2019 +0200
Convert SID_ENUM_PAGE_MODE to SfxUInt16Item
Change-Id: I5cffa31b45b7752ba3ff18c8a92da9766fcf8de6
Reviewed-on: https://gerrit.libreoffice.org/80241
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 0cc4cf23651d..41e65c3c2b59 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -1519,7 +1519,7 @@ bool SvxPageDescPage::IsMarginOutOfRange() const
void SvxPageDescPage::PageCreated(const SfxAllItemSet& aSet)
{
- const SfxAllEnumItem* pModeItem =
aSet.GetItem<SfxAllEnumItem>(SID_ENUM_PAGE_MODE, false);
+ 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 SfxStringListItem* pCollectListItem =
aSet.GetItem<SfxStringListItem>(SID_COLLECT_LIST, false);
@@ -1527,7 +1527,7 @@ void SvxPageDescPage::PageCreated(const SfxAllItemSet&
aSet)
if (pModeItem)
{
- eMode = static_cast<SvxModeType>(pModeItem->GetEnumValue());
+ eMode = static_cast<SvxModeType>(pModeItem->GetValue());
}
if(pPaperStartItem && pPaperEndItem)
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 7dd778baadd7..cbcbc7461438 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -823,7 +823,7 @@ class SvxSetItem;
#define SID_SWMODE_TYPE ( SID_SVX_START + 1035
)
#define SID_DISABLE_CTL ( SID_SVX_START + 1036
)
#define SID_INSERT_HYPERLINKCONTROL ( SID_SVX_START + 1037
)
-#define SID_ENUM_PAGE_MODE ( SID_SVX_START + 1038
)
+#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_COLLECT_LIST ( SID_SVX_START + 1041
)
diff --git a/sc/source/ui/styleui/styledlg.cxx
b/sc/source/ui/styleui/styledlg.cxx
index 1002cf2e18e6..ca6c1b727169 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -85,7 +85,7 @@ void ScStyleDlg::PageCreated(const OString& rPageId,
SfxTabPage& rTabPage)
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
if (rPageId == "page")
{
- aSet.Put (SfxAllEnumItem(sal_uInt16(SID_ENUM_PAGE_MODE),
SVX_PAGE_MODE_CENTER));
+ aSet.Put (SfxUInt16Item(sal_uInt16(SID_ENUM_PAGE_MODE),
SVX_PAGE_MODE_CENTER));
rTabPage.PageCreated(aSet);
}
else if (rPageId == "header" || rPageId == "footer")
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index effc2e4501df..f9fa0db66778 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -67,7 +67,7 @@ void SdPageDlg::PageCreated(const OString& rId, SfxTabPage&
rPage)
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
if (rId == "RID_SVXPAGE_PAGE")
{
- aSet.Put (SfxAllEnumItem(sal_uInt16(SID_ENUM_PAGE_MODE),
SVX_PAGE_MODE_PRESENTATION));
+ 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));
rPage.PageCreated(aSet);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
