mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS winregclean1 (1.16.92); FILE MERGED

Browse Source 
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
This commit is contained in:
Oliver Bolte
2005-04-29 07:51:55 +00:00
parent f0515526ce
commit c8156d0cf1
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
unotools/source/config/bootstrap.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: bootstrap.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -117,6 +117,9 @@
#define BOOTSTRAP_DIRNAME_USERDIR "user" #define BOOTSTRAP_DIRNAME_USERDIR "user"
#define VERSIONFILE_SECTION "Versions" #define VERSIONFILE_SECTION "Versions"
#define SETUP_DATA_NAME SAL_CONFIGFILE("setup")
#define SETUP_ITEM_ALLUSERS "ALLUSERS"
// --------------------------------------------------------------------------------------- // ---------------------------------------------------------------------------------------
typedef char const * AsciiString; 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) Bootstrap::PathStatus Bootstrap::locateBaseInstallation(OUString& _rURL)
{ {
Impl::PathData const& aPathData = data().aBaseInstall_; Impl::PathData const& aPathData = data().aBaseInstall_;