diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-04-29 07:51:55 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-04-29 07:51:55 +0000 |
commit | c8156d0cf186a7c7a1d24f1301cec2c8dbf0f4dc (patch) | |
tree | f794da09ab6127dc9ee3d1f0d3cc630c8464d31f /unotools/source/config | |
parent | f0515526ce4e00cd7ab07be9b1c9c9d62867a3c5 (diff) |
INTEGRATION: CWS winregclean1 (1.16.92); FILE MERGED
2005/04/22 13:54:12 mav 1.16.92.2: #i47658# read from AllUsers value from setup.ini
2005/04/22 13:49:04 mav 1.16.92.1: #i47658# read from AllUsers value from setup.ini
Diffstat (limited to 'unotools/source/config')
-rw-r--r-- | unotools/source/config/bootstrap.cxx | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 507178811687..2ce8077f0108 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: hr $ $Date: 2003-11-07 14:42:49 $ + * last change: $Author: obo $ $Date: 2005-04-29 08:51:55 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -117,6 +117,9 @@ #define BOOTSTRAP_DIRNAME_USERDIR "user" #define VERSIONFILE_SECTION "Versions" + +#define SETUP_DATA_NAME SAL_CONFIGFILE("setup") +#define SETUP_ITEM_ALLUSERS "ALLUSERS" // --------------------------------------------------------------------------------------- typedef char const * AsciiString; // --------------------------------------------------------------------------------------- @@ -743,6 +746,17 @@ OUString Bootstrap::getProductPatchLevel(OUString const& _sDefault) } // --------------------------------------------------------------------------------------- +OUString Bootstrap::getAllUsersValue(OUString const& _sDefault) +{ + OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS)); + + rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/"SETUP_DATA_NAME ) ) ); + OUString sResult; + aData.getFrom( csAllUsersItem, sResult, _sDefault ); + return sResult; +} +// --------------------------------------------------------------------------------------- + Bootstrap::PathStatus Bootstrap::locateBaseInstallation(OUString& _rURL) { Impl::PathData const& aPathData = data().aBaseInstall_; |