diff options
| -rw-r--r-- | cui/source/dialogs/about.cxx | 17 | ||||
| -rw-r--r-- | include/unotools/bootstrap.hxx | 3 | ||||
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 11 |
3 files changed, 5 insertions, 26 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index efeef5a9c002..917e5f4bd30d 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -19,7 +19,6 @@ #include <about.hxx> -#include <osl/diagnose.h> //OSL_ENSURE #include <osl/process.h> //osl_getProcessLocale #include <rtl/character.hxx> //rtl::isAsciiHexDigit #include <sal/log.hxx> //SAL_WARN @@ -34,7 +33,7 @@ #include <sfx2/app.hxx> //SfxApplication::loadBrandSvg #include <strings.hrc> #include <svtools/langhelp.hxx> -#include <unotools/bootstrap.hxx> //utl::Bootstrap::getBuildVersion +#include <unotools/bootstrap.hxx> //utl::Bootstrap::getBuildIdData #include <unotools/configmgr.hxx> //ConfigManager:: #include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp> @@ -155,16 +154,10 @@ OUString AboutDialog::GetVersionString() { return sVersion; } -OUString AboutDialog::GetBuildString() { - - OUString sDefault; - OUString sBuildId(utl::Bootstrap::getBuildVersion(sDefault)); - if (sBuildId.isEmpty()) - sBuildId = utl::Bootstrap::getBuildIdData(sDefault); - if (sBuildId.isEmpty()) { - sBuildId = sBuildId.getToken(0, '-'); - } - OSL_ENSURE(!sBuildId.isEmpty(), "No BUILDID in bootstrap file"); +OUString AboutDialog::GetBuildString() +{ + OUString sBuildId(utl::Bootstrap::getBuildIdData("")); + SAL_WARN_IF(!sBuildId.isEmpty(), "cui.dialogs", "No BUILDID in bootstrap file"); return sBuildId; } diff --git a/include/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx index 447c33b64942..3f87741408c4 100644 --- a/include/unotools/bootstrap.hxx +++ b/include/unotools/bootstrap.hxx @@ -46,9 +46,6 @@ namespace utl /// retrieve the BUILDID information item; uses the given default, if not found static OUString getBuildIdData(OUString const& _sDefault); - /// retrieve the BuildVersion information item; uses the given default, if not found - static OUString getBuildVersion(OUString const& _sDefault); - /// reload cached data static void reloadData(); diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 459d8e518945..a6c8eb228067 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -37,7 +37,6 @@ #define BOOTSTRAP_ITEM_PRODUCT_KEY "ProductKey" #define BOOTSTRAP_ITEM_VERSIONFILE "Location" #define BOOTSTRAP_ITEM_BUILDID "buildid" -#define BOOTSTRAP_ITEM_BUILDVERSION "BuildVersion" #define BOOTSTRAP_ITEM_BASEINSTALLATION "BRAND_BASE_DIR" #define BOOTSTRAP_ITEM_USERINSTALLATION "UserInstallation" @@ -546,16 +545,6 @@ OUString Bootstrap::getProductKey(OUString const& _sDefault) return data().getBootstrapValue( csProductKeyItem, _sDefault ); } -OUString Bootstrap::getBuildVersion(OUString const& _sDefault) -{ - OUString const csBuildVersionItem(BOOTSTRAP_ITEM_BUILDVERSION); - - OUString sBuildVersion; - // read BuildVersion from version.ini (versionrc) - utl::Bootstrap::Impl::getVersionValue( csBuildVersionItem, sBuildVersion, _sDefault ); - return sBuildVersion; -} - OUString Bootstrap::getBuildIdData(OUString const& _sDefault) { OUString const csBuildIdItem(BOOTSTRAP_ITEM_BUILDID); |