diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-02-05 16:21:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-02-05 16:21:32 +0000 |
| commit | 3df424b1aeae9aa00929894eaf9564250e4e6d90 (patch) | |
| tree | 98788d5c88f93f32f9f9c2c89767176d52c9e879 | |
| parent | 11ee53702ae1132eaff2631dcdff995bdd288b9d (diff) | |
CWS-TOOLING: integrate CWS sb103_OOO310
2009-01-15 15:28:08 +0100 sb r266375 : #i97629# set UNO_PATH in python start program and use it in bootstrap function in officehelper.py (and do not erroneously encode a vnd.sun.star.pathname URE_BOOTSTRAP value in tools::extendApplicationEnvironment)
2009-01-15 10:40:17 +0100 sb r266338 : #i97424# explicit shut down of ImplImageTree singleton in DeInitVCL still required
2009-01-14 12:07:15 +0100 sb r266276 : CWS-TOOLING: rebase CWS sb103 to trunk@265758 (milestone: DEV300:m38)
2009-01-14 08:53:02 +0100 sb r266266 : #i96284# remove implementation of unused (but expensive) link feature; plus some general cleanup
2009-01-08 14:42:59 +0100 sb r266010 : #i96683# enable dlclose for GCC 3 (based on a patch by cmc)
2009-01-06 14:18:23 +0100 sb r265920 : #i97424# spurious unreferenced local variables
2008-12-19 15:33:39 +0100 sb r265727 : #i57359# no need for a special glibc 2.2.4 based libgcc_s.so.1 for URE any more as the general one used for OOo is guaranteed to be based on at least glibc 2.2.4, anyway
2008-12-19 13:54:37 +0100 sb r265724 : #i97424# clean up and speed up vcl ImplImageTree
2008-12-18 14:28:10 +0100 sb r265690 : #i97132# spread usage of the rtl::Static pattern (patch by cmc)
2008-12-15 14:33:00 +0100 sb r265499 : #i90492# generate UTF-8 encoded output (patch by tora)
2008-12-15 11:45:05 +0100 sb r265469 : #i95593# -Djava.library.path to find libtest_javauno_any.so
2008-12-15 11:23:14 +0100 sb r265468 : #i93769# it appears that Java nowadays expects file URIs in UTF-8, so ExternalUriReferenceTranslator.toExternal must not be called
2008-12-10 12:02:50 +0100 sb r265164 : #i93219# use (corrected) signal handling instead of forking again (to avoid unintended generation of core files)
| -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" |