Online update: Don't check for buildid at the user's end.

We want more freedom in what to offer to the user; at some stage we would like
to offer 3.6 to the users using 3.5 which would be harder with this buildid
check.

This makes the server side responsible for offering the correct version; but
that should be fine because all the versions that we are able to update must
be listed on the server: what is not listed is considered up-to-date.

3 files changed, 3 insertions, 15 deletions

diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx
index 84cbc4ff7fbe..bed67d374350 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -131,7 +131,6 @@ protected:
                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Linux" ) ),
                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "x86" ) ),
                     m_aRepositoryList,
-                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "100" ) ),
                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InstallSetID" ) ) ) )
         {
             CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index bc268e8cab6b..187a6658468f 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -59,14 +59,8 @@ namespace xml = css::xml ;
 static bool
 getBootstrapData(
     uno::Sequence< ::rtl::OUString > & rRepositoryList,
-    ::rtl::OUString & rBuildID,
     ::rtl::OUString & rInstallSetID)
 {
-    rBuildID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" );
-    rtl::Bootstrap::expandMacros( rBuildID );
-    if ( rBuildID.isEmpty() )
-        return false;
-
     rInstallSetID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}" );
     rtl::Bootstrap::expandMacros( rInstallSetID );
     if ( rInstallSetID.isEmpty() )
@@ -103,15 +97,14 @@ checkForUpdates(
     rtl::Bootstrap::get(UNISTRING("_ARCH"), myArch);
 
     uno::Sequence< ::rtl::OUString > aRepositoryList;
-    ::rtl::OUString aBuildID;
     ::rtl::OUString aInstallSetID;
 
-    if( ! ( getBootstrapData(aRepositoryList, aBuildID, aInstallSetID) && (aRepositoryList.getLength() > 0) ) )
+    if( ! ( getBootstrapData(aRepositoryList, aInstallSetID) && (aRepositoryList.getLength() > 0) ) )
         return false;
 
     return checkForUpdates( o_rUpdateInfo, rxContext, rxInteractionHandler, rUpdateInfoProvider,
             myOS, myArch,
-            aRepositoryList, aBuildID, aInstallSetID );
+            aRepositoryList, aInstallSetID );
 }
 
 bool
@@ -123,7 +116,6 @@ checkForUpdates(
     const rtl::OUString &rOS,
     const rtl::OUString &rArch,
     const uno::Sequence< rtl::OUString > &rRepositoryList,
-    const rtl::OUString &rBuildID,
     const rtl::OUString &rInstallSetID )
 {
     if( !rxContext.is() )
@@ -155,9 +147,7 @@ checkForUpdates(
         aBuffer.append( rOS );
         aBuffer.appendAscii("\' and inst:arch=\'");
         aBuffer.append( rArch );
-        aBuffer.appendAscii("\' and inst:buildid>");
-        aBuffer.append( rBuildID );
-        aBuffer.appendAscii("]");
+        aBuffer.appendAscii("\']");
 
         rtl::OUString aXPathExpression = aBuffer.makeStringAndClear();
 
diff --git a/extensions/source/update/check/updateprotocol.hxx b/extensions/source/update/check/updateprotocol.hxx
index 9488373a303e..e15583703b87 100644
--- a/extensions/source/update/check/updateprotocol.hxx
+++ b/extensions/source/update/check/updateprotocol.hxx
@@ -51,7 +51,6 @@ checkForUpdates(
     const rtl::OUString &rOS,
     const rtl::OUString &rArch,
     const ::com::sun::star::uno::Sequence< rtl::OUString > &rRepositoryList,
-    const rtl::OUString &rBuildID,
     const rtl::OUString &rInstallID
 );