diff options
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 1 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 1 | ||||
| -rw-r--r-- | android/qa/desktop/Makefile | 1 | ||||
| -rw-r--r-- | desktop/source/app/app.cxx | 4 | ||||
| -rw-r--r-- | framework/source/fwe/helper/titlehelper.cxx | 2 | ||||
| -rw-r--r-- | qadevOOo/runner/graphical/BuildID.java | 11 | ||||
| -rw-r--r-- | unotools/inc/unotools/bootstrap.hxx | 3 | ||||
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 14 |
8 files changed, 4 insertions, 33 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 880a0320c6b8..6cd8a294adb5 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/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 diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 20627fdf4f4d..eded9e64c4e6 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/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 diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile index bb96eef6be5b..bec3908bb200 100644 --- a/android/qa/desktop/Makefile +++ b/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 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index adcf4b7020d5..19f088c170fa 100644 --- a/desktop/source/app/app.cxx +++ b/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 diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index b54c3042202a..baa8b8c71e2b 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/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("]")); diff --git a/qadevOOo/runner/graphical/BuildID.java b/qadevOOo/runner/graphical/BuildID.java index f6bc0a62d070..ce21a0cc8236 100644 --- a/qadevOOo/runner/graphical/BuildID.java +++ b/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); diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index 4555390a3d39..23418dea9a4b 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/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); diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index f8e40a1b3880..4c7b0e168990 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/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; } |