diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-03-01 08:37:45 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-03-01 10:12:15 +0100 |
commit | 81e9703cf8f891bfb36f52eb24e0e18ca13d373a (patch) | |
tree | 0aa529f4ad8ce16ccf8985e55754ffa2766e8d02 /framework | |
parent | b5c3f38cb8d4121e3303be362e0757d3d3431059 (diff) |
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.Mehrbrodt@cib.de>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/services/dispatchhelper.cxx | 18 |
1 files changed, 3 insertions, 15 deletions
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); } |