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

Caolán McNamara caolanm at redhat.com
Tue Aug 1 09:33:16 UTC 2017


 sc/source/ui/docshell/tablink.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d09b943fc4292d47a9d93f6e423cd0eafbd799ae
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Aug 1 10:18:08 2017 +0100

    ofz: survive missing config
    
    Change-Id: I011b6e3259f1567ddbacb22e19b06f7ae5aa63ed

diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index 580c8983434d..5c5e3a1f4d32 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/linkmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/transliterationwrapper.hxx>
+#include <unotools/configmgr.hxx>
 
 #include "tablink.hxx"
 
@@ -454,7 +455,7 @@ bool ScDocumentLoader::GetFilterName( const OUString& rFileName,
 
     std::shared_ptr<const SfxFilter> pSfxFilter;
     auto pMedium = o3tl::make_unique<SfxMedium>( rFileName, StreamMode::STD_READ );
-    if ( pMedium->GetError() == ERRCODE_NONE )
+    if (pMedium->GetError() == ERRCODE_NONE && !utl::ConfigManager::IsAvoidConfig())
     {
         if ( bWithInteraction )
             pMedium->UseInteractionHandler(true);   // #i73992# no longer called from GuessFilter


More information about the Libreoffice-commits mailing list