diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-11-21 17:52:01 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-22 21:29:44 +0100 |
| commit | 4b951ba18019b3c5daeb692d812b4b98fc2029e4 (patch) | |
| tree | 250765da1a526d893a4008f384e2cc9df759929e /svl | |
| parent | up/down in ArgEdit doesn't do anything (diff) | |
| download | core-4b951ba18019b3c5daeb692d812b4b98fc2029e4.tar.gz core-4b951ba18019b3c5daeb692d812b4b98fc2029e4.zip | |
tdf#128598: Revert "Move dubious file: -> smb: conversion from...
INetURLObject to file UCP"
It turns out that there is lots of code in and around e.g.
SfxMedium::LockOrigFileOnDemand (sfx2/source/doc/docfile.cxx) that treats
document URLs non-generically and treats file URLs specially. That means that
it does not work to transparently rewrite a file URL as an smb URL in the
underlying UCB layer. So for libreoffice-6-4 revert the change again. (For
master towards LO 6.5, I plan to instead completely drop the feature of silently
treating certain forms of file URLs on Linux as smb URLs.)
This reverts commit 46c645bf4e9909f5296e75028f1f5434e83942d2.
Change-Id: I94ac0637115bea36924099951efd8542854a727d
Reviewed-on: https://gerrit.libreoffice.org/83396
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Reviewed-on: https://gerrit.libreoffice.org/83411
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svl')
| -rw-r--r-- | svl/qa/unit/test_URIHelper.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index a30de1540af9..233b812a54c7 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -300,7 +300,12 @@ void Test::testFindFirstURLInText() { "ftp://bla.bla.bla/blubber/", 3, 29 }, { "..\\ftp://bla.bla.bla/blubber/...", nullptr, 0, 0 }, { "..\\ftp:\\\\bla.bla.bla\\blubber/...", +//Sync with tools/source/fsys/urlobj.cxx and changeScheme +#ifdef LINUX + "smb://bla.bla.bla/blubber%2F", 7, 29 }, +#else "file://bla.bla.bla/blubber%2F", 7, 29 }, +#endif { "http://sun.com", "http://sun.com/", 0, 14 }, { "http://sun.com/", "http://sun.com/", 0, 15 }, { "http://www.xerox.com@www.pcworld.com/go/3990332.htm", nullptr, 0, 0 }, |