summaryrefslogtreecommitdiffstats
path: root/sd
diff options
context:
space:
mode:
authorOnur Yilmaz <onuryilmaz0750@gmail.com>2020-02-04 16:27:38 +0300
committerXisco FaulĂ­ <xiscofauli@libreoffice.org>2020-02-10 12:40:36 +0100
commit153dafe1147bc29fc0e656d0cb8994112ecea1a0 (patch)
treeeb2b41e109a0e772c107592631acaa5a0c5b9c4e /sd
parenttdf#129912 correctly stop unstyled footnote parsing (diff)
downloadcore-153dafe1147bc29fc0e656d0cb8994112ecea1a0.tar.gz
core-153dafe1147bc29fc0e656d0cb8994112ecea1a0.zip
tdf#130148 Gallery drop-down list in Impress B&N dialog shows only start...
Change-Id: Ieb8d79d7b3d291ffb36a7daaee0716d4ed8c9a85 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87972 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> (cherry picked from commit 5088e6d34b0ffba423f8633ee83673a9c1d40036) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88299 Reviewed-by: Xisco FaulĂ­ <xiscofauli@libreoffice.org>
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/dlg/BulletAndPositionDlg.cxx9
1 files changed, 3 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 7ce6a227fe3f..498ea1befcc5 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -897,12 +897,9 @@ IMPL_LINK_NOARG(SvxBulletAndPositionDlg, PopupActivateHdl_Impl, weld::ToggleButt
pVD->DrawBitmapEx(Point(), aBitmap);
// 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);
+ aObj.removeExtension();
+ OUString sIconName
+ = aObj.GetLastName(INetURLObject::DecodeMechanism::WithCharset);
m_xGalleryMenu->append(sItemId, sIconName, *pVD);
}