diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-11 12:57:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-11 12:57:12 +0000 |
| commit | 5cfe5254ba19e3a48abc79868f175f43e1390434 (patch) | |
| tree | 4af6dfc2cde5c9dfcac4de8dcfcb63f389410b21 /scripting | |
| parent | 9ae05952b0d5ecbbdcd7159274d90ae81cf51dfc (diff) | |
CWS-TOOLING: integrate CWS sb101
2008-12-08 16:52:06 +0100 sb r265009 : #i95330# python23.dll needs to be copied to brand layer, not just moved there
2008-11-24 18:15:54 +0100 sb r264259 : #i95022# tools::extendApplicationEnvironment gets URE_BOOTSTRAP value from outside bootstrap.cxx, so needs to operate in LOOKUP_MODE_URE_BOOTSTRAP, too
2008-11-20 21:12:31 +0100 jbu r264103 : deactivated debug log
2008-11-20 21:09:03 +0100 jbu r264102 : #i95331# ld_library_path now contains ure/lib directory
2008-11-20 21:05:37 +0100 jbu r264101 : #i95330# python.dll is now installed in the brand-program directory (unix remains unchanged)
2008-11-20 20:46:57 +0100 jbu r264099 : #i95118# + #i93994# Python scripts in share and user uno packages now work again
2008-11-20 20:38:23 +0100 jbu r264098 : #i95037# python wrapper now waits for completion of python executable and currectly returns the exit state
2008-11-20 10:46:28 +0100 sb r264034 : #i95028# import socket, since on Windows sal3.dll no longer calls WSAStartup (and import socket does)
2008-11-18 17:01:09 +0100 sb r263784 : #i96314# fixed encode()
2008-11-18 15:59:17 +0100 sb r263779 : #i95024# missing vnd.sun.star.pathname: in URE_BOOTSTRAP
2008-11-18 13:51:36 +0100 sb r263765 : #i95022# treat \ and $ verbatim in URE_BOOTSTRAP=vnd.sun.star.pathname values
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/provider/URIHelper.cxx | 9 | ||||
| -rw-r--r-- | scripting/source/pyprov/pythonscript.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index d155d0d70d9b..3fcad686ac59 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -52,12 +52,12 @@ static const char SHARE_URI[] = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::BaseInstallation}"; static const char SHARE_UNO_PACKAGES[] = "share:uno_packages"; -static const char SHARE_UNO_PACKAGES_DIR[] = - "/share/uno_packages/cache"; +static const char SHARE_UNO_PACKAGES_URI[] = + "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE"; static const char USER[] = "user"; static const char USER_URI[] = - "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") ":::UserInstallation}"; + "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; static const char USER_UNO_PACKAGES[] = "user:uno_packages"; static const char USER_UNO_PACKAGES_DIR[] = @@ -164,8 +164,7 @@ ScriptingFrameworkURIHelper::initBaseURI() else if (m_sLocation.equalsAscii(SHARE_UNO_PACKAGES)) { test = OUString::createFromAscii("uno_packages"); - uri = OUString::createFromAscii(SHARE_URI); - uri = uri.concat(OUString::createFromAscii(SHARE_UNO_PACKAGES_DIR)); + uri = OUString::createFromAscii(SHARE_UNO_PACKAGES_URI); } else if (m_sLocation.indexOf(OUString::createFromAscii(TDOC_SCHEME)) == 0) { diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index bcc6f6c85541..9580f2ca9beb 100644 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -662,6 +662,8 @@ def expandUri( uri ): uri = uri.replace( "vnd.sun.star.expand:", "",1) uri = uno.getComponentContext().getByName( "/singletons/com.sun.star.util.theMacroExpander" ).expandMacros( uri ) + if uri.startswith( "file:" ): + uri = uno.absolutize("",uri) # necessary to get rid of .. in uri return uri #-------------------------------------------------------------- |