From 41b40108afd92f7c0e7a06f9135ad741c36e8f63 Mon Sep 17 00:00:00 2001
From: Rüdiger Timm <rt@openoffice.org>
Date: Fri, 20 Aug 2004 11:32:16 +0000
Subject: INTEGRATION: CWS jl11 (1.2.2); FILE MERGED 2004/08/03 15:48:27 jl
 1.2.2.1: #i32450# renamed the plugins for mac,ibm,blackdown to
 sunjavaplugin.xxx

---
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml  | 4 ++--
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 4e29757d9fe9..4acab0dee83a 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -19,7 +19,7 @@
 
  <plugins>
   <library vendor="Sun Microsystems Inc.">program/sunjavaplugin.so</library>
-  <library vendor="IBM Corporation">program/ibmjavaplugin.so</library>
-  <library vendor="Blackdown Java-Linux Team">program/bdjavaplugin.so</library>
+  <library vendor="IBM Corporation">program/sunjavaplugin.so</library>
+  <library vendor="Blackdown Java-Linux Team">program/sunjavaplugin.so</library>
  </plugins>
 </javaSelection>
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 97cb688f8a33..e9252f64ec3e 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -13,6 +13,6 @@
  </vendorInfos>
 
  <plugins>
-  <library vendor="Apple Computer, Inc.">program/macjavaplugin.dylib</library>
+  <library vendor="Apple Computer, Inc.">program/sunjavaplugin.dylib</library>
  </plugins>
 </javaSelection>
-- 
cgit v1.2.3