diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-02-04 17:38:29 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-02-05 19:55:04 +0100 |
| commit | 46c645bf4e9909f5296e75028f1f5434e83942d2 (patch) | |
| tree | 9312feef8f02fcbac1ca9b6726d273817e9c59a8 /svl/qa | |
| parent | 48d757ed1ae69636c7eaba83d1938666d290c5df (diff) | |
Move dubious file: -> smb: conversion from INetURLObject to file UCP
The Linux-only conversion of file URLs with a non-empty (other than "localhost")
authority to smb URLs had been added in 2010 with
0b9ef81ba5ff08d85f21275222458a5b9b9e484c "tools-urlobj-smb-scheme-patch.diff:
migrated" (applying a Go-oo patch?) but giving no rationale beyond "process
relative SMB paths (in hyperlinks) correctly". That makes it hard to tell
whether that patch is (still) actively useful for anything, or was just a
misguided hack from the beginning:
* Why make this Linux only? What about other non-Windows OSs? (On Windows,
such URLs can be resolved as UNC pathnames.) If the reason for Linux-only was
that it is the only OS where LO can handle smb URLs via GIO, why not make it
conditional on ENABLE_GIO?
* Why map to smb? There are various remote file access protocols. Hardcoding
smb looks arbitrary here.
Anyway, INetURLObject is arguably at a wrong level for such a patch. To not
drop the hack wholesale, reimplement it in the file UCP, forwarding to a
potential other UCP that can handle smb URLs any file://<host>/... URLs
(rewritten as smb URLs) that the file UCP cannot handle itself.
(file://localhost/... URLs will already have been normalized to file:///... by
INetURLObject when they reach the file UCP, and even if they were not, the
osl/file.hxx functionality underlying fileaccess::TaskManager::getUnqFromUrl
knows how to handle them, so they will not take the forward-to-smb code branch.)
(The corresponding #ifdef WIN code from 0b9ef81ba5ff08d85f21275222458a5b9b9e484c
has already been removed with 82034b04e81b74a048595b0eac0f73581ecbc9e4
"tdf#119326 crash when adding "Windows Share" File resource".)
(I came across that 2010 patch while looking into
<https://bugs.documentfoundation.org/show_bug.cgi?id=107461> "Does not support
'file://' scheme with actual hostname". A next step would be to make the file
UCP actually handle any file://<host>/... URLs that denote the local host.)
Change-Id: I77242705dc4c6c1e9cb3a4f32253224ac6cb13cb
Reviewed-on: https://gerrit.libreoffice.org/67372
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svl/qa')
| -rw-r--r-- | svl/qa/unit/test_URIHelper.cxx | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx index 233b812a54c7..a30de1540af9 100644 --- a/svl/qa/unit/test_URIHelper.cxx +++ b/svl/qa/unit/test_URIHelper.cxx @@ -300,12 +300,7 @@ 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 }, |