From aa4672625b45832bf2af251d391e9226dd3830a0 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 14 Jun 2017 23:30:57 +0200 Subject: Resolves: tdf#104875 defer filter detection to first load/update of external This is a combination of 2 commits. 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. (cherry picked from commit 1bc793f8ab8f9b4ce435bd3585f9579df4a11819) Resolves: tdf#104875 defer filter detection to first load/update of external Attempting to access all linked external documents right on load time was specifically nasty for non-local URIs (unmounted smb, http, ...) (cherry picked from commit 416752b9e4bc4605c479d3eff7797be9f0ef2a38) f4a7414dfe36875b505c73b8c963b650eeffe204 Change-Id: Iaf4b88e63b3987fb661df0e9b095f06b29076894 Reviewed-on: https://gerrit.libreoffice.org/38820 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit 4175045ebe4c895ff4617fbcdaacbbb058751597) --- sc/inc/externalrefmgr.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sc/inc') diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index 434685c085b3..4863757f9eb7 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -782,7 +782,7 @@ private: */ ScDocument& cacheNewDocShell( sal_uInt16 nFileId, SrcShell& rSrcShell ); - void maybeLinkExternalFile(sal_uInt16 nFileId); + void maybeLinkExternalFile( sal_uInt16 nFileId, bool bDeferFilterDetection = false ); /** * Try to create a "real" file name from the relative path. The original -- cgit v1.2.3