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

[Mike Kaganski (via logerrit)]

 sc/inc/userlist.hxx              |    3 ---
 sc/source/core/tool/userlist.cxx |   17 ++---------------
 2 files changed, 2 insertions(+), 18 deletions(-)

New commits:
commit 83eee0095c337e454acd5368f70855e34ec4a174
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jun 4 14:34:47 2023 +0200
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jun 4 16:50:36 2023 +0200

    ScUserListData::InitTokens can't produce different splits
    
    ... for the same input, because ScGlobal::cListDelimiter is a constant.
    This means, that the copy ctor and assignment operator can be default,
    and ScUserListData comparison can be simplified.
    
    Change-Id: I500892ab592fd0dd24550c5189151f670efed4d3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152541
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx
index 1cf759e463e7..b421c33370db 100644
--- a/sc/inc/userlist.hxx
+++ b/sc/inc/userlist.hxx
@@ -46,9 +46,6 @@ private:
 
 public:
     ScUserListData(OUString aStr);
-    // Copy ctor and assignment operator re-initialize tokens. Is this 
intended on copy?
-    ScUserListData(const ScUserListData& rData);
-    ScUserListData& operator=(const ScUserListData& rData);
 
     const OUString& GetString() const { return aStr; }
     void SetString(const OUString& rStr);
diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx
index 984b51c1058e..b91d3ba3819a 100644
--- a/sc/source/core/tool/userlist.cxx
+++ b/sc/source/core/tool/userlist.cxx
@@ -34,12 +34,11 @@ ScUserListData::SubStr::SubStr(OUString aReal, OUString 
aUpper) :
 
 void ScUserListData::InitTokens()
 {
-    sal_Unicode cSep = ScGlobal::cListDelimiter;
     maSubStrings.clear();
     sal_Int32 nIndex = 0;
     do
     {
-        OUString aSub = aStr.getToken(0, cSep, nIndex);
+        OUString aSub = aStr.getToken(0, ScGlobal::cListDelimiter, nIndex);
         if (!aSub.isEmpty())
         {
             OUString aUpStr = ScGlobal::getCharClass().uppercase(aSub);
@@ -54,18 +53,6 @@ ScUserListData::ScUserListData(OUString _aStr) :
     InitTokens();
 }
 
-ScUserListData::ScUserListData(const ScUserListData& rData) :
-    aStr(rData.aStr)
-{
-    InitTokens();
-}
-
-ScUserListData& ScUserListData::operator=(const ScUserListData& rData)
-{
-    SetString(rData.aStr);
-    return *this;
-}
-
 void ScUserListData::SetString( const OUString& rStr )
 {
     aStr = rStr;
@@ -249,7 +236,7 @@ bool ScUserList::operator==( const ScUserList& r ) const
 {
     return std::equal(maData.begin(), maData.end(), r.maData.begin(), 
r.maData.end(),
         [](const ScUserListData& lhs, const ScUserListData& rhs) {
-            return (lhs.GetString() == rhs.GetString()) && (lhs.GetSubCount() 
== rhs.GetSubCount());
+            return lhs.GetString() == rhs.GetString();
         });
 }