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

[Jim Raykowski (via logerrit)]

 svx/source/dialog/srchdlg.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 2f135f9e319beb0aea28c26eb9e39e50a6851a6e
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Tue Sep 22 23:03:32 2020 -0800
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Sep 23 12:51:36 2020 +0200

    tdf#127729 Don't include empty string presentations in search
    
    description text
    
    Change-Id: Ica123561e46b63368c73065595a91701814eafa0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103228
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 6a989cb2f2a5..78d7a5676f44 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2140,7 +2140,13 @@ OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr,
         {
             OUString aStr;
             rPool.GetPresentation(*rItem.pItem, eMapUnit, aStr, aIntlWrapper);
-            rStr += aStr;
+            if (aStr.isEmpty())
+            {
+                if (rStr.endsWith(", "))
+                    rStr = rStr.copy(0, rStr.lastIndexOf(","));
+            }
+            else
+                rStr += aStr;
         }
         else if ( rItem.nSlot == SID_ATTR_BRUSH_CHAR )
         {