[Libreoffice-commits] core.git: cui/source

[Andreas Heinisch (via logerrit)]

 cui/source/tabpages/numpages.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit a646ba6e5ed042756feac16b91739203793f1742
Author:     Andreas Heinisch <andreas.heinisch at yahoo.de>
AuthorDate: Thu Jul 1 12:16:40 2021 +0200
Commit:     Andreas Heinisch <andreas.heinisch at yahoo.de>
CommitDate: Fri Jul 2 14:51:52 2021 +0200

    tdf#141334 - Only show the last name of the filename without its extension
    
    In the bullets and numbering dialog under customize, don't show the
    filename including its extension in the context menu of the gallery.
    
    Change-Id: Ia3d4277f5b074be78244f0599883f36385a40c8a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118218
    Tested-by: Jenkins
    Reviewed-by: Andreas Heinisch <andreas.heinisch at yahoo.de>

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 32063c6f1c5d..a0d360622d0b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1884,8 +1884,12 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, weld::Toggleable&,
         sGrfName = grfName;
         OUString sItemId = "gallery" + OUString::number(i);
         INetURLObject aObj(sGrfName);
-        if(aObj.GetProtocol() == INetProtocol::File)
-            sGrfName = aObj.PathToFileName();
+        if (aObj.GetProtocol() == INetProtocol::File)
+        {
+            // tdf#141334 - only show the last name of the filename without its extension
+            aObj.removeExtension();
+            sGrfName = aObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous);
+        }
         if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, i, &aGraphic))
         {
             BitmapEx aBitmap(aGraphic.GetBitmapEx());