mirror of
https://abf.rosa.ru/djam/libreoffice.git
synced 2025-02-23 18:43:00 +00:00
18 lines
862 B
Diff
18 lines
862 B
Diff
diff -urN libreoffice-5.2.3.3/vcl/unx/generic/plugadapt/salplug.cxx libreoffice-5.2.3.3-patched/vcl/unx/generic/plugadapt/salplug.cxx
|
|
--- libreoffice-5.2.3.3/vcl/unx/generic/plugadapt/salplug.cxx 2016-10-29 00:50:26.000000000 +1000
|
|
+++ libreoffice-5.2.3.3-patched/vcl/unx/generic/plugadapt/salplug.cxx 2016-11-14 23:54:15.921687817 +1000
|
|
@@ -68,6 +68,14 @@
|
|
return svp_create_SalInstance();
|
|
|
|
SalInstance* pInst = nullptr;
|
|
+ // 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 == "gtk3")
|
|
+ {
|
|
+ return nullptr;
|
|
+ }
|
|
OUString aModule(
|
|
#ifdef SAL_DLLPREFIX
|
|
SAL_DLLPREFIX
|