[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - cui/source

[Tünde Tóth (via logerrit)]

 cui/source/dialogs/hldoctp.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8805379ca0fd8cbdfd032f54200a8fa3d52b1ec7
Author:     Tünde Tóth <tundeth at gmail.com>
AuthorDate: Wed Nov 13 14:50:41 2019 +0100
Commit:     László Németh <nemeth at numbertext.org>
CommitDate: Thu Nov 21 20:56:35 2019 +0100

    tdf#128775 Writer Hyperlink dialog: fix encoding of inserted target URL
    
    text, also its preview in the dialog window, when the URL contains
    anchor at the end.
    
    Change-Id: Ibedb86238f660177b3dd476cd6a13f1ca5f05e12
    Reviewed-on: https://gerrit.libreoffice.org/82654
    Reviewed-by: László Németh <nemeth at numbertext.org>
    Tested-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 79a1fafadb1ac54b8212bc164d8b85d798c74937)
    Reviewed-on: https://gerrit.libreoffice.org/83414
    Tested-by: Jenkins

diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 4fb9aad812f8..55548e99835a 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -105,7 +105,10 @@ OUString SvxHyperlinkDocTp::GetCurrentURL () const
         if ( aURL.GetProtocol() != INetProtocol::NotValid )    // maybe the path is already a valid
             aStrURL = aStrPath;                             // hyperlink, then we can use this path directly
         else
+        {
             osl::FileBase::getFileURLFromSystemPath( aStrPath, aStrURL );
+            aStrURL = INetURLObject::decode(aStrURL, INetURLObject::DecodeMechanism::ToIUri, RTL_TEXTENCODING_UTF8);
+        }
 
         //#105788# always create a URL even if it is not valid
         if( aStrURL.isEmpty() )