[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - desktop/source
Tor Lillqvist
tml at collabora.com
Fri Sep 12 23:04:04 PDT 2014
desktop/source/deployment/misc/dp_misc.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit e635e1f113cc0a474f38ef2c59b9afe536bbcb40
Author: Tor Lillqvist <tml at collabora.com>
Date: Tue Feb 25 15:00:38 2014 +0200
The LO process is called just "soffice" on OS X
Change-Id: I74a6af7f4dc49ccf8ff3ead0d5b3e5e9b78b4f7a
(cherry picked from commit 1974b1601c0500e0db56f6cfd9db6bd25dcccfab)
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index b815be7..54096ac 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -63,7 +63,11 @@ using namespace ::com::sun::star::uno;
#define SWRITER "swriter.exe"
#endif
+#ifdef MACOSX
+#define SOFFICE2 "soffice"
+#else
#define SOFFICE2 "soffice.bin"
+#endif
namespace dp_misc {
namespace {
More information about the Libreoffice-commits
mailing list