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

3 files changed, 5 insertions, 16 deletions

diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index 91ab12e6f2c2..25659d4a9c53 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -145,19 +145,12 @@ bool extendEnvironment(boost::scoped_array< WCHAR > * environment) {
         //TODO: conversion errors
     if (len == 0 ||
         (tools::buildPath(
-            path, pathBegin, path + len - 1, MY_STRING(L"\\basis-link"))
+            path, pathBegin, path + len - 1, MY_STRING(L"\\ure-link"))
          == NULL))
     {
         return false;
     }
     WCHAR * pathEnd = tools::resolveLink(path);
-    if (pathEnd == NULL ||
-        (tools::buildPath(path, pathBegin, pathEnd, MY_STRING(L"\\ure-link")) ==
-         NULL))
-    {
-        return false;
-    }
-    pathEnd = tools::resolveLink(path);
     if (pathEnd == NULL) {
         return false;
     }
diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index d371627f067a..662a1c2a8818 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -303,19 +303,15 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
 
         // env string
         ::rtl::OUStringBuffer buf;
-        OUString aIniPath, aPluginPipeName;
+        OUString aPath, aPluginPipeName;
 
-        if(!Bootstrap::get(OUSTR("BRAND_BASE_DIR"), aIniPath))
+        if(!Bootstrap::get(OUSTR("BRAND_BASE_DIR"), aPath))
         {
             debug_fprintf(NSP_LOG_APPEND,"failed to get BRAND_BASE_DIR!\n");
             return Reference< lang::XMultiServiceFactory >(NULL);
         }
-        aIniPath += OUSTR("/program/");
-        aIniPath += OUSTR(SAL_CONFIGFILE("bootstrap"));
-        Bootstrap aVersionFile(aIniPath);
-        aVersionFile.getFrom(OUSTR("BaseInstallation"), aPluginPipeName,  OUString());
 
-        aPluginPipeName = ::rtl::OUString::valueOf( aPluginPipeName.hashCode() );
+        aPluginPipeName = ::rtl::OUString::valueOf( aPath.hashCode() );
 
         // accept string
         OSL_ASSERT( buf.getLength() == 0 );
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 09821ab438f8..7430a36ff35b 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -124,7 +124,7 @@ static inline rtl::OUString getBuildId()
 //------------------------------------------------------------------------------
 static inline rtl::OUString getBaseInstallation()
 {
-    rtl::OUString aPathVal(UNISTRING("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":BaseInstallation}"));
+    rtl::OUString aPathVal(UNISTRING("$BRAND_BASE_DIR"));
     rtl::Bootstrap::expandMacros(aPathVal);
     return aPathVal;
 }