diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-01-31 16:31:36 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-31 17:12:57 +0000 |
| commit | ff462c9f5e9b010b1740772dc696487f99375d34 (patch) | |
| tree | 99e0522bc5b82d9b71cc2c0e296593d323d71874 /vcl/unx | |
| parent | 7b30516245c4c067e2fca8136cb3919538760169 (diff) | |
gtk3: follow SAL_USE_VCLPLUGIN=gtk3 irrespective of 'experimental' mode.
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/plugadapt/salplug.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx index 801788d4e56f..916dbe2f1d17 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(); |