diff --git a/offapi/org/libreoffice/embindtest/XTest.idl b/offapi/org/libreoffice/embindtest/XTest.idl index 276ce260a8e1..e579a606202a 100644 --- a/offapi/org/libreoffice/embindtest/XTest.idl +++ b/offapi/org/libreoffice/embindtest/XTest.idl @@ -129,7 +129,7 @@ interface XTest { [out] XTest value18); void throwRuntimeException(); void passJob([in] com::sun::star::task::XJob object); - void passJobExecutor([in] com::sun::star::task::XJobExecutor object); + void passJobExecutor([in] com::sun::star::task::XJobExecutor object, [in] boolean newThread); void passInterface([in] com::sun::star::uno::XInterface object); boolean checkAttributes([in] org::libreoffice::embindtest::XAttributes object); [attribute] string StringAttribute; diff --git a/unotest/source/embindtest/embindtest.cxx b/unotest/source/embindtest/embindtest.cxx index 60150dcd2ad9..4a335f6f6be3 100644 --- a/unotest/source/embindtest/embindtest.cxx +++ b/unotest/source/embindtest/embindtest.cxx @@ -67,6 +67,21 @@ private: } }; +class JobExecutorThread : public salhelper::Thread +{ +public: + JobExecutorThread(css::uno::Reference const& object) + : Thread("jobexecutor") + , object_(object) + { + } + +private: + void execute() override { object_->trigger(u"executor thread"_ustr); } + + css::uno::Reference object_; +}; + class Test : public cppu::WeakImplHelper { sal_Bool SAL_CALL getBoolean() override { return true; } @@ -861,10 +876,19 @@ class Test : public cppu::WeakImplHelper } } - void SAL_CALL - passJobExecutor(css::uno::Reference const& object) override + void SAL_CALL passJobExecutor(css::uno::Reference const& object, + sal_Bool newThread) override { - object->trigger(u"executor"_ustr); + if (newThread) + { + JobExecutorThread t(object); + t.launch(); + t.join(); + } + else + { + object->trigger(u"executor"_ustr); + } } void SAL_CALL passInterface(css::uno::Reference const& object) override diff --git a/unotest/source/embindtest/embindtest.js b/unotest/source/embindtest/embindtest.js index 9551a9a56bca..082150ff6605 100644 --- a/unotest/source/embindtest/embindtest.js +++ b/unotest/source/embindtest/embindtest.js @@ -878,7 +878,8 @@ Module.uno_init.then(function() { s.delete(); } test.passJob(css.task.XJob.query(obj)); - test.passJobExecutor(css.task.XJobExecutor.query(obj)); + test.passJobExecutor(css.task.XJobExecutor.query(obj), false); + //TODO: test.passJobExecutor(css.task.XJobExecutor.query(obj), true); test.passInterface(obj); css.task.XJobExecutor.query(obj).trigger('from JS'); {