[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - sfx2/source
Mike Kaganski (via logerrit)
logerrit at kemper.freedesktop.org
Thu Apr 11 06:13:27 UTC 2019
sfx2/source/doc/docfile.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 237169136883a5b312fadcec4c73aa183076828c
Author: Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue Dec 18 02:51:31 2018 +0100
Commit: Aron Budea <aron.budea at collabora.com>
CommitDate: Thu Apr 11 08:13:07 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/70583
Tested-by: Aron Budea <aron.budea at collabora.com>
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 8b403e446952..f198cb6b085a 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -885,7 +885,8 @@ SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const OUString& aD
if ( xHandler.is() && ( bIsLoading || !bHandleSysLocked || bOwnLock ) )
{
- OUString aDocumentURL = GetURLObject().GetLastName();
+ OUString aDocumentURL
+ = GetURLObject().GetLastName(INetURLObject::DecodeMechanism::WithCharset);
OUString aInfo;
::rtl::Reference< ::ucbhelper::InteractionRequest > xInteractionRequestImpl;
More information about the Libreoffice-commits
mailing list