From 9f7f881d11ceb4e2534758b9507a55292ec697b0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 17 Feb 2016 16:09:01 +0000 Subject: Resolves: rhbz#1285356 force swing not to use gtk2 if gtk3 is loaded Change-Id: I6347bf4c25ce649073afdfe4225182ab2dc84af1 Reviewed-on: https://gerrit.libreoffice.org/22433 Tested-by: Jenkins Reviewed-by: Chris Sherlock --- stoc/source/javavm/javavm.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'stoc') diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx index c7a061c057e6..64b55f76b55b 100644 --- a/stoc/source/javavm/javavm.cxx +++ b/stoc/source/javavm/javavm.cxx @@ -534,8 +534,15 @@ void initVMConfiguration( } *pjvm= jvm; - setTimeZone(pjvm); + // rhbz#1285356, native look will be gtk2, which crashes + // when gtk3 is already loaded. Until there is a solution + // java-side force look and feel to something that doesn't + // crash when we are using gtk3 + if (getenv("STOC_FORCE_SYSTEM_LAF")) + pjvm->pushProp(OUString("swing.systemlaf=javax.swing.plaf.metal.MetalLookAndFeel")); + + setTimeZone(pjvm); } class DetachCurrentThread: private boost::noncopyable { -- cgit v1.2.3