Undo basis/brand split: moved ini files from basis program/ to brand program/.

Moved uno ini, folded fundamentalbasis ini into fundamental ini, merged
version inis.

4 files changed, 3 insertions, 16 deletions

diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 468be3e9d86c..09821ab438f8 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -116,7 +116,7 @@ namespace
 
 static inline rtl::OUString getBuildId()
 {
-    rtl::OUString aPathVal(UNISTRING("${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"));
+    rtl::OUString aPathVal(UNISTRING("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"));
     rtl::Bootstrap::expandMacros(aPathVal);
     return aPathVal;
 }
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index b25854fc64a1..7ee3aa4e8d71 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -895,7 +895,7 @@ void UpdateHandler::setFullVersion( rtl::OUString& rString )
     sal_Int32 nVerIndex = rString.indexOf( aProductVersion );
     if ( nVerIndex != -1 )
     {
-        rtl::OUString aPackageVersion = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":OOOPackageVersion}" );
+        rtl::OUString aPackageVersion = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":OOOPackageVersion}" );
         rtl::Bootstrap::expandMacros( aPackageVersion );
 
         if ( aPackageVersion.getLength() )
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index a304ee3bcb7a..f20cda865ce0 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -64,7 +64,7 @@ getBootstrapData(
     ::rtl::OUString & rBuildID,
     ::rtl::OUString & rInstallSetID)
 {
-    rBuildID = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" );
+    rBuildID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" );
     rtl::Bootstrap::expandMacros( rBuildID );
     if ( ! rBuildID.getLength() )
         return false;
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 6f6ce112fea7..bb250baeea91 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -384,22 +384,9 @@ UpdateInformationProvider::UpdateInformationProvider(
     }
     rtl::OUString product(buf.makeStringAndClear());
 
-    rtl::OUString aBaseBuildId( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
-    rtl::Bootstrap::expandMacros( aBaseBuildId );
-
-    rtl::OUString aBrandBuildId( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
-    rtl::Bootstrap::expandMacros( aBrandBuildId );
-
     rtl::OUString aUserAgent( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ) );
     rtl::Bootstrap::expandMacros( aUserAgent );
 
-    if ( ! aBaseBuildId.equals( aBrandBuildId ) )
-    {
-        sal_Int32 nIndex = aUserAgent.indexOf( aBrandBuildId, 0 );
-        if ( nIndex != -1 )
-            aUserAgent = aUserAgent.replaceAt( nIndex, aBrandBuildId.getLength(), aBaseBuildId );
-    }
-
     for (sal_Int32 i = 0;;) {
         i = aUserAgent.indexOfAsciiL(
             RTL_CONSTASCII_STRINGPARAM("<PRODUCT>"), i);