[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - sd/source

[Stephan Bergmann]

 sd/source/ui/dlg/PhotoAlbumDialog.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96e0beb0ef99a0840ecf434c3d726eebaa3c745e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jan 10 15:31:53 2017 +0100

    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 at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index 04a7b80..3f4f932 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)));
             }
         }
     }