mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#922 support avoiding config

Browse Source 
Change-Id: I133b3881ea0b21fdb972342e8107e28bbf1727dd
This commit is contained in:
Caolán McNamara
2017-03-21 09:34:09 +00:00
parent 01946cc7ae
commit 73f81f714c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
filter/source/msfilter/msdffimp.cxx
View File

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