diff options
| author | Eike Rathke <erack@redhat.com> | 2017-06-14 23:30:57 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-06-21 12:36:16 +0200 |
| commit | aa4672625b45832bf2af251d391e9226dd3830a0 (patch) | |
| tree | d68074ddf2d65f83198ff24f6fb654b22a3959c0 /sc/inc | |
| parent | 76b5d08d6450135f496ef04fd3fdd8638cd0f594 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 4175045ebe4c895ff4617fbcdaacbbb058751597)
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/externalrefmgr.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 |