The "ProductSource" (MWS name) makes no sense any more

android/experimental/DocumentLoader/Makefile

@@ -126,7 +126,6 @@ copy-stuff:
 	echo 'ProductBuildid=3' >> assets/program/versionrc
 	echo 'ProductMajor=360' >> assets/program/versionrc
 	echo 'ProductMinor=1' >> assets/program/versionrc
-	echo 'ProductSource=OOO350' >> assets/program/versionrc
 	echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
 #
 # .res files

android/experimental/LibreOffice4Android/Makefile

@@ -103,7 +103,6 @@ copy-stuff:
 	echo 'ProductBuildid=3' >> assets/program/versionrc
 	echo 'ProductMajor=360' >> assets/program/versionrc
 	echo 'ProductMinor=1' >> assets/program/versionrc
-	echo 'ProductSource=OOO350' >> assets/program/versionrc
 	echo 'ReferenceOOoMajorMinor=3.6' >> assets/program/versionrc
 #
 # .res files

android/qa/desktop/Makefile

@@ -70,7 +70,6 @@ buildrcs:
 	echo "ProductBuildid=3" >> assets/program/versionrc
 	echo "ProductMajor=360" >> assets/program/versionrc
 	echo "ProductMinor=1" >> assets/program/versionrc
-	echo "ProductSource=OOO350" >> assets/program/versionrc
 	echo "ReferenceOOoMajorMinor=3.6" >> assets/program/versionrc
 	echo "UpdateID=LibreOffice_3_en-US" >> assets/program/versionrc
 	echo "UpdateURL=" >> assets/program/versionrc

desktop/source/app/app.cxx

@@ -1456,10 +1456,10 @@ int Desktop::Main()
         delete pLabelResMgr;
 
 #ifdef DBG_UTIL
-        //include version ID in non product builds
+        //include buildid in non product builds
         ::rtl::OUString aDefault("development");
         aTitle += rtl::OUString(" [");
-        String aVerId( utl::Bootstrap::getProductSource(aDefault));
+        String aVerId( utl::Bootstrap::getProductBuildIdData(aDefault));
         aTitle += aVerId;
         aTitle += ']';
 #endif

framework/source/fwe/helper/titlehelper.cxx

@@ -579,7 +579,7 @@ void TitleHelper::impl_appendModuleName (::rtl::OUStringBuffer& sTitle)
 void TitleHelper::impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle)
 {
     ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("development"));
-    ::rtl::OUString sVersion = ::utl::Bootstrap::getProductSource(sDefault);
+    ::rtl::OUString sVersion = ::utl::Bootstrap::getProductBuildIdData(sDefault);
     sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM(" ["));
     sTitle.append(sVersion);
     sTitle.appendAscii(RTL_CONSTASCII_STRINGPARAM("]"));

qadevOOo/runner/graphical/BuildID.java

@@ -163,13 +163,6 @@ public class BuildID
 //            System.exit(1);
 //        }
 
-            public static String getMaster(String _sOfficePath)
-            {
-                final String sOfficePath = getOfficePath(_sOfficePath);
-                final String sMaster = getBuildID(sOfficePath, "ProductSource");
-                return sMaster;
-            }
-
             public static String getMinor(String _sOfficePath)
             {
                 final String sOfficePath = getOfficePath(_sOfficePath);
@@ -199,10 +192,6 @@ public class BuildID
 //            sBuildID = getBuildID(sApp);
 //            System.out.println("BuildID is: " + sBuildID);
 //
-//            String sMaster;
-//            sMaster = getMaster(sApp);
-//            System.out.println("Master is: " + sMaster);
-//
 //            String sMinor;
 //            sMinor = getMinor(sApp);
 //            System.out.println("Minor is: " + sMinor);

unotools/inc/unotools/bootstrap.hxx

@@ -46,9 +46,6 @@ namespace utl
         /// retrieve the product key; uses the given default, if not found
         static rtl::OUString getProductKey(rtl::OUString const& _sDefault);
 
-        /// retrieve the product source (MWS name)
-        static rtl::OUString getProductSource(rtl::OUString const& _sDefault);
-
         /// retrieve the BUILDID information item; uses the given default, if not found
         static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault);
 

unotools/source/config/bootstrap.cxx

@@ -42,7 +42,6 @@
 #define BOOTSTRAP_DATA_NAME                 SAL_CONFIGFILE("bootstrap")
 
 #define BOOTSTRAP_ITEM_PRODUCT_KEY          "ProductKey"
-#define BOOTSTRAP_ITEM_PRODUCT_SOURCE       "ProductSource"
 #define BOOTSTRAP_ITEM_VERSIONFILE          "Location"
 #define BOOTSTRAP_ITEM_BUILDID              "buildid"
 #define BOOTSTRAP_ITEM_BUILDVERSION         "BuildVersion"
@@ -586,23 +585,12 @@ OUString Bootstrap::getProductKey(OUString const& _sDefault)
 }
 // ---------------------------------------------------------------------------------------
 
-OUString Bootstrap::getProductSource(OUString const& _sDefault)
-{
-    OUString const csProductSourceItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_PRODUCT_SOURCE));
-
-    OUString sProductSource;
-    // read ProductSource from version.ini (versionrc)
-    data().getVersionValue( csProductSourceItem, sProductSource, _sDefault );
-    return sProductSource;
-}
-// ---------------------------------------------------------------------------------------
-
 OUString Bootstrap::getBuildVersion(OUString const& _sDefault)
 {
     OUString const csBuildVersionItem(BOOTSTRAP_ITEM_BUILDVERSION);
 
     OUString sBuildVersion;
-    // read ProductSource from version.ini (versionrc)
+    // read BuildVersion from version.ini (versionrc)
     data().getVersionValue( csBuildVersionItem, sBuildVersion, _sDefault );
     return sBuildVersion;
 }