diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-08-18 22:23:30 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-08-19 15:47:41 +0200 |
| commit | 0a796797ddfe2d1913ac91908074c397cf7c9c82 (patch) | |
| tree | 326c4e7a7d2ea403ae0a1970b746094c9924850c /unotools | |
| parent | cb168fa5a2b732438266baf07a08c4c1d9fe671d (diff) | |
tdf#135133: Don't try to read BuildVersion
The option to set it was removed in 5fdf2009d21fa220dfee70ea755bd698c16257a7,
and now the check is redundant - and even harmful until the remnants of the
setting is dropped from bootstrap.ini. Currently the dummy value found there
makes the About dialog miss the build id, and copying info to clipboard gives
<buildversion> instead of proper build id. Previously the string was always
empty in most builds (including TDF), which made the code proceed to buildid.
Bootstrap::getBuildVersion got unused now, and is removed.
Change-Id: If59e456655da29bb9421edc0e15d421829d0a02b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100957
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100975
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 11 |
1 files changed, 0 insertions, 11 deletions
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); |