diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:46:50 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 12:46:50 +0000 |
| commit | a155dae45600dfbffbe1624d0debbea845ab29a2 (patch) | |
| tree | 9b0528f5b2a7f0b73a7c160110657c8f8a274b7e /desktop | |
| parent | 2362bfcd69caba26ca116fffb351af569abfc6e8 (diff) | |
INTEGRATION: CWS sb83 (1.7.86); FILE MERGED
2008/01/23 15:18:11 sb 1.7.86.2: #i84200# access files in various layers via explicit (OOO|BRAND)_BASE_DIR expansions
2007/12/18 08:54:29 sb 1.7.86.1: #i84200# typo
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 8d3a8d8bc919..daa885d459c9 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -4,9 +4,9 @@ * * $RCSfile: dp_dependencies.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: ihi $ $Date: 2007-07-11 14:52:59 $ + * last change: $Author: vg $ $Date: 2008-03-18 13:46:50 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -67,8 +67,8 @@ static char const xmlNamespace[] = bool satisfiesMinimalVersion(::rtl::OUString const & version) { ::rtl::OUString v( RTL_CONSTASCII_USTRINGPARAM( - "${$SYSBINDIR/" SAL_CONFIGFILE("version") - ":Version:OOOBaseVersion")); + "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") + ":Version:OOOBaseVersion}")); ::rtl::Bootstrap::expandMacros(v); return ::dp_misc::compareVersions(version, v) != ::dp_misc::GREATER; }; |