[Libreoffice-commits] core.git: Branch 'libreoffice-7-2' - sw/source
Andreas Heinisch (via logerrit)
logerrit at kemper.freedesktop.org
Thu Jul 1 22:28:35 UTC 2021
sw/source/uibase/utlui/glbltree.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fe4e891a0ab34aabe3e1cdc425502feba6dffdd8
Author: Andreas Heinisch <andreas.heinisch at yahoo.de>
AuthorDate: Wed Jun 30 19:07:38 2021 +0200
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jul 2 00:28:02 2021 +0200
tdf#127978 - Don't URL encode filename for navigator's tooltip
Change-Id: I70ea7fb739f14c5c60915acc6c66ea241f67524c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118197
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heinisch at yahoo.de>
(cherry picked from commit 5398a6e36489bd68ba31e834833d39fa7de1cbad)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118182
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 4225633077a4..59d193807d04 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -1076,7 +1076,9 @@ IMPL_LINK( SwGlobalTree, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg, vo
sal_Int32 nPos = 0;
for (const std::unique_ptr<SfxMedium>& pMed : aMedList)
{
- OUString sFileName = pMed->GetURLObject().GetMainURL( INetURLObject::DecodeMechanism::NONE )
+ // tdf#127978 - don't URL encode filename for navigator's tooltip
+ OUString sFileName
+ = pMed->GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::Unambiguous)
+ OUStringChar(sfx2::cTokenSeparator)
+ pMed->GetFilter()->GetFilterName()
+ OUStringChar(sfx2::cTokenSeparator);
More information about the Libreoffice-commits
mailing list