From 6379b5ff46e2ca8fdaa7785298486118d775454b Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Tue, 15 Sep 2026 11:07:07 +0200 Subject: [PATCH] Following 02083e4a5d52e954368c89cb92dc8d4bc165e1e4 Try to fix in WASM Jenkins: In file included from /home/tdf/jenkins/workspace/lo_gerrit/tb/src_wasm/vcl/source/app/salplug.cxx:78: /home/tdf/jenkins/workspace/lo_gerrit/tb/src_wasm/vcl/inc/headless/svpinst.hxx:100:36: error: non-virtual member function marked 'override' hides virtual member function 100 | bool DoExecute(int &nExitCode) override; | ^ /home/tdf/jenkins/workspace/lo_gerrit/tb/src_wasm/vcl/inc/salinst.hxx:237:18: note: hidden overloaded virtual function 'SalInstance::DoExecute' declared here: different number of parameters (0 vs 1) 237 | virtual bool DoExecute(); | ^ 1 error generated. make[1]: *** [/home/tdf/jenkins/workspace/lo_gerrit/tb/src_wasm/solenv/gbuild/LinkTarget.mk:338: /home/tdf/lode/jenkins/workspace/lo_gerrit/tb/build_master/workdir/CxxObject/vcl/source/app/salplug.o] Error 1 make[1]: *** Waiting for unfinished jobs.... In file included from /home/tdf/jenkins/workspace/lo_gerrit/tb/src_wasm/vcl/headless/svpprn.cxx:33: Change-Id: Id1ae3ae246fb86516ee6b9b383a3ee23180bc277 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210987 Reviewed-by: Julien Nabet Tested-by: Julien Nabet --- vcl/headless/svpinst.cxx | 2 +- vcl/inc/headless/svpinst.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 33f2ba9f825b..04b0c7fbab77 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -305,7 +305,7 @@ static void loop(void * arg) { static_cast(arg)->ImplYield(comphelper::LibreOfficeKit::isActive(), false); } -bool SvpSalInstance::DoExecute(int &) { +bool SvpSalInstance::DoExecute() { assert(Application::IsUseSystemEventLoop()); // emscripten_set_main_loop will unwind the stack by throwing a JavaScript exception, so we need // to manually undo the call of AcquireYieldMutex() done in InitVCL: diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index 5c5784b81b56..4d64ec3a4f64 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -97,7 +97,7 @@ class VCL_DLLPUBLIC SvpSalInstance : public SalGenericInstance, public SalUserEv virtual void ProcessEvent( SalUserEvent aEvent ) override; #if defined __EMSCRIPTEN__ - bool DoExecute(int &nExitCode) override; + bool DoExecute() override; void DoQuit() override; #endif