Skip to content

C
core
Kaydet (Commit) 08656a3e authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann
Dosyalara gözat
Seçenekler

#i10000# build fix

üst 97a50a67
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 13 deletions
desktop/source/deployment/misc/dp_dependencies.cxx
Dosyayı görüntüle @ 08656a3e
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: dp_dependencies.cxx,v $ * $RCSfile: dp_dependencies.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: rt $ $Date: 2007-07-09 10:47:47 $ * last change: $Author: ihi $ $Date: 2007-07-11 14:52:59 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "com/sun/star/xml/dom/XElement.hpp" #include "com/sun/star/xml/dom/XElement.hpp"
#include "com/sun/star/xml/dom/XNode.hpp" #include "com/sun/star/xml/dom/XNode.hpp"
#include "com/sun/star/xml/dom/XNodeList.hpp" #include "com/sun/star/xml/dom/XNodeList.hpp"
#include "rtl/bootstrap.hxx"
#include "rtl/string.h" #include "rtl/string.h"
#include "rtl/ustring.h" #include "rtl/ustring.h"
#include "rtl/ustring.hxx" #include "rtl/ustring.hxx"
...@@ -64,10 +65,12 @@ static char const xmlNamespace[] = ...@@ -64,10 +65,12 @@ static char const xmlNamespace[] =
"http://openoffice.org/extensions/description/2006"; "http://openoffice.org/extensions/description/2006";
bool satisfiesMinimalVersion(::rtl::OUString const & version) { bool satisfiesMinimalVersion(::rtl::OUString const & version) {
return ::rtl::OUString v(
::dp_misc::compareVersions( RTL_CONSTASCII_USTRINGPARAM(
version, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2.2"))) "${$SYSBINDIR/" SAL_CONFIGFILE("version")
!= ::dp_misc::GREATER; ":Version:OOOBaseVersion"));
::rtl::Bootstrap::expandMacros(v);
return ::dp_misc::compareVersions(version, v) != ::dp_misc::GREATER;
}; };
} }
...@@ -95,13 +98,7 @@ check(::dp_misc::DescriptionInfoset const & infoset) { ...@@ -95,13 +98,7 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
if (e->getNamespaceURI().equalsAsciiL( if (e->getNamespaceURI().equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM(xmlNamespace)) RTL_CONSTASCII_STRINGPARAM(xmlNamespace))
&& e->getTagName().equalsAsciiL( && e->getTagName().equalsAsciiL(
RTL_CONSTASCII_STRINGPARAM(minimalVersion)) RTL_CONSTASCII_STRINGPARAM(minimalVersion)))
&& (::dp_misc::compareVersions(
e->getAttribute(
::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("value"))),
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("2.3")))
!= ::dp_misc::GREATER))
{ {
sat = satisfiesMinimalVersion( sat = satisfiesMinimalVersion(
e->getAttribute( e->getAttribute(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment