java.vendor-Debian

Gbp-Pq: Name java.vendor-Debian.diff

diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
index 0f5d9bffc4f4922d7c9fe4da45cd2e3a07801b84..72cde69a18e011e3f8f9fa796127c71ef62dc31a 100644 (file)
--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
+++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java
@@ -250,7 +250,7 @@ public class LocalOfficeWindow
         if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW )
         {
             String vendor = System.getProperty("java.vendor");
-            if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation"))
+            if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation") || vendor.equals("Debian"))
                 && Boolean.getBoolean("sun.awt.xembedserver"))
             {
                 xembed = new NamedValue(

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index b008bb1fc0f7078685a6edbcce1dd876059a9c78..ea0ddc4e7c915aff973ce32c8ff0dd52296e963f 100644 (file)
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -25,6 +25,9 @@
     <vendor name="Oracle Corporation">
       <minVersion>1.6.0</minVersion>
     </vendor>
+    <vendor name="Debian">
+      <minVersion>1.6.0</minVersion>
+    </vendor>
     <vendor name="IBM Corporation">
       <minVersion>1.5.0</minVersion>
     </vendor>

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 56ec3a4e5a4353b953582a60c9679139d5b3a70b..d2b4a895fe4cc25e856876be841913ee5b26ea67 100644 (file)
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -41,6 +41,7 @@ BEGIN_VENDOR_MAP()
 #endif
     VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
     VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
+    VENDOR_MAP_ENTRY("Debian", SunInfo)
     VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
 #ifndef MACOSX
     VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)