diff options
| author | Carsten Driesner <cd@openoffice.org> | 2001-12-06 08:59:43 +0000 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2001-12-06 08:59:43 +0000 |
| commit | 40b58658b7c4aa255b9722f23a597c79177cf2ef (patch) | |
| tree | 8f38c905fa6d2cf6bc92776fa737baca429d3d89 | |
| parent | a01b00af30767ebc9f7d831696f7c55f52cdabd8 (diff) | |
#95517# support new entry InstallMode
| -rw-r--r-- | unotools/inc/unotools/bootstrap.hxx | 7 | ||||
| -rw-r--r-- | unotools/source/config/bootstrap.cxx | 14 |
2 files changed, 17 insertions, 4 deletions
diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx index db5e9089fe7e..5e55c307a0b9 100644 --- a/unotools/inc/unotools/bootstrap.hxx +++ b/unotools/inc/unotools/bootstrap.hxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: cd $ $Date: 2001-11-19 16:09:57 $ + * last change: $Author: cd $ $Date: 2001-12-06 09:58:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -92,6 +92,9 @@ namespace utl /// retrieve the BUILDID information item; uses the given default, if not found static rtl::OUString getBuildIdData(rtl::OUString const& _sDefault); + /// retrieve the installation mode information item; uses the given default, if not found + static rtl::OUString getInstallMode(rtl::OUString const& _sDefault); + public: // retrieve path information about the installaton location enum PathStatus { diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index a92274eb55be..212700f212bc 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -2,9 +2,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: jb $ $Date: 2001-11-20 14:35:52 $ + * last change: $Author: cd $ $Date: 2001-12-06 09:59:43 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,6 +101,7 @@ #define BOOTSTRAP_ITEM_VERSIONFILE "Location" #define BOOTSTRAP_ITEM_LOGO "Logo" #define BOOTSTRAP_ITEM_BUILDID "buildid" +#define BOOTSTRAP_ITEM_INSTALLMODE "InstallMode" #define BOOTSTRAP_ITEM_BASEINSTALLATION "BaseInstallation" #define BOOTSTRAP_ITEM_USERINSTALLATION "UserInstallation" @@ -707,6 +708,15 @@ OUString Bootstrap::getBuildIdData(OUString const& _sDefault) } // --------------------------------------------------------------------------------------- +/// retrieve the installation mode information item; uses the given default, if not found +OUString Bootstrap::getInstallMode(rtl::OUString const& _sDefault) +{ + OUString const csInstallModeItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_INSTALLMODE)); + + return data().getBootstrapValue( csInstallModeItem, _sDefault ); +} +// --------------------------------------------------------------------------------------- + Bootstrap::PathStatus Bootstrap::locateBaseInstallation(OUString& _rURL) { Impl::PathData const& aPathData = data().aBaseInstall_; |