svn commit: r1578778 - /openoffice/trunk/main/jvmfwk/source/framework.cxx

[jsc]

Author: jsc
Date: Tue Mar 18 08:24:41 2014
New Revision: 1578778

URL: http://svn.apache.org/r1578778
Log:
#124442# merge from beta branch, special handling of nRequirements flag on 
MacOS when comparing JavaInfo

Modified:
    openoffice/trunk/main/jvmfwk/source/framework.cxx

Modified: openoffice/trunk/main/jvmfwk/source/framework.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/source/framework.cxx?rev=1578778&r1=1578777&r2=1578778&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/source/framework.cxx (original)
+++ openoffice/trunk/main/jvmfwk/source/framework.cxx Tue Mar 18 08:24:41 2014
@@ -644,7 +644,9 @@ sal_Bool SAL_CALL jfw_areEqualJavaInfo(
         && sLocation.equals(pInfoB->sLocation) == sal_True
         && sVersion.equals(pInfoB->sVersion) == sal_True
         && pInfoA->nFeatures == pInfoB->nFeatures
+#ifndef MACOSX
         && pInfoA->nRequirements == pInfoB->nRequirements
+#endif
         && sData == pInfoB->arVendorData)
     {
         return sal_True;