diff options
| -rw-r--r-- | officecfg/util/alllang.xsl | 2 | ||||
| -rw-r--r-- | scripting/source/pyprov/officehelper.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl index a2cc1a025b..53f488066e 100644 --- a/officecfg/util/alllang.xsl +++ b/officecfg/util/alllang.xsl @@ -38,7 +38,7 @@ exclude-result-prefixes="install"> <!-- Get the correct format --> -<xsl:output method="xml" indent="yes" /> +<xsl:output method="xml" indent="yes" encoding="UTF-8"/> <!--************************** PARAMETER ******************************** --> <xsl:param name="locale"/> diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py index 7119169741..5e6bd1cd94 100644 --- a/scripting/source/pyprov/officehelper.py +++ b/scripting/source/pyprov/officehelper.py @@ -54,7 +54,11 @@ def bootstrap(): """ try: # soffice script used on *ix, Mac; soffice.exe used on Windoof - sOffice = os.path.join(os.path.dirname(__file__), "soffice") + if "UNO_PATH" in os.environ: + sOffice = os.environ["UNO_PATH"] + else: + sOffice = "" # lets hope for the best + sOffice = os.path.join(sOffice, "soffice") if platform.startswith("win"): sOffice += ".exe" |