diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 15:13:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 15:13:11 +0000 |
| commit | 37cad172010ee41304a0c4ed99186590eaec2661 (patch) | |
| tree | 04afe60e2f88f942cf9f362aae5b0fdddf6b325b /unotools | |
| parent | 66141a46a44fa1c96694e98453e28c077ca23f48 (diff) | |
CWS-TOOLING: integrate CWS buildid301_DEV300
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/inc/unotools/bootstrap.hxx | 5 | ||||
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 19 |
2 files changed, 2 insertions, 22 deletions
diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index 545a6b23abfb..d2c8a5f1875b 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/unotools/inc/unotools/bootstrap.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: bootstrap.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.16.1 $ * * This file is part of OpenOffice.org. * @@ -63,9 +63,6 @@ namespace utl /// retrieve the BUILDID information item; uses the given default, if not found static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault); - /// retrieve the product patch level; uses the given default, if not found - static rtl::OUString getProductPatchLevel(rtl::OUString const& _sDefault); - /// retrieve the ALLUSERS information item from setup.ini file; uses the given default, if not found static rtl::OUString getAllUsersValue(rtl::OUString const& _sDefault); diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 237629cc1af3..d2a08a766e20 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: bootstrap.cxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.28.16.1 $ * * This file is part of OpenOffice.org. * @@ -64,8 +64,6 @@ #define BOOTSTRAP_ITEM_SHAREDIR "SharedDataDir" #define BOOTSTRAP_ITEM_USERDIR "UserDataDir" -#define BOOTSTRAP_ITEM_PRODUCT_PATCH_LEVEL "ProductPatch" - #define BOOTSTRAP_DEFAULT_BASEINSTALL "$SYSBINDIR/.." #define BOOTSTRAP_DIRNAME_SHAREDIR "share" @@ -681,21 +679,6 @@ OUString Bootstrap::getBuildIdData(OUString const& _sDefault) } // --------------------------------------------------------------------------------------- -OUString Bootstrap::getProductPatchLevel(OUString const& _sDefault) -{ - OUString const csBuildIdItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_PRODUCT_PATCH_LEVEL)); - - // 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; -} -// --------------------------------------------------------------------------------------- - OUString Bootstrap::getAllUsersValue(OUString const& _sDefault) { OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS)); |