[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sfx2/source

[Mike Kaganski (via logerrit)]

 sfx2/source/doc/docfile.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fda87834ae29dd0cba6cfc420c97ea79593c4738
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue Dec 18 02:51:31 2018 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Jun 18 15:12:21 2019 +0200

    tdf#116320: properly decode file name for File Locked dialog
    
    Change-Id: I51bd7c6695ef52b08e0b6d809160d74daebb8505
    Reviewed-on: https://gerrit.libreoffice.org/65298
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 8dc3fe631583228fe5bb49b44d2308470ec30df0)
    Reviewed-on: https://gerrit.libreoffice.org/74278
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index dd1ff394894b..08848fd6808d 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -995,7 +995,8 @@ SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const OUString& aD
 
     if ( ::svt::DocumentLockFile::IsInteractionAllowed() && xHandler.is() && ( bIsLoading || !bHandleSysLocked || bOwnLock ) )
     {
-        OUString aDocumentURL = GetURLObject().GetLastName();
+        OUString aDocumentURL
+            = GetURLObject().GetLastName(INetURLObject::DecodeMechanism::WithCharset);
         OUString aInfo;
         ::rtl::Reference< ::ucbhelper::InteractionRequest > xInteractionRequestImpl;