summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-10 15:31:53 +0100
committerMichael Stahl <mstahl@redhat.com>2017-01-11 11:36:41 +0000
commit96e0beb0ef99a0840ecf434c3d726eebaa3c745e (patch)
tree5da4be93ae8a405ec22f86fcc223656c27620a6c
parent88035917f52d7c372dc757ecd44978cce2681291 (diff)
tdf#105199: Keep URL intact
(cherry picked from commit 6a68e364faa0d384f1e3bf397f5decaadecf9b3b) Conflicts: sd/source/ui/dlg/PhotoAlbumDialog.cxx Change-Id: I85681fcc81246414332f88dc46ce4a4b60896c97 Reviewed-on: https://gerrit.libreoffice.org/32931 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sd/source/ui/dlg/PhotoAlbumDialog.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 04a7b8088e4a..3f4f932f6194 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -507,7 +507,7 @@ IMPL_LINK_NOARG_TYPED(SdPhotoAlbumDialog, FileHdl, Button*, void)
// Store full path, show filename only. Use INetURLObject to display spaces in filename correctly
INetURLObject aUrl = INetURLObject(aFilesArr[i]);
sal_Int16 nPos = pImagesLst->InsertEntry( aUrl.GetLastName(INetURLObject::DECODE_WITH_CHARSET) );
- pImagesLst->SetEntryData(nPos, new OUString(aUrl.GetMainURL(INetURLObject::DECODE_WITH_CHARSET)));
+ pImagesLst->SetEntryData(nPos, new OUString(aUrl.GetMainURL(INetURLObject::NO_DECODE)));
}
}
}