framework/source/services/dispatchhelper.cxx | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-)
New commits: commit 81e9703cf8f891bfb36f52eb24e0e18ca13d373a Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> AuthorDate: Fri Mar 1 08:37:45 2019 +0100 Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> CommitDate: Fri Mar 1 10:12:15 2019 +0100 Use lambda instead of std::bind + wrapper function Change-Id: I52ef7c61d615120b172268b78827affa9b5f8f96 Reviewed-on: https://gerrit.libreoffice.org/68532 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> diff --git a/framework/source/services/dispatchhelper.cxx b/framework/source/services/dispatchhelper.cxx index 53a55d873249..55d827668586 100644 --- a/framework/source/services/dispatchhelper.cxx +++ b/framework/source/services/dispatchhelper.cxx @@ -49,19 +49,6 @@ DispatchHelper::DispatchHelper( const css::uno::Reference< css::uno::XComponentC { } -/** - * Proxy around DispatchHelper::executeDispatch(), as - * vcl::solarthread::syncExecute() does not seem to accept lambdas. - */ -static css::uno::Any -executeDispatchStatic(DispatchHelper* pThis, - const css::uno::Reference<css::frame::XDispatch>& xDispatch, - const css::util::URL& aURL, bool SyncronFlag, - const css::uno::Sequence<css::beans::PropertyValue>& lArguments) -{ - return pThis->executeDispatch(xDispatch, aURL, SyncronFlag, lArguments); -} - /** dtor. */ DispatchHelper::~DispatchHelper() @@ -122,8 +109,9 @@ css::uno::Any SAL_CALL DispatchHelper::executeDispatch( bool bOnMainThread = aDescriptor.getUnpackedValueOrDefault("OnMainThread", false); if (bOnMainThread) - return vcl::solarthread::syncExecute( - std::bind(&executeDispatchStatic, this, xDispatch, aURL, true, lArguments)); + return vcl::solarthread::syncExecute([this, &xDispatch, &aURL, &lArguments]() { + return executeDispatch(xDispatch, aURL, true, lArguments); + }); else return executeDispatch(xDispatch, aURL, true, lArguments); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits