From 226f7e2ab96fce33a2705ad91ef0d539a6bad7b3 Mon Sep 17 00:00:00 2001 From: Andreas Heinisch Date: Thu, 1 Jul 2021 11:59:35 +0200 Subject: tdf#114070 - Only show the last name of the filename without its extension In the bullets and numbering dialog, don't show the filename including its extension in the tooltip of the image. Change-Id: I2a37f79e8c57d3126e6607f01756771857440faa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118215 Tested-by: Jenkins Reviewed-by: Andreas Heinisch --- cui/source/tabpages/numpages.cxx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'cui') diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index a0d360622d0b..47542d147853 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -746,8 +746,12 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogC m_xExamplesVS->InsertItem( i + 1, i); INetURLObject aObj(grfName); - if(aObj.GetProtocol() == INetProtocol::File) - grfName = aObj.PathToFileName(); + if (aObj.GetProtocol() == INetProtocol::File) + { + // tdf#114070 - only show the last name of the filename without its extension + aObj.removeExtension(); + grfName = aObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous); + } m_xExamplesVS->SetItemText( i + 1, grfName ); ++i; @@ -981,8 +985,12 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, weld::Button&, voi { m_xExamplesVS->InsertItem( i + 1, i); INetURLObject aObj(grfName); - if(aObj.GetProtocol() == INetProtocol::File) - grfName = aObj.PathToFileName(); + if (aObj.GetProtocol() == INetProtocol::File) + { + // tdf#114070 - only show the last name of the filename without its extension + aObj.removeExtension(); + grfName = aObj.GetLastName(INetURLObject::DecodeMechanism::Unambiguous); + } m_xExamplesVS->SetItemText( i + 1, grfName ); ++i; } -- cgit