summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorPeter Burow <pb@openoffice.org>2002-06-04 09:31:45 +0000
committerPeter Burow <pb@openoffice.org>2002-06-04 09:31:45 +0000
commit3929b4a0a42090aeea3996aba0e3ceeca55f91af (patch)
tree1e3fd34efe9fc69105314b83b7a03ddbd704a530 /unotools
parent461d103d51e3d139ad724efbfd519fba0233b7a5 (diff)
fix: #99880# getProductPatchLevel() added
Diffstat (limited to 'unotools')
-rw-r--r--unotools/inc/unotools/bootstrap.hxx9
-rw-r--r--unotools/source/config/bootstrap.cxx14
2 files changed, 18 insertions, 5 deletions
diff --git a/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx
index 5e55c307a0b9..518a8fdfc4fc 100644
--- a/unotools/inc/unotools/bootstrap.hxx
+++ b/unotools/inc/unotools/bootstrap.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bootstrap.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: cd $ $Date: 2001-12-06 09:58:48 $
+ * last change: $Author: pb $ $Date: 2002-06-04 10:27:11 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -95,7 +95,10 @@ namespace utl
/// 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 installatíon location
+ /// retrieve the product patch level; uses the given default, if not found
+ static rtl::OUString getProductPatchLevel(rtl::OUString const& _sDefault);
+
+ public: // retrieve path information about the installatíon location
enum PathStatus
{
PATH_EXISTS, // Success: Found a path to an existing file or directory
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index 212700f212bc..9536f39f18ce 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: bootstrap.cxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: cd $ $Date: 2001-12-06 09:59:43 $
+ * last change: $Author: pb $ $Date: 2002-06-04 10:31:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -109,6 +109,8 @@
#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"
@@ -717,6 +719,14 @@ OUString Bootstrap::getInstallMode(rtl::OUString const& _sDefault)
}
// ---------------------------------------------------------------------------------------
+OUString Bootstrap::getProductPatchLevel(OUString const& _sDefault)
+{
+ OUString const csBuildIdItem(RTL_CONSTASCII_USTRINGPARAM(BOOTSTRAP_ITEM_PRODUCT_PATCH_LEVEL));
+
+ return data().getBootstrapValue( csBuildIdItem, _sDefault );
+}
+// ---------------------------------------------------------------------------------------
+
Bootstrap::PathStatus Bootstrap::locateBaseInstallation(OUString& _rURL)
{
Impl::PathData const& aPathData = data().aBaseInstall_;