diff options
| author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2013-05-09 14:24:33 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-05-09 19:29:33 +0000 |
| commit | 97a055dfa7c85c8795dc9b55fb39a5b3448b29f2 (patch) | |
| tree | cf45db9bb3e5f183ade6aa4c5d90026bc57de8fa /sd/source/ui/dlg | |
| parent | 17aa2d99a0537f230aa1bc7f0df40937462441eb (diff) | |
Related fdo#35546: Cosmetic fixes for Photo Album Dialog
* Display spaces in filenames correctly
* Adjust Spacing in Dialog
* Remove the label showing the full path
Change-Id: I5c5d3d54b7e21063628c4cdb4a92f534ec4a3088
Reviewed-on: https://gerrit.libreoffice.org/3834
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'sd/source/ui/dlg')
| -rw-r--r-- | sd/source/ui/dlg/PhotoAlbumDialog.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index fc4b2566c550..2771166e7745 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -55,9 +55,7 @@ SdPhotoAlbumDialog::SdPhotoAlbumDialog(Window* pWindow, SdDrawDocument* pActDoc) get(pImg, "preview_img"); get(pInsTypeCombo, "opt_combo"); - get(pASRCheck, "asr_check"); - get(pFilenameLab, "filename_lab"); pCancelBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CancelHdl)); pCreateBtn->SetClickHdl(LINK(this, SdPhotoAlbumDialog, CreateHdl)); @@ -614,10 +612,10 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, FileHdl) for ( sal_Int32 i = 0; i < aFilesArr.getLength(); i++ ) { - // Store full path, show filename only - OUString sFileName = aFilesArr[i].copy(aFilesArr[i].lastIndexOf("/")).replaceAll("/",""); - sal_Int16 nPos = pImagesLst->InsertEntry( sFileName ); - pImagesLst->SetEntryData(nPos, (void*)new OUString(aFilesArr[i])); + // 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, RTL_TEXTENCODING_UTF8) ); + pImagesLst->SetEntryData(nPos, (OUString*) new OUString(aUrl.GetMainURL(INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8))); } } } @@ -726,7 +724,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, RemoveHdl) { pImagesLst->RemoveEntry( pImagesLst->GetSelectEntryPos() ); pImg->SetImage(Image()); - pFilenameLab->SetText(""); if(pImagesLst->GetEntryCount() >= 1) { @@ -774,7 +771,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl) GraphicFilter aCurFilter; Graphic aGraphic; INetURLObject aURLObj( sImgUrl ); - pFilenameLab->SetText(sImgUrl); sal_uInt16 nFilter = GRFILTER_FORMAT_DONTKNOW; @@ -820,7 +816,6 @@ IMPL_LINK_NOARG(SdPhotoAlbumDialog, SelectHdl) else { pImg->SetImage(Image()); - pFilenameLab->SetText(""); } return 0; |