From b4d3cef525a92b01ff11b98107d6ebfb4cbced6a Mon Sep 17 00:00:00 2001
From: Eric Bachard <ericb@openoffice.org>
Date: Mon, 22 Oct 2007 15:42:17 +0000
Subject: #i82857# solve conflict with m234 ( sb71)

---
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'jvmfwk/distributions')

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 6b041c0bd451..1cf20d535c30 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -8,11 +8,13 @@
  <vendorInfos>
   <vendor name="Apple Computer, Inc.">
     <minVersion>1.3.1</minVersion>
-    <maxVersion>1.5.0</maxVersion>
   </vendor>
+ <vendor name="Apple Inc.">
+  <minVersion>1.3.1</minVersion>
+ </vendor>
  </vendorInfos>
-
  <plugins>
+  <library vendor="Apple Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
   <library vendor="Apple Computer, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.dylib</library>
  </plugins>
 </javaSelection>
-- 
cgit