You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2014/03/17 17:15:35 UTC
svn commit: r1578449 -
/openoffice/branches/AOO410/main/jvmfwk/source/framework.cxx
Author: jsc
Date: Mon Mar 17 16:15:35 2014
New Revision: 1578449
URL: http://svn.apache.org/r1578449
Log:
#124442# special handling of nRequirements flag on MacOS when comparing JavaInfo
Modified:
openoffice/branches/AOO410/main/jvmfwk/source/framework.cxx
Modified: openoffice/branches/AOO410/main/jvmfwk/source/framework.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/jvmfwk/source/framework.cxx?rev=1578449&r1=1578448&r2=1578449&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/jvmfwk/source/framework.cxx (original)
+++ openoffice/branches/AOO410/main/jvmfwk/source/framework.cxx Mon Mar 17 16:15:35 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;