diff options
| author | Onur Yilmaz <onuryilmaz0750@gmail.com> | 2020-02-04 16:27:38 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-10 20:21:31 +0100 |
| commit | 4328e3a449d11f1ebcaa91d7852ffdb984e01266 (patch) | |
| tree | 07470c0d66600d90083332d21864a1d6ae934abe /sd | |
| parent | tdf#93389: keep encryption information for autorecovered MS formats (diff) | |
| download | core-4328e3a449d11f1ebcaa91d7852ffdb984e01266.tar.gz core-4328e3a449d11f1ebcaa91d7852ffdb984e01266.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/+/88300
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/dlg/BulletAndPositionDlg.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx index f6eb2d709c76..261ab3cef9d4 100644 --- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx +++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx @@ -978,12 +978,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); } |