[Libreoffice-commits] core.git: desktop/source

[Mike Kaganski (via logerrit)]

 desktop/source/deployment/misc/dp_misc.cxx |   31 +++++++++--------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

New commits:
commit 46364cca0ea2308c87bf5cdb291f7c67d79c7d2b
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Jan 23 12:17:10 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Jan 23 11:24:58 2020 +0100

    List more possible executable names returned by osl_getExecutableFile
    
    Change-Id: I2266b04ec0aabe60ba55a40b71aa7832bcf53bbf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87245
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index bf1c1ced465b..368735ccf1c2 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -55,22 +55,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-#if defined(_WIN32)
-#define SOFFICE1 "soffice.exe"
-#define SOFFICE_COM "soffice.com"
-#define SBASE "sbase.exe"
-#define SCALC "scalc.exe"
-#define SDRAW "sdraw.exe"
-#define SIMPRESS "simpress.exe"
-#define SWRITER "swriter.exe"
-#endif
-
-#ifdef MACOSX
-#define SOFFICE2 "soffice"
-#else
-#define SOFFICE2 "soffice.bin"
-#endif
-
 namespace dp_misc {
 namespace {
 
@@ -356,14 +340,19 @@ bool office_is_running()
     {
         sFile = sFile.copy(sFile.lastIndexOf('/') + 1);
         if (
-#if defined UNIX
-            sFile == SOFFICE2
-#elif defined _WIN32
+#if defined _WIN32
             //osl_getExecutableFile should deliver "soffice.bin" on windows
             //even if swriter.exe, scalc.exe etc. was started. This is a bug
             //in osl_getExecutableFile
-            sFile == SOFFICE1 || sFile == SOFFICE2 || sFile == SOFFICE_COM || sFile == SBASE ||
-            sFile == SCALC || sFile == SDRAW || sFile == SIMPRESS || sFile == SWRITER
+            sFile == "soffice.bin" || sFile == "soffice.exe" || sFile == "soffice.com"
+            || sFile == "soffice" || sFile == "swriter.exe" || sFile == "swriter"
+            || sFile == "scalc.exe" || sFile == "scalc" || sFile == "simpress.exe"
+            || sFile == "simpress" || sFile == "sdraw.exe" || sFile == "sdraw"
+            || sFile == "sbase.exe" || sFile == "sbase"
+#elif defined MACOSX
+            sFile == "soffice"
+#elif defined UNIX
+            sFile == "soffice.bin"
 #else
 #error "Unsupported platform"
 #endif