[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - editeng/source

[Noel Grandin (via logerrit)]

 editeng/source/misc/svxacorr.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c883980f994208e4c1b47d1f09828f661b42258f
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Nov 28 10:50:20 2019 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Nov 28 17:26:52 2019 +0100

    tdf#128659 Cannot add AutoCorrect entries
    
    regression from
        commit 77dec7588c9141b03f8ec0139eb96c298b26f261
        tdf#109158 improve sorting when loading large autocorrect file
    
    The insert operation in the maSortedVector case had the "check for
    duplicates" operation the wrong way around
    
    Change-Id: Id8a9d044c661668e74f01eb15635c35ca70da540
    Reviewed-on: https://gerrit.libreoffice.org/83344
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 208ca3d33d4e6dff9e70a3efa098628b02151729)
    Reviewed-on: https://gerrit.libreoffice.org/83992
    (cherry picked from commit d16962fb59e7326b2868f794bb6246e12e98ce0f)
    Reviewed-on: https://gerrit.libreoffice.org/84017
    Reviewed-by: V Stuart Foote <vstuart.foote at utsa.edu>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 5857301170bd..bc9d1f80fc47 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2663,7 +2663,8 @@ const SvxAutocorrWord* SvxAutocorrWordList::Insert(SvxAutocorrWord aWord) const
     else
     {
         auto it = std::lower_bound(mpImpl->maSortedVector.begin(), mpImpl->maSortedVector.end(), aWord, CompareSvxAutocorrWordList());
-        if (it != mpImpl->maSortedVector.end() && !CompareSvxAutocorrWordList()(aWord, *it))
+        CollatorWrapper& rCmp = ::GetCollatorWrapper();
+        if (it == mpImpl->maSortedVector.end() || rCmp.compareString( aWord.GetShort(), it->GetShort() ) != 0)
         {
             it = mpImpl->maSortedVector.insert(it, std::move(aWord));
             return &*it;