sal/osl/w32/file_url.cxx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit f2a9629658e35103a072181e6954cb2de8b1b0b0
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Jan 30 09:13:53 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Jan 30 08:09:32 2021 +0100
Reinstate still relevant bits of comment
... removed in commit 6e0fa7d4c7b45c98418c289d1d4715eb9eb133f7.
Change-Id: I6a58ad9d676a5f4b6f654e114eb640d7f82682c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110164
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index e71da15a66b9..c2094f568edd 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -1042,7 +1042,10 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL(
rtl_uString* ustrBaseURL, rtl_uStr
if ( !eError )
{
OUString sResultPath;
-
+/*@@@ToDo
+ The whole FileURL implementation should be merged
+ with the rtl/uri class.
+*/
// If ustrRelSysPath is absolute, we don't need ustrBaseSysPath.
if (ustrBaseSysPath && !isAbsolute(ustrRelSysPath))
{
@@ -1051,7 +1054,7 @@ oslFileError SAL_CALL osl_getAbsoluteFileURL(
rtl_uString* ustrBaseURL, rtl_uStr
// Don't use SetCurrentDirectoryW together with GetFullPathNameW,
because:
// (a) it needs synchronization and may affect threads that may
access relative paths;
- // (b) it would fail or give wrong results for non-existing base
path (possible in URL).
+ // (b) it would give wrong results for non-existing base path
(allowed by RFC2396).
if (startsWithDriveColon(ustrRelSysPath))
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
