[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - oox/source
Andras Timar
andras.timar at collabora.com
Mon Feb 13 08:28:58 UTC 2017
oox/source/ppt/pptimport.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 095d781218d1b13764566c5b840e866758221dca
Author: Andras Timar <andras.timar at collabora.com>
Date: Fri Feb 10 21:27:26 2017 +0100
Related: tdf#105707 PPTX import: decode document name from URL
Change-Id: I7448c48b9376a4b73b8a35034a73353981174823
Reviewed-on: https://gerrit.libreoffice.org/34137
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 7242e09..9bd098f 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -103,7 +103,7 @@ bool PowerPointImport::importDocument()
{
// Construct a warning message.
INetURLObject aURL(getFileUrl());
- SfxErrorContext aContext(ERRCTX_SFX_OPENDOC, aURL.getName(INetURLObject::LAST_SEGMENT), nullptr, RID_ERRCTX);
+ SfxErrorContext aContext(ERRCTX_SFX_OPENDOC, aURL.getName(INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET), nullptr, RID_ERRCTX);
OUString aWarning;
aContext.GetString(ERRCODE_WARNING_MASK, aWarning);
aWarning += ":\n";
More information about the Libreoffice-commits
mailing list