vcl/source/filter/FilterConfigCache.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 848266b8c2eaa594930c29c802405587691deefc
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Mar 3 16:36:19 2017 +0000
hook local FilterConfigCache config avoid to global one
Change-Id: Ia539b343ec4d3a0089eeec1b240ac01f053f01ef
diff --git a/vcl/source/filter/FilterConfigCache.cxx
b/vcl/source/filter/FilterConfigCache.cxx
index 4929241..ab2196d 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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
