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 /sw/source/uibase/dochdl | |
| 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 'sw/source/uibase/dochdl')
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 0728ad75f079..6c1be51f9bb6 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -2553,9 +2553,9 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData, if( ::avmedia::MediaWindow::isMediaURL( aMediaURLStr, ""/*TODO?*/ ) ) { const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, aMediaURLStr ); - rSh.GetView().GetViewFrame()->GetDispatcher()->Execute( + rSh.GetView().GetViewFrame()->GetDispatcher()->ExecuteList( SID_INSERT_AVMEDIA, SfxCallMode::SYNCHRON, - &aMediaURLItem, 0L ); + { &aMediaURLItem }); } #else if (false) @@ -2694,11 +2694,12 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData, rView.StopShellTimer(); SfxStringItem aDataDesc( nWh, sText ); - rView.GetViewFrame()->GetDispatcher()->Execute( - nWh, SfxCallMode::ASYNCHRON, &aDataDesc, - pConnectionItem.get(), pColumnItem.get(), - pSourceItem.get(), pCommandItem.get(), pCommandTypeItem.get(), - pColumnNameItem.get(), pSelectionItem.get(), pCursorItem.get(), 0L); + rView.GetViewFrame()->GetDispatcher()->ExecuteList( + nWh, SfxCallMode::ASYNCHRON, + { &aDataDesc, pConnectionItem.get(), pColumnItem.get(), + pSourceItem.get(), pCommandItem.get(), pCommandTypeItem.get(), + pColumnNameItem.get(), pSelectionItem.get(), + pCursorItem.get() }); } else { |