diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/shell.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 5 |
4 files changed, 7 insertions, 8 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 0eddae83f90d..4ee7dc17a2fe 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -406,7 +406,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) const SfxStringItem* pStringItem = rReq.GetArg<SfxStringItem>(SID_CONFIG); SfxItemSet aSet( - GetPool(), SID_CONFIG, SID_CONFIG ); + GetPool(), svl::Items<SID_CONFIG, SID_CONFIG>{} ); if ( pStringItem ) { @@ -1597,7 +1597,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); if ( pFact ) { - SfxItemSet aSet(GetPool(), 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/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 012596c175b3..eb0592dc479f 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -1043,7 +1043,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell { // The value is attached to a toggleable attribute (Bools) sal_uInt16 nWhich = pSlot->GetWhich(rPool); - SfxItemSet aSet(rPool, nWhich, nWhich); + SfxItemSet aSet(rPool, {{nWhich, nWhich}}); SfxStateFunc aFunc = pSlot->GetStateFnc(); pShell->CallState( aFunc, aSet ); const SfxPoolItem *pOldItem; diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index ce67c0f8dac3..5bf5b0c413a6 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -382,7 +382,7 @@ bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot ) // Get Slot status SfxItemPool &rPool = GetPool(); const sal_uInt16 nId = rSlot.GetWhich( rPool ); - SfxItemSet aSet(rPool, nId, nId); + SfxItemSet aSet(rPool, {{nId, nId}}); SfxStateFunc pFunc = rSlot.GetStateFnc(); CallState( pFunc, aSet ); return aSet.GetItemState(nId) != SfxItemState::DISABLED; @@ -454,7 +454,7 @@ const SfxPoolItem* SfxShell::GetSlotState // Get Item and Item status const SfxPoolItem *pItem = nullptr; - SfxItemSet aSet( rPool, nSlotId, nSlotId ); // else pItem dies too soon + SfxItemSet aSet( rPool, {{nSlotId, nSlotId}} ); // else pItem dies too soon if ( pSlot ) { // Call Status method diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 5dbf2c272e8b..fea3af2af67b 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -456,9 +456,8 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // templates not supported aDocInfoItem.SetTemplate(false); - SfxItemSet aSet(GetPool(), SID_DOCINFO, SID_DOCINFO, SID_DOC_READONLY, SID_DOC_READONLY, - SID_EXPLORER_PROPS_START, SID_EXPLORER_PROPS_START, SID_BASEURL, SID_BASEURL, - 0L ); + 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>{} ); aSet.Put( aDocInfoItem ); aSet.Put( SfxBoolItem( SID_DOC_READONLY, bReadOnly ) ); aSet.Put( SfxStringItem( SID_EXPLORER_PROPS_START, GetTitle() ) ); |