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

Eike Rathke erack at redhat.com
Wed Jun 14 21:31:53 UTC 2017


 sc/source/ui/docshell/externalrefmgr.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1bc793f8ab8f9b4ce435bd3585f9579df4a11819
Author: Eike Rathke <erack at redhat.com>
Date:   Wed Jun 14 23:30:57 2017 +0200

    This could never have been meant
    
    Since commit 67b374980f340faa2695001984aaf98886a32fad
    executing ScDocumentLoader::GetFilterName() twice if there was no stored
    filter, and still executing it if there was one, even if the comment says we
    shouldn't.
    
    Change-Id: Iaf4b88e63b3987fb661df0e9b095f06b29076894

diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 2d27e0034eaa..2fc25cfb3f46 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -2480,7 +2480,6 @@ SfxObjectShellRef ScExternalRefManager::loadSrcDocument(sal_uInt16 nFileId, OUSt
         rFilter = pFileData->maFilterName;      // don't overwrite stored filter with guessed filter
     else
         ScDocumentLoader::GetFilterName(aFile, rFilter, aOptions, true, false);
-    ScDocumentLoader::GetFilterName(aFile, rFilter, aOptions, true, false);
     std::shared_ptr<const SfxFilter> pFilter = ScDocShell::Factory().GetFilterContainer()->GetFilter4FilterName(rFilter);
 
     if (pFileData->maRelativeName.isEmpty())


More information about the Libreoffice-commits mailing list