diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-08-18 22:48:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-08-19 09:37:23 +0200 |
| commit | d23e3f51c22ee36833afe5cde91b2e30adef1fe5 (patch) | |
| tree | c50ec285395bee95459a4d9a7c5d7bd81bcf6977 /unotools | |
| parent | 1e778cf6fae707480909d76fa4c1c58af7e8c62a (diff) | |
Drop fallback to read buildid from boostrap ini file
f9e6d8d7c33a308f6f1c15929dd839de2abae3b5 "INTEGRATION: CWS nativefixer18:
fix: #124825# read build id from version.ini" from 2005 had left the previous
code to read from the bootsrap ini file as a fallback, presumably intended for
some (short) transition period.
(Plus loplugin:elidestringvar fallout. And fix the comment, which appears to
have been non-matching right from the start.)
Change-Id: Ia50228f4ae21e9f7ded48fe47d68fcd9931b090c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100967
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 2aaecdd2fb86..a912ac3eb330 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -552,16 +552,9 @@ OUString Bootstrap::getBuildVersion(OUString const& _sDefault) OUString Bootstrap::getBuildIdData(OUString const& _sDefault) { - OUString const csBuildIdItem(BOOTSTRAP_ITEM_BUILDID); - OUString sBuildId; - // read buildid from version.ini (versionrc), if it doesn't exist or buildid is empty - if ( !utl::Bootstrap::Impl::getVersionValue( csBuildIdItem, sBuildId, _sDefault ) - || sBuildId.isEmpty() ) - { - // read buildid from bootstrap.ini (bootstraprc) - sBuildId = data().getBootstrapValue( csBuildIdItem, _sDefault ); - } + // read buildid from version.ini (versionrc) + utl::Bootstrap::Impl::getVersionValue( BOOTSTRAP_ITEM_BUILDID, sBuildId, _sDefault ); return sBuildId; } |