[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/msfilter/msdffimp.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 73f81f714c42f0c03290657cbf2116263d0cbc80
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 21 09:34:09 2017 +0000

    ofz#922 support avoiding config
    
    Change-Id: I133b3881ea0b21fdb972342e8107e28bbf1727dd

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 8d740fe83aba..bfefea1d16c7 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -29,6 +29,7 @@
 
 #include <comphelper/classids.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <unotools/configmgr.hxx>
 #include <unotools/streamwrap.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
@@ -6951,7 +6952,7 @@ css::uno::Reference < css::embed::XEmbeddedObject >  SvxMSDffManager::CheckForCo
             xStorage->Commit();
             xStorage.clear();
             OUString aType = SfxFilter::GetTypeFromStorage( rSrcStg );
-            if ( aType.getLength() )
+            if (aType.getLength() && !utl::ConfigManager::IsAvoidConfig())
                 pFilter = aMatch.GetFilter4EA( aType );
         }