diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-03-30 17:55:05 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-03-31 11:19:23 +0000 |
| commit | 51d7f466df85f679f54e4e690f8b5e602192eb7b (patch) | |
| tree | 94a72abb002879ef4dca830ad652415521b8bdd5 /svx/source/form | |
| parent | 7a2d55a1943e51895d808e87f1766b44761a495a (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/source/form')
| -rw-r--r-- | svx/source/form/fmshell.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
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; } } |