From b1668edf7fa3ad8c32bcc4d73821770f2df011ca Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Mon, 19 Jul 2021 11:04:45 +0300 Subject: Move svl::Items to include/svl/whichranges.hxx, and unify its usage ... in WhichRangesContainer and SfxItemSet ctors. Now it's not needed to explicitly use 'value' in WhichRangesContainer's ctor, or create an instance for use in SfxItemSet ctor (svl::Items is already defined as a template value of corresponding type). Instead of WhichRangesContainer Foo(svl::Items<1, 2>::value); SfxItemSet Bar(rItemPool, svl::Items<1, 2>{}); now use: WhichRangesContainer Foo(svl::Items<1, 2>); SfxItemSet Bar(rItemPool, svl::Items<1, 2>); Change-Id: I4681d952b6442732025e5a26768098878907a238 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119157 Tested-by: Mike Kaganski Reviewed-by: Mike Kaganski --- sw/source/ui/chrdlg/drpcps.cxx | 2 +- sw/source/ui/chrdlg/numpara.cxx | 2 +- sw/source/ui/chrdlg/pardlg.cxx | 2 +- sw/source/ui/chrdlg/swuiccoll.cxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/source/ui/chrdlg') diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index f3ca8162ee15..4a251c8eb98e 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -55,7 +55,7 @@ using namespace css; using namespace css::uno; using namespace css::lang; -const WhichRangesContainer SwDropCapsPage::aPageRg(svl::Items::value); +const WhichRangesContainer SwDropCapsPage::aPageRg(svl::Items); void SwDropCapsPict::SetText( const OUString& rT ) { diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index a40521c817bc..e57009b3b1fb 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -32,7 +32,7 @@ #include #include -const WhichRangesContainer SwParagraphNumTabPage::aPageRg(svl::Items::value); +const WhichRangesContainer SwParagraphNumTabPage::aPageRg(svl::Items); SwParagraphNumTabPage::SwParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr) : SfxTabPage(pPage, pController, "modules/swriter/ui/numparapage.ui", "NumParaPage", &rAttr) diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx index 44b57bd86231..ad6670d14d87 100644 --- a/sw/source/ui/chrdlg/pardlg.cxx +++ b/sw/source/ui/chrdlg/pardlg.cxx @@ -230,7 +230,7 @@ void SwParaDlg::PageCreated(const OString& rId, SfxTabPage& rPage) { SfxItemSet aNew(*aSet.GetPool(), svl::Items{}); + SID_OFFER_IMPORT, SID_OFFER_IMPORT>); aNew.Put(*GetInputSetImpl()); diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 8f831b24b84f..f94db2ebaee0 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -32,7 +32,7 @@ #include -const WhichRangesContainer SwCondCollPage::m_aPageRg(svl::Items::value); +const WhichRangesContainer SwCondCollPage::m_aPageRg(svl::Items); SwCondCollPage::SwCondCollPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) : SfxTabPage(pPage, pController, "modules/swriter/ui/conditionpage.ui", "ConditionPage", &rSet) -- cgit