summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2008-11-20 13:44:26 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2008-11-20 13:44:26 +0000
commit2849810d867485f44d1c6017157d65707a799330 (patch)
tree7a33ae7fd75670d87b6d8c176f08e22415d6259d /desktop
parent364459717bb27c4e42dd86b642d09086f904190c (diff)
CWS-TOOLING: integrate CWS dv06_DEV300
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/misc/dp_dependencies.cxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 563a643df96e..4fc3877573de 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: dp_dependencies.cxx,v $
- * $Revision: 1.9 $
+ * $Revision: 1.9.156.2 $
*
* This file is part of OpenOffice.org.
*
@@ -59,13 +59,14 @@ namespace css = ::com::sun::star;
static char const xmlNamespace[] =
"http://openoffice.org/extensions/description/2006";
-bool satisfiesMinimalVersion(::rtl::OUString const & version) {
- ::rtl::OUString v(
- RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version")
- ":Version:OOOBaseVersion}"));
- ::rtl::Bootstrap::expandMacros(v);
- return ::dp_misc::compareVersions(version, v) != ::dp_misc::GREATER;
+#define UNISTRING(s) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s))
+
+bool satisfiesMinimalVersion( ::rtl::OUString const & version )
+{
+ ::rtl::OUString aBaseVersion( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:OOOPackageVersion}" ) );
+ ::rtl::Bootstrap::expandMacros( aBaseVersion );
+
+ return ::dp_misc::compareVersions(version, aBaseVersion) != ::dp_misc::GREATER;
};
}