diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-12 20:12:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-12-12 22:14:56 +0200 |
| commit | ee7e362aaecba75b7e2fbec81a1d68d417e42e98 (patch) | |
| tree | bafa54847483e26e9fa600db9f1f6b957ccf5038 /bean | |
| parent | b1b25a9a1e61ff85467fab7d018c82f458826d8f (diff) | |
Accept also Oracle Corporation as Java vendor here, too
Diffstat (limited to 'bean')
| -rw-r--r-- | bean/com/sun/star/comp/beans/LocalOfficeWindow.java | 3 |
1 files changed, 2 insertions, 1 deletions
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( |