summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-03-30 17:55:05 +0200
committerMichael Stahl <mstahl@redhat.com>2016-03-31 11:19:23 +0000
commit51d7f466df85f679f54e4e690f8b5e602192eb7b (patch)
tree94a72abb002879ef4dca830ad652415521b8bdd5 /svx
parent7a2d55a1943e51895d808e87f1766b44761a495a (diff)
sfx2: make SfxDispatcher::Execute() less variadic ...
... and less overloaded; C++11 initializer_list should make undefined behavior as fixed in ba0a866b83f016fd460320e7d057dd107e019f19 less likely. Change-Id: I15cc0804451b6a4fcbfaa623f9a30db222207865 Reviewed-on: https://gerrit.libreoffice.org/23666 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/_bmpmask.cxx9
-rw-r--r--svx/source/dialog/_contdlg.cxx10
-rw-r--r--svx/source/dialog/fontwork.cxx36
-rw-r--r--svx/source/dialog/imapdlg.cxx10
-rw-r--r--svx/source/dialog/svxruler.cxx17
-rw-r--r--svx/source/engine3d/float3d.cxx24
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx5
-rw-r--r--svx/source/form/fmshell.cxx10
-rw-r--r--svx/source/sidebar/area/AreaPropertyPanel.cxx26
-rw-r--r--svx/source/sidebar/graphic/GraphicPropertyPanel.cxx24
-rw-r--r--svx/source/sidebar/line/LinePropertyPanel.cxx24
-rw-r--r--svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx8
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx28
-rw-r--r--svx/source/sidebar/possize/PosSizePropertyPanel.cxx36
-rw-r--r--svx/source/sidebar/shadow/ShadowPropertyPanel.cxx21
-rw-r--r--svx/source/sidebar/text/TextCharacterSpacingControl.cxx21
-rw-r--r--svx/source/sidebar/text/TextUnderlineControl.cxx3
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx30
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx59
19 files changed, 241 insertions, 160 deletions
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 9156d265db81..e9a7e4c0f229 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -192,7 +192,8 @@ IMPL_LINK_TYPED( MaskData, PipetteHdl, ToolBox*, pTbx, void )
SfxBoolItem aBItem( SID_BMPMASK_PIPETTE,
pTbx->IsItemChecked( pTbx->GetItemId(0) ) );
- rBindings.GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aBItem, 0L );
+ rBindings.GetDispatcher()->ExecuteList(SID_BMPMASK_PIPETTE, OWN_CALLMODE,
+ { &aBItem });
}
IMPL_LINK_TYPED( MaskData, CbxHdl, Button*, pButton, void )
@@ -304,7 +305,8 @@ IMPL_LINK_TYPED( MaskData, FocusLbHdl, Control&, rControl, void )
IMPL_LINK_NOARG_TYPED(MaskData, ExecHdl, Button*, void)
{
SfxBoolItem aBItem( SID_BMPMASK_EXEC, true );
- rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L );
+ rBindings.GetDispatcher()->ExecuteList(SID_BMPMASK_EXEC, OWN_CALLMODE,
+ { &aBItem });
}
void ColorWindow::Paint( vcl::RenderContext& rRenderContext, const Rectangle& /*Rect*/)
@@ -512,7 +514,8 @@ void SvxBmpMask::onSelect( MaskSet* pSet )
bool SvxBmpMask::Close()
{
SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, false );
- GetBindings().GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aItem2, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_BMPMASK_PIPETTE,
+ OWN_CALLMODE, { &aItem2 });
return SfxDockingWindow::Close();
}
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 93e3d91e2e76..630550f3f1f5 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -322,8 +322,9 @@ bool SvxSuperContourDlg::Close()
if ( nRet == RET_YES )
{
SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, true );
- GetBindings().GetDispatcher()->Execute(
- SID_CONTOUR_EXEC, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aBoolItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(
+ SID_CONTOUR_EXEC, SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
+ { &aBoolItem });
}
else if ( nRet == RET_CANCEL )
bRet = false;
@@ -438,8 +439,9 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void )
if (nId == mnApplyId)
{
SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, true );
- GetBindings().GetDispatcher()->Execute(
- SID_CONTOUR_EXEC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aBoolItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(
+ SID_CONTOUR_EXEC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
+ { &aBoolItem });
}
else if (nId == mnWorkSpaceId)
{
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 89e90261189d..8a56f4c3a0cc 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -530,8 +530,9 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
XFormTextShadowXValItem aXItem( nSaveShadowX );
XFormTextShadowYValItem aYItem( nSaveShadowY );
- GetBindings().GetDispatcher()->Execute(
- SID_FORMTEXT_SHDWXVAL, SfxCallMode::RECORD, &aXItem, &aYItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(
+ SID_FORMTEXT_SHDWXVAL, SfxCallMode::RECORD,
+ { &aXItem, &aYItem });
}
}
else
@@ -556,8 +557,9 @@ void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
m_pMtrFldShadowY->SetValue(nSaveShadowSize);
XFormTextShadowXValItem aXItem(nSaveShadowAngle);
XFormTextShadowYValItem aYItem(nSaveShadowSize);
- GetBindings().GetDispatcher()->Execute(
- SID_FORMTEXT_SHDWXVAL, SfxCallMode::RECORD, &aXItem, &aYItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(
+ SID_FORMTEXT_SHDWXVAL, SfxCallMode::RECORD,
+ { &aXItem, &aYItem });
}
}
}
@@ -663,7 +665,8 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectStyleHdl_Impl, ToolBox *, void)
eStyle = XFT_SLANTY;
XFormTextStyleItem aItem( eStyle );
- GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_STYLE, SfxCallMode::RECORD, &aItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_STYLE,
+ SfxCallMode::RECORD, { &aItem });
SetStyle_Impl( &aItem );
nLastStyleTbxId = nId;
}
@@ -676,7 +679,8 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectAdjustHdl_Impl, ToolBox *, void)
if (nId == nAdjustMirrorId)
{
XFormTextMirrorItem aItem(m_pTbxAdjust->IsItemChecked(nId));
- GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_MIRROR, SfxCallMode::SLOT, &aItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_MIRROR,
+ SfxCallMode::SLOT, { &aItem });
}
else if ( nId != nLastAdjustTbxId )
{
@@ -690,7 +694,8 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectAdjustHdl_Impl, ToolBox *, void)
eAdjust = XFT_RIGHT;
XFormTextAdjustItem aItem(eAdjust);
- GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_ADJUST, SfxCallMode::RECORD, &aItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_ADJUST,
+ SfxCallMode::RECORD, { &aItem });
SetAdjust_Impl(&aItem);
nLastAdjustTbxId = nId;
}
@@ -703,12 +708,14 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void)
if (nId == nShowFormId)
{
XFormTextHideFormItem aItem(!m_pTbxShadow->IsItemChecked(nId));
- GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_HIDEFORM, SfxCallMode::RECORD, &aItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_HIDEFORM,
+ SfxCallMode::RECORD, { &aItem });
}
else if (nId == nOutlineId)
{
XFormTextOutlineItem aItem(m_pTbxShadow->IsItemChecked(nId));
- GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_OUTLINE, SfxCallMode::RECORD, &aItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_OUTLINE,
+ SfxCallMode::RECORD, { &aItem });
}
else if (nId != nLastShadowTbxId)
{
@@ -730,7 +737,8 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void)
else if (nId == nShadowSlantId) eShadow = XFTSHADOW_SLANT;
XFormTextShadowItem aItem(eShadow);
- GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SfxCallMode::RECORD, &aItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_SHADOW,
+ SfxCallMode::RECORD, { &aItem });
SetShadow_Impl(&aItem, true);
}
}
@@ -789,14 +797,16 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void)
XFormTextShadowYValItem aShadowYItem( nValueY );
// Slot-ID does not matter, the Exec method evaluates the entire item set
- GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_DISTANCE, SfxCallMode::RECORD, &aDistItem,
- &aStartItem, &aShadowXItem, &aShadowYItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_DISTANCE,
+ SfxCallMode::RECORD,
+ { &aDistItem, &aStartItem, &aShadowXItem, &aShadowYItem });
}
IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, ColorSelectHdl_Impl, ListBox&, void)
{
XFormTextShadowColorItem aItem( "", m_pShadowColorLB->GetSelectEntryColor() );
- GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHDWCOLOR, SfxCallMode::RECORD, &aItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_SHDWCOLOR,
+ SfxCallMode::RECORD, { &aItem });
}
void SvxFontWorkDialog::SetColorList(const XColorListRef &pList)
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 39e801490e58..ccd81fdbb58b 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -250,8 +250,9 @@ bool SvxIMapDlg::Close()
if( nRet == RET_YES )
{
SfxBoolItem aBoolItem( SID_IMAP_EXEC, true );
- GetBindings().GetDispatcher()->Execute(
- SID_IMAP_EXEC, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aBoolItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_IMAP_EXEC,
+ SfxCallMode::SYNCHRON | SfxCallMode::RECORD,
+ { &aBoolItem });
}
else if( nRet == RET_CANCEL )
bRet = false;
@@ -350,8 +351,9 @@ IMPL_LINK_TYPED( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void )
{
URLLoseFocusHdl( *m_pURLBox );
SfxBoolItem aBoolItem( SID_IMAP_EXEC, true );
- GetBindings().GetDispatcher()->Execute(
- SID_IMAP_EXEC, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aBoolItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_IMAP_EXEC,
+ SfxCallMode::ASYNCHRON | SfxCallMode::RECORD,
+ { &aBoolItem });
}
else if(nNewItemId == mnOpenId)
DoOpen();
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index f30bd2eeee91..4567fc1e122c 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -2050,7 +2050,7 @@ void SvxRuler::ApplyMargins()
#endif // DEBUGLIN
}
- pBindings->GetDispatcher()->Execute( nId, SfxCallMode::RECORD, pItem, 0L );
+ pBindings->GetDispatcher()->ExecuteList(nId, SfxCallMode::RECORD, { pItem });
if(mxTabStopItem.get())
UpdateTabs();
}
@@ -2156,7 +2156,8 @@ void SvxRuler::ApplyIndents()
mxParaItem->SetRight(nNewRight);
sal_uInt16 nParagraphId = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
- pBindings->GetDispatcher()->Execute( nParagraphId, SfxCallMode::RECORD, mxParaItem.get(), 0L );
+ pBindings->GetDispatcher()->ExecuteList(nParagraphId, SfxCallMode::RECORD,
+ { mxParaItem.get() });
UpdateTabs();
}
@@ -2237,7 +2238,8 @@ void SvxRuler::ApplyTabs()
mxTabStopItem->Insert(aTabStop);
}
sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
- pBindings->GetDispatcher()->Execute( nTabStopId, SfxCallMode::RECORD, mxTabStopItem.get(), 0L );
+ pBindings->GetDispatcher()->ExecuteList(nTabStopId, SfxCallMode::RECORD,
+ { mxTabStopItem.get() });
UpdateTabs();
}
@@ -2299,7 +2301,8 @@ void SvxRuler::ApplyBorders()
sal_uInt16 nColId = mxRulerImpl->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
(bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL);
- pBindings->GetDispatcher()->Execute( nColId, SfxCallMode::RECORD, mxColumnItem.get(), &aFlag, 0L );
+ pBindings->GetDispatcher()->ExecuteList(nColId, SfxCallMode::RECORD,
+ { mxColumnItem.get(), &aFlag });
}
void SvxRuler::ApplyObject()
@@ -2337,7 +2340,8 @@ void SvxRuler::ApplyObject()
mxObjectItem->GetEndY());
mxObjectItem->SetEndY(nEndY);
- pBindings->GetDispatcher()->Execute(SID_RULER_OBJECT, SfxCallMode::RECORD, mxObjectItem.get(), 0L);
+ pBindings->GetDispatcher()->ExecuteList(SID_RULER_OBJECT,
+ SfxCallMode::RECORD, { mxObjectItem.get() });
}
void SvxRuler::PrepareProportional_Impl(RulerType eType)
@@ -3367,7 +3371,8 @@ IMPL_LINK_TYPED( SvxRuler, TabMenuSelect, Menu *, pMenu, bool )
mxTabStopItem->Remove(mxRulerImpl->nIdx);
mxTabStopItem->Insert(aTabStop);
sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
- pBindings->GetDispatcher()->Execute( nTabStopId, SfxCallMode::RECORD, mxTabStopItem.get(), 0L );
+ pBindings->GetDispatcher()->ExecuteList(nTabStopId,
+ SfxCallMode::RECORD, { mxTabStopItem.get() });
UpdateTabs();
mxRulerImpl->nIdx = 0;
}
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index b461bb7a64df..bd103da8e1d0 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -308,8 +308,8 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
if (pDispatcher != nullptr)
{
SfxBoolItem aItem( SID_3D_INIT, true );
- pDispatcher->Execute(
- SID_3D_INIT, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
+ pDispatcher->ExecuteList(SID_3D_INIT,
+ SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { &aItem });
}
Reset();
@@ -2149,8 +2149,8 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void)
if (pDispatcher != nullptr)
{
SfxBoolItem aItem( SID_3D_STATE, true );
- pDispatcher->Execute(
- SID_3D_STATE, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
+ pDispatcher->ExecuteList(SID_3D_STATE,
+ SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { &aItem });
}
}
else
@@ -2166,8 +2166,8 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void)
if (pDispatcher != nullptr)
{
SfxBoolItem aItem( SID_3D_ASSIGN, true );
- pDispatcher->Execute(
- SID_3D_ASSIGN, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
+ pDispatcher->ExecuteList(SID_3D_ASSIGN,
+ SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { &aItem });
}
}
@@ -2428,8 +2428,8 @@ IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void )
if (pDispatcher != nullptr)
{
SfxBoolItem aItem( nSId, true );
- pDispatcher->Execute(
- nSId, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
+ pDispatcher->ExecuteList(nSId,
+ SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { &aItem });
}
}
else if( bUpdatePreview )
@@ -2726,8 +2726,8 @@ void Svx3DWin::UpdatePreview()
if (pDispatcher != nullptr)
{
SfxBoolItem aItem( SID_3D_STATE, true );
- pDispatcher->Execute(
- SID_3D_STATE, SfxCallMode::SYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
+ pDispatcher->ExecuteList(SID_3D_STATE,
+ SfxCallMode::SYNCHRON | SfxCallMode::RECORD, { &aItem });
}
// Reset Flag
bOnly3DChanged = false;
@@ -2919,8 +2919,8 @@ void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState,
if (pDispatcher != nullptr)
{
SfxBoolItem aItem( SID_3D_STATE, true );
- pDispatcher->Execute(
- SID_3D_STATE, SfxCallMode::ASYNCHRON|SfxCallMode::RECORD, &aItem, 0L);
+ pDispatcher->ExecuteList(SID_3D_STATE,
+ SfxCallMode::ASYNCHRON|SfxCallMode::RECORD, { &aItem });
}
}
}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 268bceab00fc..15c9c3b48544 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -959,8 +959,9 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction != eCloseInspector );
- pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON,
- &aIFaceItem, &aShowItem, 0L );
+ pCurrentFrame->GetBindings().GetDispatcher()->ExecuteList(
+ SID_FM_SHOW_PROPERTY_BROWSER, SfxCallMode::ASYNCHRON,
+ { &aIFaceItem, &aShowItem });
}
}
}
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 16e04f349dd0..bce5d77cfa19 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -520,8 +520,9 @@ void FmFormShell::Execute(SfxRequest &rReq)
// reusing the SID_FM_TOGGLECONTROLFOCUS is somewhat hacky ... which it wouldn't if it would have another
// name, so I do not really have a big problem with this ....
SfxBoolItem aGrabFocusIndicatorItem( SID_FM_TOGGLECONTROLFOCUS, true );
- GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( nSlot, SfxCallMode::ASYNCHRON,
- &aGrabFocusIndicatorItem, nullptr );
+ GetViewShell()->GetViewFrame()->GetDispatcher()->ExecuteList(
+ nSlot, SfxCallMode::ASYNCHRON,
+ { &aGrabFocusIndicatorItem });
}
rReq.Done();
@@ -815,8 +816,9 @@ void FmFormShell::Execute(SfxRequest &rReq)
// initially open the filter navigator, the whole form based filter is pretty useless without it
SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, true );
- GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SfxCallMode::ASYNCHRON,
- &aIdentifierItem, nullptr );
+ GetViewShell()->GetViewFrame()->GetDispatcher()->ExecuteList(
+ SID_FM_FILTER_NAVIGATOR, SfxCallMode::ASYNCHRON,
+ { &aIdentifierItem });
} break;
}
}
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 6809c75e0603..0d61d41e0593 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -105,46 +105,48 @@ VclPtr<vcl::Window> AreaPropertyPanel::Create (
void AreaPropertyPanel::setFillTransparence(const XFillTransparenceItem& rItem)
{
- GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_TRANSPARENCE, SfxCallMode::RECORD, &rItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_TRANSPARENCE,
+ SfxCallMode::RECORD, { &rItem });
}
void AreaPropertyPanel::setFillFloatTransparence(const XFillFloatTransparenceItem& rItem)
{
- GetBindings()->GetDispatcher()->Execute( SID_ATTR_FILL_FLOATTRANSPARENCE, SfxCallMode::RECORD, &rItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_FLOATTRANSPARENCE,
+ SfxCallMode::RECORD, { &rItem });
}
void AreaPropertyPanel::setFillStyle(const XFillStyleItem& rItem)
{
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_FILL_STYLE, SfxCallMode::RECORD, &rItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_STYLE,
+ SfxCallMode::RECORD, { &rItem });
}
void AreaPropertyPanel::setFillStyleAndColor(const XFillStyleItem* pStyleItem,
const XFillColorItem& aColorItem)
{
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_FILL_COLOR, SfxCallMode::RECORD, &aColorItem, pStyleItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_COLOR,
+ SfxCallMode::RECORD, { &aColorItem, pStyleItem });
}
void AreaPropertyPanel::setFillStyleAndGradient(const XFillStyleItem* pStyleItem,
const XFillGradientItem& rGradientItem)
{
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_FILL_GRADIENT, SfxCallMode::RECORD, &rGradientItem, pStyleItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_GRADIENT,
+ SfxCallMode::RECORD, { &rGradientItem, pStyleItem });
}
void AreaPropertyPanel::setFillStyleAndHatch(const XFillStyleItem* pStyleItem,
const XFillHatchItem& rHatchItem)
{
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_FILL_HATCH, SfxCallMode::RECORD, &rHatchItem, pStyleItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_HATCH,
+ SfxCallMode::RECORD, { &rHatchItem, pStyleItem });
}
void AreaPropertyPanel::setFillStyleAndBitmap(const XFillStyleItem* pStyleItem,
const XFillBitmapItem& rBitmapItem)
{
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_FILL_BITMAP, SfxCallMode::RECORD, &rBitmapItem, pStyleItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_BITMAP,
+ SfxCallMode::RECORD, { &rBitmapItem, pStyleItem });
}
} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index d68bff3685e9..bfc477ddd0a0 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -137,7 +137,8 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void )
{
const sal_Int16 nBright = mpMtrBrightness->GetValue();
const SfxInt16Item aBrightItem( SID_ATTR_GRAF_LUMINANCE, nBright );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_LUMINANCE, SfxCallMode::RECORD, &aBrightItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_LUMINANCE,
+ SfxCallMode::RECORD, { &aBrightItem });
}
@@ -145,7 +146,8 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void )
{
const sal_Int16 nContrast = mpMtrContrast->GetValue();
const SfxInt16Item aContrastItem( SID_ATTR_GRAF_CONTRAST, nContrast );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_CONTRAST, SfxCallMode::RECORD, &aContrastItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_CONTRAST,
+ SfxCallMode::RECORD, { &aContrastItem });
}
@@ -153,7 +155,8 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyTransHdl, Edit&, void )
{
const sal_Int16 nTrans = mpMtrTrans->GetValue();
const SfxInt16Item aTransItem( SID_ATTR_GRAF_TRANSPARENCE, nTrans );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_TRANSPARENCE, SfxCallMode::RECORD, &aTransItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_TRANSPARENCE,
+ SfxCallMode::RECORD, { &aTransItem });
}
@@ -161,7 +164,8 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void )
{
const sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos();
const SfxInt16Item aTransItem( SID_ATTR_GRAF_MODE, nTrans );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_MODE, SfxCallMode::RECORD, &aTransItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_MODE,
+ SfxCallMode::RECORD, { &aTransItem });
}
@@ -169,7 +173,8 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, RedHdl, Edit&, void )
{
const sal_Int16 nRed = mpMtrRed->GetValue();
const SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_RED, SfxCallMode::RECORD, &aRedItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_RED,
+ SfxCallMode::RECORD, { &aRedItem });
}
@@ -177,7 +182,8 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, GreenHdl, Edit&, void )
{
const sal_Int16 nGreen = mpMtrGreen->GetValue();
const SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_GREEN, SfxCallMode::RECORD, &aGreenItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_GREEN,
+ SfxCallMode::RECORD, { &aGreenItem });
}
@@ -185,7 +191,8 @@ IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, BlueHdl, Edit&, void)
{
const sal_Int16 nBlue = mpMtrBlue->GetValue();
const SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_BLUE, SfxCallMode::RECORD, &aBlueItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_BLUE,
+ SfxCallMode::RECORD, { &aBlueItem });
}
@@ -193,7 +200,8 @@ IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, GammaHdl, Edit&, void)
{
const sal_Int32 nGamma = mpMtrGamma->GetValue();
const SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_GRAF_GAMMA, SfxCallMode::RECORD, &nGammaItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_GRAF_GAMMA,
+ SfxCallMode::RECORD, { &nGammaItem });
}
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 37e0dac0b3dc..135bd210af39 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -212,42 +212,50 @@ void LinePropertyPanel::HandleContextChange(
void LinePropertyPanel::setLineStyle(const XLineStyleItem& rItem)
{
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SfxCallMode::RECORD, &rItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_LINE_STYLE,
+ SfxCallMode::RECORD, { &rItem });
}
void LinePropertyPanel::setLineDash(const XLineDashItem& rItem)
{
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_DASH, SfxCallMode::RECORD, &rItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_LINE_DASH,
+ SfxCallMode::RECORD, { &rItem });
}
void LinePropertyPanel::setLineEndStyle(const XLineEndItem* pItem)
{
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINEEND_STYLE, SfxCallMode::RECORD, pItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_LINEEND_STYLE,
+ SfxCallMode::RECORD, { pItem });
}
void LinePropertyPanel::setLineStartStyle(const XLineStartItem* pItem)
{
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINEEND_STYLE, SfxCallMode::RECORD, pItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_LINEEND_STYLE,
+ SfxCallMode::RECORD, { pItem });
}
void LinePropertyPanel::setLineJoint(const XLineJointItem* pItem)
{
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_JOINT, SfxCallMode::RECORD, pItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_LINE_JOINT,
+ SfxCallMode::RECORD, { pItem });
}
void LinePropertyPanel::setLineCap(const XLineCapItem* pItem)
{
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_CAP, SfxCallMode::RECORD, pItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_LINE_CAP,
+ SfxCallMode::RECORD, { pItem });
}
void LinePropertyPanel::setLineTransparency(const XLineTransparenceItem& rItem)
{
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SfxCallMode::RECORD, &rItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_LINE_STYLE,
+ SfxCallMode::RECORD, { &rItem });
}
void LinePropertyPanel::setLineWidth(const XLineWidthItem& rItem)
{
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_WIDTH, SfxCallMode::RECORD, &rItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_LINE_WIDTH,
+ SfxCallMode::RECORD, { &rItem });
}
}} // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 4183ec06e507..82f8ca57b9bb 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -361,8 +361,8 @@ void ParaLineSpacingControl::ExecuteLineSpace()
break;
}
- SfxViewFrame::Current()->GetBindings().GetDispatcher()->Execute(
- SID_ATTR_PARA_LINESPACE, SfxCallMode::RECORD, &aSpacing, 0L);
+ SfxViewFrame::Current()->GetBindings().GetDispatcher()->ExecuteList(
+ SID_ATTR_PARA_LINESPACE, SfxCallMode::RECORD, { &aSpacing });
}
void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_Int32 eSpace, long lValue)
@@ -437,8 +437,8 @@ void ParaLineSpacingControl::ExecuteLineSpacing(sal_Int32 nEntry)
else
SetLineSpace(aSpacing, nEntry);
- SfxViewFrame::Current()->GetBindings().GetDispatcher()->Execute(
- SID_ATTR_PARA_LINESPACE, SfxCallMode::RECORD, &aSpacing, 0L);
+ SfxViewFrame::Current()->GetBindings().GetDispatcher()->ExecuteList(
+ SID_ATTR_PARA_LINESPACE, SfxCallMode::RECORD, { &aSpacing });
// close when the user used the buttons
EndPopupMode();
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 127ce9fd6414..b50c587ab0ed 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -209,8 +209,8 @@ IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void)
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, { &aMargin });
}
IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, void)
@@ -226,8 +226,8 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
case CombinedEnumContext(Application_WriterVariants, Context_Table):
{
SfxBoolItem aMargin( SID_INC_INDENT, true );
- GetBindings()->GetDispatcher()->Execute(
- SID_INC_INDENT, SfxCallMode::RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_INC_INDENT, SfxCallMode::RECORD, { &aMargin });
}
break;
default:
@@ -241,8 +241,8 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, { &aMargin });
}
}
}
@@ -255,8 +255,8 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
case CombinedEnumContext(Application_WriterVariants, Context_Table):
{
SfxBoolItem aMargin( SID_DEC_INDENT, true );
- GetBindings()->GetDispatcher()->Execute(
- SID_DEC_INDENT, SfxCallMode::RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_DEC_INDENT, SfxCallMode::RECORD, { &aMargin });
}
break;
default:
@@ -275,8 +275,8 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, { &aMargin });
}
}
}
@@ -287,8 +287,8 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
aMargin.SetTextFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, { &aMargin });
}
}
@@ -299,8 +299,8 @@ IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ULSpaceHdl_Impl, Edit&, void)
aMargin.SetUpper( (sal_uInt16)GetCoreValue( *mpTopDist, m_eULSpaceUnit ) );
aMargin.SetLower( (sal_uInt16)GetCoreValue( *mpBottomDist, m_eULSpaceUnit ) );
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_ULSPACE, SfxCallMode::RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_ATTR_PARA_ULSPACE, SfxCallMode::RECORD, { &aMargin });
}
// for Paragraph State change
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 11e4f005ffa2..154eed5cc370 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -437,8 +437,8 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void )
SfxInt32Item aRotXItem( SID_ATTR_TRANSFORM_ROT_X, basegfx::fround(mlRotX * fUIScale));
SfxInt32Item aRotYItem( SID_ATTR_TRANSFORM_ROT_Y, basegfx::fround(mlRotY * fUIScale));
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aAngleItem, &aRotXItem, &aRotYItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_TRANSFORM,
+ SfxCallMode::RECORD, { &aAngleItem, &aRotXItem, &aRotYItem });
}
@@ -452,8 +452,8 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void )
SfxInt32Item aRotXItem( SID_ATTR_TRANSFORM_ROT_X, basegfx::fround(mlRotX * fUIScale));
SfxInt32Item aRotYItem( SID_ATTR_TRANSFORM_ROT_Y, basegfx::fround(mlRotY * fUIScale));
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aAngleItem, &aRotXItem, &aRotYItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_TRANSFORM,
+ SfxCallMode::RECORD, { &aAngleItem, &aRotXItem, &aRotYItem });
}
@@ -464,14 +464,14 @@ IMPL_LINK_TYPED( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void )
if(aCommand == UNO_FLIPHORIZONTAL)
{
SfxVoidItem aHoriItem(SID_FLIP_HORIZONTAL);
- GetBindings()->GetDispatcher()->Execute(
- SID_FLIP_HORIZONTAL, SfxCallMode::RECORD, &aHoriItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_FLIP_HORIZONTAL,
+ SfxCallMode::RECORD, { &aHoriItem });
}
else if(aCommand == UNO_FLIPVERTICAL)
{
SfxVoidItem aVertItem(SID_FLIP_VERTICAL);
- GetBindings()->GetDispatcher()->Execute(
- SID_FLIP_VERTICAL, SfxCallMode::RECORD, &aVertItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_FLIP_VERTICAL,
+ SfxCallMode::RECORD, { &aVertItem });
}
}
@@ -834,16 +834,20 @@ void PosSizePropertyPanel::executeSize()
|| nCombinedContext == CombinedEnumContext(Application_WriterVariants, Context_OLE)
)
{
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aWidthItem, &aHeightItem, &aPointItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_TRANSFORM,
+ SfxCallMode::RECORD, { &aWidthItem, &aHeightItem, &aPointItem });
}
else
{
if ( (mpMtrWidth->IsValueModified()) && (mpMtrHeight->IsValueModified()))
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aWidthItem, &aHeightItem, &aPointItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_TRANSFORM,
+ SfxCallMode::RECORD, { &aWidthItem, &aHeightItem, &aPointItem });
else if( mpMtrWidth->IsValueModified())
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aWidthItem, &aPointItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_TRANSFORM,
+ SfxCallMode::RECORD, { &aWidthItem, &aPointItem });
else if ( mpMtrHeight->IsValueModified())
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aHeightItem, &aPointItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_TRANSFORM,
+ SfxCallMode::RECORD, { &aHeightItem, &aPointItem });
}
}
}
@@ -867,8 +871,8 @@ void PosSizePropertyPanel::executePosX()
SfxInt32Item aPosXItem( SID_ATTR_TRANSFORM_POS_X,(sal_uInt32) lX);
SfxInt32Item aPosYItem( SID_ATTR_TRANSFORM_POS_Y,(sal_uInt32) lY);
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aPosXItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_ATTR_TRANSFORM, SfxCallMode::RECORD, { &aPosXItem });
}
}
@@ -889,8 +893,8 @@ void PosSizePropertyPanel::executePosY()
SfxInt32Item aPosXItem( SID_ATTR_TRANSFORM_POS_X,(sal_uInt32) lX);
SfxInt32Item aPosYItem( SID_ATTR_TRANSFORM_POS_Y,(sal_uInt32) lY);
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_TRANSFORM, SfxCallMode::RECORD, &aPosYItem, 0L );
+ GetBindings()->GetDispatcher()->ExecuteList(
+ SID_ATTR_TRANSFORM, SfxCallMode::RECORD, { &aPosYItem });
}
}
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index 5bbfa3ee470e..563dd3c777bb 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -149,19 +149,22 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ClickShadowHdl, Button*, void)
if( mpShowShadow->GetState() == TRISTATE_FALSE )
{
SdrOnOffItem aItem(makeSdrShadowItem(false));
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_FILL_SHADOW, SfxCallMode::RECORD, &aItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
+ SfxCallMode::RECORD, { &aItem });
}
else
{
SdrOnOffItem aItem(makeSdrShadowItem(true));
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_FILL_SHADOW, SfxCallMode::RECORD, &aItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_FILL_SHADOW,
+ SfxCallMode::RECORD, { &aItem });
}
}
IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowColorHdl, ListBox&, void)
{
XColorItem aItem(makeSdrShadowColorItem(mpLBShadowColor->GetSelectEntryColor()));
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_SHADOW_COLOR, SfxCallMode::RECORD, &aItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_SHADOW_COLOR,
+ SfxCallMode::RECORD, { &aItem });
}
IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransMetricHdl, Edit&, void)
@@ -169,7 +172,8 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransMetricHdl, Edit&, vo
sal_uInt16 nVal = mpShadowTransMetric->GetValue();
SetTransparencyValue(nVal);
SdrPercentItem aItem( makeSdrShadowTransparenceItem(nVal) );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_SHADOW_TRANSPARENCE, SfxCallMode::RECORD, &aItem , 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_SHADOW_TRANSPARENCE,
+ SfxCallMode::RECORD, { &aItem });
}
IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*, void)
@@ -177,7 +181,8 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*,
sal_uInt16 nVal = mpShadowTransSlider->GetThumbPos();
SetTransparencyValue(nVal);
SdrPercentItem aItem( makeSdrShadowTransparenceItem(nVal) );
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_SHADOW_TRANSPARENCE, SfxCallMode::RECORD, &aItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_SHADOW_TRANSPARENCE,
+ SfxCallMode::RECORD, { &aItem });
}
IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowDistanceHdl, Edit&, void)
@@ -197,8 +202,10 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowDistanceHdl, Edit&, void)
}
SdrMetricItem aXItem(makeSdrShadowXDistItem(nX));
SdrMetricItem aYItem(makeSdrShadowYDistItem(nY));
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_SHADOW_XDISTANCE, SfxCallMode::RECORD, &aXItem, 0L);
- GetBindings()->GetDispatcher()->Execute(SID_ATTR_SHADOW_YDISTANCE, SfxCallMode::RECORD, &aYItem, 0L);
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_SHADOW_XDISTANCE,
+ SfxCallMode::RECORD, { &aXItem });
+ GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_SHADOW_YDISTANCE,
+ SfxCallMode::RECORD, { &aYItem });
}
void ShadowPropertyPanel::UpdateControls()
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index b52b194622a4..fc615541ec00 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -317,7 +317,8 @@ IMPL_LINK_TYPED(TextCharacterSpacingControl, VSSelHdl, ValueSet*, pControl, void
nVal = LogicToLogic(30, MAP_POINT, (MapUnit)eUnit);
nKern = (short)maEditKerning->Denormalize(nVal);
SvxKerningItem aKernItem(-nKern, SID_ATTR_CHAR_KERNING);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
+ mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_CHAR_KERNING,
+ SfxCallMode::RECORD, { &aKernItem });
mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
}
else if(iPos == 2)
@@ -325,13 +326,15 @@ IMPL_LINK_TYPED(TextCharacterSpacingControl, VSSelHdl, ValueSet*, pControl, void
nVal = LogicToLogic(15, MAP_POINT, (MapUnit)eUnit);
nKern = (short)maEditKerning->Denormalize(nVal);
SvxKerningItem aKernItem(-nKern, SID_ATTR_CHAR_KERNING);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
+ mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_CHAR_KERNING,
+ SfxCallMode::RECORD, { &aKernItem });
mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
}
else if(iPos == 3)
{
SvxKerningItem aKernItem(0, SID_ATTR_CHAR_KERNING);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
+ mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_CHAR_KERNING,
+ SfxCallMode::RECORD, { &aKernItem });
mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
}
else if(iPos == 4)
@@ -339,7 +342,8 @@ IMPL_LINK_TYPED(TextCharacterSpacingControl, VSSelHdl, ValueSet*, pControl, void
nVal = LogicToLogic(30, MAP_POINT, (MapUnit)eUnit);
nKern = (short)maEditKerning->Denormalize(nVal);
SvxKerningItem aKernItem(nKern, SID_ATTR_CHAR_KERNING);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
+ mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_CHAR_KERNING,
+ SfxCallMode::RECORD, { &aKernItem });
mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
}
else if(iPos == 5)
@@ -347,7 +351,8 @@ IMPL_LINK_TYPED(TextCharacterSpacingControl, VSSelHdl, ValueSet*, pControl, void
nVal = LogicToLogic(60, MAP_POINT, (MapUnit)eUnit);
nKern = (short)maEditKerning->Denormalize(nVal);
SvxKerningItem aKernItem(nKern, SID_ATTR_CHAR_KERNING);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
+ mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_CHAR_KERNING,
+ SfxCallMode::RECORD, { &aKernItem });
mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
}
else if(iPos == 6)
@@ -358,7 +363,8 @@ IMPL_LINK_TYPED(TextCharacterSpacingControl, VSSelHdl, ValueSet*, pControl, void
nVal = LogicToLogic(mnCustomKern, MAP_POINT, (MapUnit)eUnit);
nKern = (short)maEditKerning->Denormalize(nVal);
SvxKerningItem aKernItem(nKern , SID_ATTR_CHAR_KERNING);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
+ mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_CHAR_KERNING,
+ SfxCallMode::RECORD, { &aKernItem });
mnLastCus = SPACING_CLOSE_BY_CLICK_ICON;
}
else
@@ -449,7 +455,8 @@ IMPL_LINK_NOARG_TYPED(TextCharacterSpacingControl, KerningModifyHdl, Edit&, void
mnCustomKern = 0;
}
SvxKerningItem aKernItem(nKern, SID_ATTR_CHAR_KERNING);
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_KERNING, SfxCallMode::RECORD, &aKernItem, 0L);
+ mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_CHAR_KERNING,
+ SfxCallMode::RECORD, { &aKernItem });
}
}} // end of namespace sidebar
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index f9eb44651164..773103cb87ab 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -221,7 +221,8 @@ IMPL_LINK_TYPED(TextUnderlineControl, VSSelectHdl, ValueSet*, pControl, void)
SvxUnderlineItem aLineItem(eUnderline, SID_ATTR_CHAR_UNDERLINE);
aLineItem.SetColor(mrTextPropertyPanel.GetUnderlineColor());
- mpBindings->GetDispatcher()->Execute(SID_ATTR_CHAR_UNDERLINE, SfxCallMode::RECORD, &aLineItem, 0L);
+ mpBindings->GetDispatcher()->ExecuteList(SID_ATTR_CHAR_UNDERLINE,
+ SfxCallMode::RECORD, { &aLineItem });
mrTextPropertyPanel.EndUnderlinePopupMode();
}
}
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index f29dacf195e1..3832b9e279e3 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -333,8 +333,8 @@ void SvxColorDockingWindow::SetSize()
bool SvxColorDockingWindow::Close()
{
SfxBoolItem aItem( SID_COLOR_CONTROL, false );
- GetBindings().GetDispatcher()->Execute(
- SID_COLOR_CONTROL, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, &aItem, 0L );
+ GetBindings().GetDispatcher()->ExecuteList(SID_COLOR_CONTROL,
+ SfxCallMode::ASYNCHRON | SfxCallMode::RECORD, { &aItem });
SfxDockingWindow::Close();
return true;
}
@@ -353,7 +353,8 @@ IMPL_LINK_NOARG_TYPED(SvxColorDockingWindow, SelectHdl, ValueSet*, void)
if ( nPos == 1 ) // unsichtbar
{
XFillStyleItem aXFillStyleItem( drawing::FillStyle_NONE );
- pDispatcher->Execute( nLeftSlot, SfxCallMode::RECORD, &aXFillStyleItem, 0L );
+ pDispatcher->ExecuteList(nLeftSlot, SfxCallMode::RECORD,
+ { &aXFillStyleItem });
}
else
{
@@ -368,8 +369,8 @@ IMPL_LINK_NOARG_TYPED(SvxColorDockingWindow, SelectHdl, ValueSet*, void)
if ( pView && pView->IsTextEdit() )
{
SvxColorItem aTextColorItem( aColor, SID_ATTR_CHAR_COLOR );
- pDispatcher->Execute(
- SID_ATTR_CHAR_COLOR, SfxCallMode::RECORD, &aTextColorItem, 0L );
+ pDispatcher->ExecuteList(SID_ATTR_CHAR_COLOR,
+ SfxCallMode::RECORD, { &aTextColorItem });
bDone = true;
}
}
@@ -377,15 +378,16 @@ IMPL_LINK_NOARG_TYPED(SvxColorDockingWindow, SelectHdl, ValueSet*, void)
{
XFillStyleItem aXFillStyleItem( drawing::FillStyle_SOLID );
XFillColorItem aXFillColorItem( aStr, aColor );
- pDispatcher->Execute(
- nLeftSlot, SfxCallMode::RECORD, &aXFillColorItem, &aXFillStyleItem, 0L );
+ pDispatcher->ExecuteList(nLeftSlot, SfxCallMode::RECORD,
+ { &aXFillColorItem, &aXFillStyleItem });
}
}
}
else if ( nPos != 1 ) // unsichtbar
{
SvxColorItem aLeftColorItem( aColor, nLeftSlot );
- pDispatcher->Execute( nLeftSlot, SfxCallMode::RECORD, &aLeftColorItem, 0L );
+ pDispatcher->ExecuteList(nLeftSlot, SfxCallMode::RECORD,
+ { &aLeftColorItem });
}
}
else
@@ -395,7 +397,8 @@ IMPL_LINK_NOARG_TYPED(SvxColorDockingWindow, SelectHdl, ValueSet*, void)
if( nPos == 1 ) // unsichtbar
{
XLineStyleItem aXLineStyleItem( drawing::LineStyle_NONE );
- pDispatcher->Execute( nRightSlot, SfxCallMode::RECORD, &aXLineStyleItem, 0L );
+ pDispatcher->ExecuteList(nRightSlot, SfxCallMode::RECORD,
+ { &aXLineStyleItem });
}
else
{
@@ -415,20 +418,23 @@ IMPL_LINK_NOARG_TYPED(SvxColorDockingWindow, SelectHdl, ValueSet*, void)
if ( eXLS == drawing::LineStyle_NONE )
{
XLineStyleItem aXLineStyleItem( drawing::LineStyle_SOLID );
- pDispatcher->Execute( nRightSlot, SfxCallMode::RECORD, &aXLineStyleItem, 0L );
+ pDispatcher->ExecuteList(nRightSlot,
+ SfxCallMode::RECORD, { &aXLineStyleItem });
}
}
}
}
XLineColorItem aXLineColorItem( aStr, aColor );
- pDispatcher->Execute( nRightSlot, SfxCallMode::RECORD, &aXLineColorItem, 0L );
+ pDispatcher->ExecuteList(nRightSlot, SfxCallMode::RECORD,
+ { &aXLineColorItem });
}
}
else if ( nPos != 1 ) // unsichtbar
{
SvxColorItem aRightColorItem( aColor, nRightSlot );
- pDispatcher->Execute( nRightSlot, SfxCallMode::RECORD, &aRightColorItem, 0L );
+ pDispatcher->ExecuteList(nRightSlot, SfxCallMode::RECORD,
+ { &aRightColorItem });
}
}
}
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index c57eab708220..12224cb05d6a 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -607,8 +607,9 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void)
mpLbFillAttr->Disable();
// #i122676# need to call a single SID_ATTR_FILL_STYLE change
- SfxViewFrame::Current()->GetDispatcher()->Execute(
- SID_ATTR_FILL_STYLE, SfxCallMode::RECORD, &aXFillStyleItem, 0L);
+ SfxViewFrame::Current()->GetDispatcher()->ExecuteList(
+ SID_ATTR_FILL_STYLE, SfxCallMode::RECORD,
+ { &aXFillStyleItem });
break;
}
case drawing::FillStyle_SOLID:
@@ -620,8 +621,9 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void)
const XFillColorItem aXFillColorItem( aTmpStr, aColor );
// #i122676# change FillStyle and Color in one call
- SfxViewFrame::Current()->GetDispatcher()->Execute(
- SID_ATTR_FILL_COLOR, SfxCallMode::RECORD, &aXFillColorItem, &aXFillStyleItem, 0L);
+ SfxViewFrame::Current()->GetDispatcher()->ExecuteList(
+ SID_ATTR_FILL_COLOR, SfxCallMode::RECORD,
+ { &aXFillColorItem, &aXFillStyleItem });
break;
}
case drawing::FillStyle_GRADIENT:
@@ -651,8 +653,9 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void)
const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetEntry(mnLastPosGradient), aGradient);
// #i122676# change FillStyle and Gradient in one call
- SfxViewFrame::Current()->GetDispatcher()->Execute(
- SID_ATTR_FILL_GRADIENT, SfxCallMode::RECORD, &aXFillGradientItem, &aXFillStyleItem, 0L);
+ SfxViewFrame::Current()->GetDispatcher()->ExecuteList(
+ SID_ATTR_FILL_GRADIENT, SfxCallMode::RECORD,
+ { &aXFillGradientItem, &aXFillStyleItem });
mpLbFillAttr->SelectEntryPos(mnLastPosGradient);
}
}
@@ -690,8 +693,9 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void)
const XFillHatchItem aXFillHatchItem(mpLbFillAttr->GetSelectEntry(), aHatch);
// #i122676# change FillStyle and Hatch in one call
- SfxViewFrame::Current()->GetDispatcher()->Execute(
- SID_ATTR_FILL_HATCH, SfxCallMode::RECORD, &aXFillHatchItem, &aXFillStyleItem, 0L);
+ SfxViewFrame::Current()->GetDispatcher()->ExecuteList(
+ SID_ATTR_FILL_HATCH, SfxCallMode::RECORD,
+ { &aXFillHatchItem, &aXFillStyleItem });
mpLbFillAttr->SelectEntryPos(mnLastPosHatch);
}
}
@@ -729,8 +733,9 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void)
const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject());
// #i122676# change FillStyle and Bitmap in one call
- SfxViewFrame::Current()->GetDispatcher()->Execute(
- SID_ATTR_FILL_BITMAP, SfxCallMode::RECORD, &aXFillBitmapItem, &aXFillStyleItem, 0L);
+ SfxViewFrame::Current()->GetDispatcher()->ExecuteList(
+ SID_ATTR_FILL_BITMAP, SfxCallMode::RECORD,
+ { &aXFillBitmapItem, &aXFillStyleItem });
mpLbFillAttr->SelectEntryPos(mnLastPosBitmap);
}
}
@@ -769,7 +774,9 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void)
if(bFillStyleChange)
{
// #i122676# Single FillStyle change call needed here
- SfxViewFrame::Current()->GetDispatcher()->Execute(SID_ATTR_FILL_STYLE, SfxCallMode::RECORD, &aXFillStyleItem, 0L);
+ SfxViewFrame::Current()->GetDispatcher()->ExecuteList(
+ SID_ATTR_FILL_STYLE, SfxCallMode::RECORD,
+ { &aXFillStyleItem });
}
break;
}
@@ -791,10 +798,12 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void)
const XGradient aGradient = aItem.GetGradientList()->GetGradient(nPos)->GetGradient();
const XFillGradientItem aXFillGradientItem(mpLbFillAttr->GetSelectEntry(), aGradient);
- // #i122676# Change FillStale and Gradinet in one call
- SfxViewFrame::Current()->GetDispatcher()->Execute(
- SID_ATTR_FILL_GRADIENT, SfxCallMode::RECORD, &aXFillGradientItem,
- bFillStyleChange ? &aXFillStyleItem : nullptr, 0L);
+ // #i122676# Change FillStyle and Gradinet in one call
+ SfxViewFrame::Current()->GetDispatcher()->ExecuteList(
+ SID_ATTR_FILL_GRADIENT, SfxCallMode::RECORD,
+ (bFillStyleChange)
+ ? std::initializer_list<SfxPoolItem const*>({ &aXFillGradientItem, &aXFillStyleItem })
+ : std::initializer_list<SfxPoolItem const*>({ &aXFillGradientItem }));
}
}
@@ -822,10 +831,12 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void)
const XHatch aHatch = aItem.GetHatchList()->GetHatch(nPos)->GetHatch();
const XFillHatchItem aXFillHatchItem( mpLbFillAttr->GetSelectEntry(), aHatch);
- // #i122676# Change FillStale and Hatch in one call
- SfxViewFrame::Current()->GetDispatcher()->Execute(
- SID_ATTR_FILL_HATCH, SfxCallMode::RECORD, &aXFillHatchItem,
- bFillStyleChange ? &aXFillStyleItem : nullptr, 0L);
+ // #i122676# Change FillStyle and Hatch in one call
+ SfxViewFrame::Current()->GetDispatcher()->ExecuteList(
+ SID_ATTR_FILL_HATCH, SfxCallMode::RECORD,
+ (bFillStyleChange)
+ ? std::initializer_list<SfxPoolItem const*>({ &aXFillHatchItem, &aXFillStyleItem })
+ : std::initializer_list<SfxPoolItem const*>({ &aXFillHatchItem }));
}
}
@@ -853,10 +864,12 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void)
const XBitmapEntry* pXBitmapEntry = aItem.GetBitmapList()->GetBitmap(nPos);
const XFillBitmapItem aXFillBitmapItem(mpLbFillAttr->GetSelectEntry(), pXBitmapEntry->GetGraphicObject());
- // #i122676# Change FillStale and Bitmap in one call
- SfxViewFrame::Current()->GetDispatcher()->Execute(
- SID_ATTR_FILL_BITMAP, SfxCallMode::RECORD, &aXFillBitmapItem,
- bFillStyleChange ? &aXFillStyleItem : nullptr, 0L);
+ // #i122676# Change FillStyle and Bitmap in one call
+ SfxViewFrame::Current()->GetDispatcher()->ExecuteList(
+ SID_ATTR_FILL_BITMAP, SfxCallMode::RECORD,
+ (bFillStyleChange)
+ ? std::initializer_list<SfxPoolItem const*>({ &aXFillBitmapItem, &aXFillStyleItem })
+ : std::initializer_list<SfxPoolItem const*>({ &aXFillBitmapItem }));
}
}