[Libreoffice-commits] .: vcl/unx

[Michael Meeks]

 vcl/unx/generic/plugadapt/salplug.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ff462c9f5e9b010b1740772dc696487f99375d34
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Jan 31 16:31:36 2012 +0000

    gtk3: follow SAL_USE_VCLPLUGIN=gtk3 irrespective of 'experimental' mode.

diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index 801788d..916dbe2 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -50,12 +50,13 @@ typedef SalInstance*(*salFactoryProc)( oslModule pModule);
 
 static oslModule pCloseModule = NULL;
 
-static SalInstance* tryInstance( const OUString& rModuleBase )
+static SalInstance* tryInstance( const OUString& rModuleBase, bool bForce = false )
 {
     SalInstance* pInst = NULL;
 #ifndef ANDROID
     // Disable gtk3 plugin load except in experimental mode for now.
-    if( rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "gtk3" ) ) &&
+    if( !bForce &&
+        rModuleBase.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "gtk3" ) ) &&
         !officecfg::Office::Common::Misc::ExperimentalMode::get() )
         return NULL;
 #endif
@@ -232,7 +233,7 @@ SalInstance *CreateSalInstance()
     pInst = check_headless_plugin();
 
     if( !pInst && pUsePlugin && *pUsePlugin )
-        pInst = tryInstance( OUString::createFromAscii( pUsePlugin ) );
+        pInst = tryInstance( OUString::createFromAscii( pUsePlugin ), true );
 
     if( ! pInst )
         pInst = autodetect_plugin();