summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorStephan Bergmann <sb@openoffice.org>2000-12-14 07:31:10 +0000
committerStephan Bergmann <sb@openoffice.org>2000-12-14 07:31:10 +0000
commitfc19ee83198fe8365229881fa8d3141dc5faf1be (patch)
tree9432160c970ceb58869d5280d57d4fe78546ce7d /unotools
parent064249f304869df636eff57e5f170c36e03d3783 (diff)
#77385# Made 'OfficeInstall' and 'InstallPath' local properties.
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/configitem.cxx12
1 files changed, 9 insertions, 3 deletions
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 0f9f7e3933f3..3a3bdd6924b0 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: configitem.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: os $ $Date: 2000-12-13 08:14:57 $
+ * last change: $Author: sb $ $Date: 2000-12-14 08:31:10 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -379,7 +379,13 @@ sal_Bool lcl_IsLocalProperty(const OUString& rSubTree, const OUString& rProperty
sProperty += rProperty;
if(sProperty.equalsAsciiL( aLocalProperties[0], aLocalPropLen[0]) ||
- sProperty.equalsAsciiL( aLocalProperties[1], aLocalPropLen[1]))
+ sProperty.equalsAsciiL( aLocalProperties[1], aLocalPropLen[1]) ||
+ sProperty.
+ equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(
+ "Office.Common/Path/Current/OfficeInstall")) ||
+ sProperty.
+ equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(
+ "UserProfile/Office/InstallPath")))
return sal_True;
if(!sProperty.compareToAscii( aLocalProperties[2], aLocalPropLen[2]))