summaryrefslogtreecommitdiff
path: root/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
diff options
context:
space:
mode:
Diffstat (limited to 'extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff')
-rw-r--r--extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff8
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
index e86548136..3317b3ca5 100644
--- a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
+++ b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
@@ -17,9 +17,9 @@ index f93ac5e..92a2891 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
+ # except in compliance with the License. You may obtain a copy of
+ # the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
- #*************************************************************************
+import os
import sys
@@ -33,12 +33,12 @@ diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/o
index 610ac5f..df243d0 100755
--- a/scripting/source/pyprov/officehelper.py
+++ b/scripting/source/pyprov/officehelper.py
-@@ -53,7 +53,7 @@ def bootstrap():
+@@ -44,7 +44,7 @@ def bootstrap():
if "UNO_PATH" in os.environ:
sOffice = os.environ["UNO_PATH"]
else:
- sOffice = "" # lets hope for the best
+ sOffice = "/usr/lib/libreoffice/program"
sOffice = os.path.join(sOffice, "soffice")
- if platform.startswith("win"):
+ if platform.startswith("win"):
sOffice += ".exe"