diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-11-17 17:00:25 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-11-17 17:00:25 +0000 |
| commit | f88ac18f8b9a4a513eb1eb09dca93935e5d64e50 (patch) | |
| tree | da9168871ab790d3d6f1c4a39619777bfb190bb8 /unotools/source | |
| parent | bb74fcf0b8cc109ba37b2f9529e62c3c0ccefaf8 (diff) | |
INTEGRATION: CWS aboutbox (1.19.12); FILE MERGED
2005/11/17 11:04:46 pb 1.19.12.1: fix: #127910# ProductPatch key has moved from bootstrap[rc|.ini] to version[rc|.ini]
Diffstat (limited to 'unotools/source')
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 55523daed355..d048005f33fa 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.19 $ + * $Revision: 1.20 $ * - * last change: $Author: hr $ $Date: 2005-09-28 13:22:00 $ + * last change: $Author: hr $ $Date: 2005-11-17 18:00:25 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -723,7 +723,14 @@ OUString Bootstrap::getProductPatchLevel(OUString const& _sDefault) { OUString const csBuildIdItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_PRODUCT_PATCH_LEVEL)); - return data().getBootstrapValue( csBuildIdItem, _sDefault ); + // pb: #127910# ProductPatch key has moved from bootstrap[rc|.ini] to version[rc|.ini] + OUString sPPLevel; + // read ProductPatchLevel from version[rc|.ini], if it doesn't exist or ProductPatchLevel is empty + if ( data().getVersionValue( csBuildIdItem, sPPLevel, _sDefault ) != sal_True || + sPPLevel.getLength() == 0 ) + // read ProductPatchLevel from bootstrap[rc|.ini] + sPPLevel = data().getBootstrapValue( csBuildIdItem, _sDefault ); + return sPPLevel; } // --------------------------------------------------------------------------------------- |