desktop/source/deployment/misc/dp_misc.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit f1ab3ac05511f64696deb236c071a599f7452899
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Wed Feb 5 13:12:10 2025 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Wed Feb 5 15:41:41 2025 +0100
For Emscripten, always assume we run inside soffice
...and not in some unopkg process. The checks done here would not work for
Emscripten, where osl_getExecutableFile returns some generic
"./this.program",
and where we don't set up the office pipe.
Change-Id: Iac3fead3eaa0ac9cfc9dbcf3c01cd9f12df5548b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181161
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index 79a8f2a58787..b08b40c0f91e 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -75,6 +75,8 @@ std::shared_ptr<rtl::Bootstrap> & UnoRc()
return theRc;
};
+#if !defined EMSCRIPTEN
+
OUString generateOfficePipeId()
{
OUString userPath;
@@ -123,6 +125,8 @@ bool existsOfficePipe()
return pipe.is();
}
+#endif
+
//get modification time
bool getModifyTimeTargetFile(const OUString &rFileURL, TimeValue &rTime)
{
@@ -330,6 +334,9 @@ OUString expandUnoRcUrl( OUString const & url )
bool office_is_running()
{
+#if defined EMSCRIPTEN
+ return true;
+#else
//We need to check if we run within the office process. Then we must not
use the pipe, because
//this could cause a deadlock. This is actually a workaround for i82778
OUString sFile;
@@ -368,6 +375,7 @@ bool office_is_running()
ret = existsOfficePipe();
}
return ret;
+#endif
}
