diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 16:36:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-03-03 16:40:50 +0000 |
| commit | 848266b8c2eaa594930c29c802405587691deefc (patch) | |
| tree | c9863ff9205b33798b8b14730271334c99871dd1 | |
| parent | escape invalid XML characters with _xHHHH_ when writing escaped (diff) | |
| download | core-848266b8c2eaa594930c29c802405587691deefc.tar.gz core-848266b8c2eaa594930c29c802405587691deefc.zip | |
hook local FilterConfigCache config avoid to global one
Change-Id: Ia539b343ec4d3a0089eeec1b240ac01f053f01ef
| -rw-r--r-- | vcl/source/filter/FilterConfigCache.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 4929241407f2..ab2196dca922 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -20,6 +20,7 @@ #include "FilterConfigCache.hxx" #include <vcl/graphicfilter.hxx> +#include <unotools/configmgr.hxx> #include <com/sun/star/uno/Any.h> #include <comphelper/processfactory.hxx> #include <com/sun/star/uno/Exception.hpp> @@ -296,7 +297,9 @@ void FilterConfigCache::ImplInitSmart() FilterConfigCache::FilterConfigCache( bool bConfig ) : bUseConfig ( bConfig ) { - if ( bUseConfig ) + if (bUseConfig) + bUseConfig = !utl::ConfigManager::IsAvoidConfig(); + if (bUseConfig) ImplInit(); else ImplInitSmart(); |