diff options
author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-05 11:18:23 +0100 |
---|---|---|
committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2010-01-05 11:18:23 +0100 |
commit | 8a82c9892f39d69d77937f4691c90a079a059bdf (patch) | |
tree | e5c1e5786003fd58f3b8b1a85cb68dd414e20028 | |
parent | 7ef41abc062018776247294bde7e56e2b46489bd (diff) |
vcl108: #i107878# reenable accidentally lost environment variable SAL_USE_VCLPLUGIN
-rw-r--r-- | vcl/unx/source/plugadapt/salplug.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx index f1c63b8abee7..08820b2cb7f9 100644 --- a/vcl/unx/source/plugadapt/salplug.cxx +++ b/vcl/unx/source/plugadapt/salplug.cxx @@ -219,8 +219,10 @@ SalInstance *CreateSalInstance() if( !(pUsePlugin && *pUsePlugin) ) pInst = check_headless_plugin(); + else + pInst = tryInstance( OUString::createFromAscii( pUsePlugin ) ); - if( ! pInst && !(pUsePlugin && *pUsePlugin) ) + if( ! pInst ) pInst = autodetect_plugin(); // fallback to gen |