diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-15 15:06:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-15 18:53:39 +0200 |
| commit | 7d1692179e7cdca19ab34fdc9701512656f01861 (patch) | |
| tree | 32fdc18742ceeb93090c5c13366705fe8908c1aa /sfx2 | |
| parent | a449b624b24515764a2a494e831583218ee54097 (diff) | |
drop the Pair constructor from SfxItemSet
just so we have one fewer odd constructors here
Change-Id: I81278e9436747a4eb46a33da9bfec7a8b30079b9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118982
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/bindings.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/shell.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 042684647114..b217534376d2 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -987,7 +987,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 pFunc = pSlot->GetStateFnc(); (*pFunc)(pShell, aSet); const SfxPoolItem *pOldItem; diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 118e205cd3ff..a3bcc266f5e4 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -396,7 +396,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(); (*pFunc)( this, aSet ); return aSet.GetItemState(nId) != SfxItemState::DISABLED; @@ -484,7 +484,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 ( nullptr != pSlot ) { // Call Status method |