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

[Andreas Heinisch (via logerrit)]

 sc/source/ui/cctrl/checklistmenu.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 135892e85c577c419c65b3607ce1ba788e0d10b2
Author:     Andreas Heinisch <andreas.heinisch at yahoo.de>
AuthorDate: Tue Mar 2 16:03:46 2021 +0100
Commit:     Andreas Heinisch <andreas.heinisch at yahoo.de>
CommitDate: Wed Mar 24 16:59:57 2021 +0100

    tdf#46062 - Indicate hidden whitespaces using quotes
    
    Indicate hidden whitespaces for the text items in the autofilter dialog
    using quotes.
    
    Change-Id: Iabd28ff70a3ecabb1653a3b591d7eb6b24f9fde8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111837
    Tested-by: Jenkins
    Reviewed-by: Andreas Heinisch <andreas.heinisch at yahoo.de>

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 9bbfa731f27c..44f64b8bc4a7 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -999,7 +999,9 @@ void ScCheckListMenuControl::addDateMember(const OUString& rsName, double nVal,
 void ScCheckListMenuControl::addMember(const OUString& rName, bool bVisible)
 {
     ScCheckListMember aMember;
-    aMember.maName = rName;
+    // tdf#46062 - indicate hidden whitespaces using quotes
+    aMember.maName = rName.trim() != rName ? "\"" + rName + "\"" : rName;
+    aMember.maRealName = rName;
     aMember.mbDate = false;
     aMember.mbLeaf = true;
     aMember.mbVisible = bVisible;
@@ -1356,10 +1358,7 @@ void ScCheckListMenuControl::getResult(ResultType& rResult)
 
             ResultEntry aResultEntry;
             aResultEntry.bValid = bState;
-            if ( maMembers[i].mbDate )
-                aResultEntry.aName = maMembers[i].maRealName;
-            else
-                aResultEntry.aName = maMembers[i].maName;
+            aResultEntry.aName = maMembers[i].maRealName;
             aResultEntry.bDate = maMembers[i].mbDate;
             aResult.insert(aResultEntry);
         }