unotools/source/config/bootstrap.cxx | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
New commits:
commit d23e3f51c22ee36833afe5cde91b2e30adef1fe5
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Tue Aug 18 22:48:33 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Aug 19 09:37:23 2020 +0200
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 <sberg...@redhat.com>
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
