Enable experimental gtk3 plugin only via SAL_USE_VCLPLUGIN

...and not also via experimental mode, to avoid trying to use the UNO service
manager before it has been initialized.

Change-Id: Idee8bdccf1193ebe5aa0c47c801f0e2209d57899

1 files changed, 5 insertions, 11 deletions

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 67b806e70a09..133e8c0fd1f7 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -26,10 +26,6 @@
  *
  ************************************************************************/
 
-#include "officecfg/Office/Common.hxx"
-
-#include "comphelper/processfactory.hxx"
-
 #include "osl/module.h"
 #include "osl/process.h"
 
@@ -55,16 +51,14 @@ static oslModule pCloseModule = NULL;
 static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = false )
 {
     SalInstance* pInst = NULL;
-#if !defined(ANDROID)
+    // Disable gtk3 plugin for now unless explicitly requested via
+    // SAL_USE_VCLPLUGIN=gtk3 (would ideally depend on experimental mode, but
+    // reading the experimental mode setting requires the UNO service manager
+    // which has not yet been instantiated):
     if (!bForce && rModuleBase.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("gtk3")))
     {
-        // Disable gtk3 plugin load except in experimental mode for now.
-        using namespace com::sun::star;
-        uno::Reference< uno::XComponentContext > xContext = comphelper::getProcessComponentContext();
-        if (!xContext.is() || !officecfg::Office::Common::Misc::ExperimentalMode::get(xContext))
-            return NULL;
+        return NULL;
     }
-#endif
     OUStringBuffer aModName( 128 );
     aModName.appendAscii( SAL_DLLPREFIX"vclplug_" );
     aModName.append( rModuleBase );