diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 13:44:26 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-11-20 13:44:26 +0000 |
| commit | 9f214741a1f602fa2c484dbe7a9a8e159cf98343 (patch) | |
| tree | 8283d1bc3c9f5721fec29e4b3f502801d02c7819 /desktop/source | |
| parent | cb29d98d8aa604905de1915f7455b6c599de8e0d (diff) | |
CWS-TOOLING: integrate CWS dv06_DEV300
Diffstat (limited to 'desktop/source')
| -rw-r--r-- | desktop/source/deployment/misc/dp_dependencies.cxx | 17 |
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 15569a31f5..8124960177 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; }; } |