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

7 files changed, 8 insertions, 14 deletions

diff --git a/scripting/examples/beanshell/Highlight/ShowDialog.bsh b/scripting/examples/beanshell/Highlight/ShowDialog.bsh
index e632c8f212c0..c7c4ab49aefc 100755
--- a/scripting/examples/beanshell/Highlight/ShowDialog.bsh
+++ b/scripting/examples/beanshell/Highlight/ShowDialog.bsh
@@ -38,8 +38,7 @@ boolean tryLoadingLibrary( xmcf, context, name )
         }
 
         libURL = xme.expandMacros(
-                "${$BRAND_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
-                    "/share/basic/ScriptBindingLibrary/" +
+                "$BRAND_BASE_DIR/share/basic/ScriptBindingLibrary/" +
                     name.toLowerCase() + ".xlb/");
 
         System.err.println("libURL is: " + libURL);
diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java
index 53c98fdb177b..14a02e397270 100755
--- a/scripting/examples/java/Highlight/HighlightText.java
+++ b/scripting/examples/java/Highlight/HighlightText.java
@@ -203,8 +203,7 @@ public class HighlightText implements com.sun.star.awt.XActionListener {
             }
 
             String libURL = xme.expandMacros(
-                "${$BRAND_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
-                "/share/basic/ScriptBindingLibrary/" +
+                "$BRAND_BASE_DIR/share/basic/ScriptBindingLibrary/" +
                 name.toLowerCase() + ".xlb/");
 
             System.err.println("libURL is: " + libURL);
diff --git a/scripting/examples/javascript/Highlight/ShowDialog.js b/scripting/examples/javascript/Highlight/ShowDialog.js
index a6f9759d9a18..fa6838c14053 100755
--- a/scripting/examples/javascript/Highlight/ShowDialog.js
+++ b/scripting/examples/javascript/Highlight/ShowDialog.js
@@ -32,8 +32,7 @@ function tryLoadingLibrary( xmcf, context, name )
         }
 
         libURL = xme.expandMacros(
-                "${$BRAND_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
-                    "/share/basic/ScriptBindingLibrary/" +
+                "$BRAND_BASE_DIR/share/basic/ScriptBindingLibrary/" +
                     name.toLowerCase() + ".xlb/");
 
         System.err.println("libURL is: " + libURL);
diff --git a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index e7007972936b..1cf99d78292e 100755
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -134,9 +134,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
     // to be exposed at all
 
     private static final String SHARE =
-        "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +
-        PathUtils.BOOTSTRAP_NAME +
-        "::BaseInstallation}/share";
+        "vnd.sun.star.expand:$BRAND_BASE_DIR/share";
 
     private static final String USER =
         "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +
diff --git a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index e83410f3f35c..286d154ae521 100755
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -142,7 +142,7 @@ public abstract class ScriptProvider
                 new Type(XMacroExpander.class), serviceObj);
 
             XMLParserFactory.setOfficeDTDURL(me.expandMacros(
-                "${$BRAND_BASE_DIR/program/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/"));
+                "$BRAND_BASE_DIR/share/dtd/officedocument/1_0/"));
 
         }
         catch ( Exception e )
@@ -224,7 +224,7 @@ public abstract class ScriptProvider
 
                     if ( originalContextURL.startsWith( "share" ) )
                     {
-                        contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::BaseInstallation}/share";
+                        contextUrl = "vnd.sun.star.expand:$BRAND_BASE_DIR/share";
                         extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
                         extensionRepository = "shared";
                     }
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index d114ea963dcf..8957d5ed1df6 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -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[] =
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
index 4ebd196a17cb..6f9b542d5687 100755
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -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" }