[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sd/source

[Gülşah Köse (via logerrit)]

 sd/source/ui/dlg/BulletAndPositionDlg.cxx |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 485faf158a904baa07206313e0c234e5421f9739
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Tue Jul 30 23:26:27 2019 +0300
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Aug 1 11:13:31 2019 +0200

    tdf#126511 Show only icon names instead of full path.
    
    This commit shows only icon names insead of the full
    path of icon on Bullet and Numbering dialog  graphic case
    on Impress.
    
    Change-Id: Iba72bf7c413993bad88add669035765aae521a59
    Reviewed-on: https://gerrit.libreoffice.org/76716
    Tested-by: Jenkins
    Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>
    (cherry picked from commit 7c973ea77438273deda909ce0563d8c5c37dad00)
    Reviewed-on: https://gerrit.libreoffice.org/76745
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 034babf11666..c09c6a79987f 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -970,7 +970,16 @@ IMPL_LINK_NOARG(SvxBulletAndPositionDlg, PopupActivateHdl_Impl, weld::ToggleButt
                     }
                     pVD->SetOutputSizePixel(aBitmap.GetSizePixel(), false);
                     pVD->DrawBitmapEx(Point(), aBitmap);
-                    m_xGalleryMenu->append(sItemId, sGrfName, *pVD);
+
+                    // We want to show only icon names not full path.
+                    // That part finds the last index of the slash and
+                    // gets the part before .gif
+
+                    sal_Int32 last = sGrfName.lastIndexOf("/");
+                    last++;
+                    OUString sIconName = sGrfName.getToken(0, '.', last);
+
+                    m_xGalleryMenu->append(sItemId, sIconName, *pVD);
                 }
                 else
                 {