diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-08-18 22:23:30 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-08-19 10:35:14 +0200 |
| commit | 00fa759dc9f13eb4618a7762be9ca6eaf3fd37f7 (patch) | |
| tree | bef85f47250893382599eaf26a6520ca080bc8b0 /unotools | |
| parent | 8891a2fc2a4bf86add68691b7ac167a07a8add84 (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>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index a912ac3eb330..24a5752d3fc1 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" @@ -542,14 +541,6 @@ OUString Bootstrap::getProductKey(OUString const& _sDefault) return data().getBootstrapValue( BOOTSTRAP_ITEM_PRODUCT_KEY, _sDefault ); } -OUString Bootstrap::getBuildVersion(OUString const& _sDefault) -{ - OUString sBuildVersion; - // read BuildVersion from version.ini (versionrc) - utl::Bootstrap::Impl::getVersionValue( BOOTSTRAP_ITEM_BUILDVERSION, sBuildVersion, _sDefault ); - return sBuildVersion; -} - OUString Bootstrap::getBuildIdData(OUString const& _sDefault) { OUString sBuildId; |