CWS-TOOLING: integrate CWS dba31e

2008-11-19 12:36:23 +0100 msc  r263980 : i96104
2008-11-19 12:31:19 +0100 msc  r263979 : i96104
2008-11-19 12:21:55 +0100 msc  r263977 : i96104
2008-11-19 12:18:53 +0100 msc  r263976 : i96104
2008-11-18 09:09:45 +0100 oj  r263746 : disable color entry when area is set
2008-11-18 08:37:52 +0100 oj  r263741 : #remove sub report entry
2008-11-17 11:20:25 +0100 fs  r263708 : #i10000#
2008-11-17 11:06:52 +0100 fs  r263706 : minimal version now is 3.1
2008-11-12 22:25:59 +0100 fs  r263621 : #i96150#
2008-11-12 22:20:02 +0100 fs  r263620 : rebased to m34
2008-11-12 21:39:41 +0100 fs  r263618 : MANUAL REBASE: rebase CWS dba31d to DEV300_m34
2008-11-12 13:54:58 +0100 fs  r263597 : #i96134# MediaDescriptor.URL is to be preferred over MediaDescriptor.FileName. Nonetheless, ensure both are handled
2008-11-12 13:53:40 +0100 fs  r263596 : #i96134# re-enabled the code for #i41897#, a better fix is to come
2008-11-12 12:48:21 +0100 fs  r263585 : #i96134# disable saving URLs of file-base databases relatively
2008-11-11 16:11:11 +0100 msc  r263566 : #i96104#
2008-11-05 09:09:47 +0100 oj  r263342 : #i88727# color noe added
2008-11-05 08:41:43 +0100 oj  r263341 : #i77916# zoom added
2008-11-04 21:24:15 +0100 fs  r263339 : disposing: call disposeAndClear without own mutex locked - some of our listeners insist on locking the SolarMutex, which sometimes led to deadlocks on the complex test cases
2008-11-04 21:23:15 +0100 fs  r263338 : remove SolarMutex locking - this happned in CWS dba31c (in the CVS version), which this CWS was created from, but seems to got lost during resync
2008-11-04 20:49:50 +0100 fs  r263335 : docu formatting
2008-11-04 20:06:39 +0100 fs  r263334 : #i95826# use m_aMutex, not a DocumentGuard (wrongly resolved merge conflicts)
2008-11-04 17:36:29 +0100 fs  r263332 : #i92688# properly revoke as XEventListener from m_xActiveController when disposing
2008-11-04 14:49:34 +0100 fs  r263324 : #i92322# enable Input Required if EmptyIsNULL does not exist at the control
2008-10-31 11:10:04 +0100 oj  r262857 : merge from cvs to svn
2008-10-31 09:46:45 +0100 oj  r262853 : merge from cvs to svn
2008-10-31 08:46:37 +0100 oj  r262849 : merge from cvs to svn
2008-10-31 08:44:24 +0100 oj  r262848 : merge from cvs to svn
2008-10-31 08:43:33 +0100 oj  r262847 : merge from cvs to svn
2008-10-31 08:42:28 +0100 oj  r262846 : merge from cvs to svn
2008-10-31 08:41:58 +0100 oj  r262845 : merge from cvs to svn
2008-10-31 08:41:32 +0100 oj  r262844 : merge from cvs to svn
2008-10-28 12:19:50 +0100 oj  r262733 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:42 +0100 oj  r262732 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:36 +0100 oj  r262731 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:31 +0100 oj  r262730 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:22 +0100 oj  r262729 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:18 +0100 oj  r262728 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:10 +0100 oj  r262727 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:06 +0100 oj  r262726 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:05 +0100 oj  r262725 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:19:01 +0100 oj  r262724 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:50 +0100 oj  r262723 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:41 +0100 oj  r262722 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:40 +0100 oj  r262721 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:27 +0100 oj  r262720 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:10 +0100 oj  r262719 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:18:01 +0100 oj  r262718 : #iXXXXX#: migrate CWS dba31e to SVN
2008-10-28 12:17:39 +0100 oj  r262717 : #iXXXXX#: migrate CWS dba31e to SVN

1 files changed, 22 insertions, 11 deletions

diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 4fc3877573de..5556b18bc843 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -59,15 +59,18 @@ namespace css = ::com::sun::star;
 static char const xmlNamespace[] =
     "http://openoffice.org/extensions/description/2006";
 
-#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 );
+::dp_misc::Order compareWithVersion(::rtl::OUString const & version) {
+    ::rtl::OUString v(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
+            ":Version:OOOPackageVersion}"));
+    ::rtl::Bootstrap::expandMacros(v);
+    return ::dp_misc::compareVersions(v, version);
+}
 
-    return ::dp_misc::compareVersions(version, aBaseVersion) != ::dp_misc::GREATER;
-};
+bool satisfiesMinimalVersion(::rtl::OUString const & version) {
+    return compareWithVersion(version) != ::dp_misc::LESS;
+}
 
 }
 
@@ -88,9 +91,6 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
         css::uno::Reference< css::xml::dom::XElement > e(
             deps->item(i), css::uno::UNO_QUERY_THROW);
         bool sat = false;
-        // Currently, the only satisfied dependency is OpenOffice.org-minimal-
-        // version with a value of the current OOo release or less (the actual
-        // version string has to be updated here for every OOo release):
         if (e->getNamespaceURI().equalsAsciiL(
                 RTL_CONSTASCII_STRINGPARAM(xmlNamespace))
             && e->getTagName().equalsAsciiL(
@@ -99,6 +99,17 @@ check(::dp_misc::DescriptionInfoset const & infoset) {
             sat = satisfiesMinimalVersion(
                 e->getAttribute(
                     ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))));
+        } else if (e->getNamespaceURI().equalsAsciiL(
+                       RTL_CONSTASCII_STRINGPARAM(xmlNamespace))
+                   && e->getTagName().equalsAsciiL(
+                       RTL_CONSTASCII_STRINGPARAM(
+                           "OpenOffice.org-maximal-version")))
+        {
+            sat =
+                compareWithVersion(
+                    e->getAttribute(
+                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("value"))))
+                != ::dp_misc::GREATER;
         } else if (e->hasAttributeNS(
                        ::rtl::OUString(
                            RTL_CONSTASCII_USTRINGPARAM(xmlNamespace)),