From ee7e362aaecba75b7e2fbec81a1d68d417e42e98 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 12 Dec 2011 20:12:05 +0200 Subject: Accept also Oracle Corporation as Java vendor here, too --- bean/com/sun/star/comp/beans/LocalOfficeWindow.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bean') diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java index b7c7ccd16f41..b6e4f8b8594e 100644 --- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java @@ -272,7 +272,8 @@ public class LocalOfficeWindow if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW ) { String vendor = System.getProperty("java.vendor"); - if (vendor.equals("Sun Microsystems Inc.") + if ((vendor.equals("Sun Microsystems Inc.") + || vendor.equals("Oracle Corporation")) && Boolean.valueOf(System.getProperty("sun.awt.xembedserver")).booleanValue()) { xembed = new NamedValue( -- cgit