mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.

Browse Source
This commit is contained in:
Stephan Bergmann
2011-10-21 17:18:13 +02:00
parent 3535ceeac6
commit b786a33cfd
65 changed files with 175 additions and 627 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripting/source/provider/URIHelper.cxx
View File

@@ -46,8 +46,7 @@ namespace uri = ::com::sun::star::uri;
namespace script = ::com::sun::star::script;
static const char SHARE[] = "share";
static const char SHARE_URI[] =
"vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::BaseInstallation}";
static const char SHARE_URI[] = "vnd.sun.star.expand:$BRAND_BASE_DIR";
static const char SHARE_UNO_PACKAGES[] = "share:uno_packages";
static const char SHARE_UNO_PACKAGES_URI[] =

2
scripting/source/pyprov/pythonscript.py
View File

@@ -143,7 +143,7 @@ class MyUriHelper:
def __init__( self, ctx, location ):
self.s_UriMap = \
{ "share" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + toIniName( "bootstrap") + "::BaseInstallation}/share/Scripts/python" , \
{ "share" : "vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python" , \
"share:uno_packages" : "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages", \
"user" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + toIniName( "bootstrap") + "::UserInstallation}/user/Scripts/python" , \
"user:uno_packages" : "vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages" }