diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-10 15:31:53 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-08 11:56:05 +0100 |
| commit | 21fb4c88dd534b5f84d613271345d8a284f86445 (patch) | |
| tree | e25e322456955979894dbfc1ca43096a79a98429 /sd | |
| parent | d099663b5d5f622ffa422b89def52096c952bd0d (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>
(cherry picked from commit 96e0beb0ef99a0840ecf434c3d726eebaa3c745e)
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 4c968abd28f0..138b8f93ad29 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -502,7 +502,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))); } } } |