diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-19 11:04:45 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-07-19 16:33:01 +0200 |
| commit | b1668edf7fa3ad8c32bcc4d73821770f2df011ca (patch) | |
| tree | cb93a00ca59f770e616668af15fdc6a50e1627a1 /sfx2 | |
| parent | 5b3c530016927d3e91e3124e124f7b428ab285ac (diff) | |
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 <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 4e4e5f90c3a2..6693eb56892a 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -401,7 +401,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) const SfxStringItem* pStringItem = rReq.GetArg<SfxStringItem>(SID_CONFIG); SfxItemSet aSet( - GetPool(), svl::Items<SID_CONFIG, SID_CONFIG>{} ); + GetPool(), svl::Items<SID_CONFIG, SID_CONFIG> ); if ( pStringItem ) { @@ -1618,7 +1618,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) case SID_AUTO_CORRECT_DLG: { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - SfxItemSet aSet(GetPool(), svl::Items<SID_AUTO_CORRECT_DLG, SID_AUTO_CORRECT_DLG>{}); + SfxItemSet aSet(GetPool(), svl::Items<SID_AUTO_CORRECT_DLG, SID_AUTO_CORRECT_DLG>); const SfxPoolItem* pItem=nullptr; const SfxItemSet* pSet = rReq.GetArgs(); SfxItemPool* pSetPool = pSet ? pSet->GetPool() : nullptr; diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index cdbb281916a7..5da675a3dcb4 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -593,7 +593,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) aDocInfoItem.SetTemplate(false); SfxItemSet aSet(GetPool(), svl::Items<SID_DOCINFO, SID_DOCINFO, SID_DOC_READONLY, SID_DOC_READONLY, - SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, SID_BASEURL, SID_BASEURL>{} ); + SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, SID_BASEURL, SID_BASEURL> ); aSet.Put( aDocInfoItem ); aSet.Put( SfxBoolItem( SID_DOC_READONLY, bReadOnly ) ); aSet.Put( SfxStringItem( SID_EXPLORER_PROPS_START, GetTitle() ) ); |