[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - editeng/source

[Julien Nabet (via logerrit)]

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

New commits:
commit 8f2f805b07ddb3450b48e32dc7171625d81d8a84
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat Jan 9 20:47:24 2021 +0100
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sun Jan 10 13:37:43 2021 +0100

    tdf#96787: AutoCorrect: after deleting a replacement entry, it's still used
    
    If specific acor<language>.dat exists in "user", don't use the initial one in "share"
    since the initial one will still contain the deleted entry.
    
    See detailed explanation here:
    https://bugs.documentfoundation.org/show_bug.cgi?id=96787#c21
    Change-Id: Ic349159c93d9fc327f38a1d4e8187e3bdc16d08a
    
    Change-Id: If6b16641d04721f2945a8e920e2933d1b8baa90f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109039
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit ae56dc05b27f05ffcee99845d661a237e70a7a51)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108998
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index feab628d7f04..a888f4474a34 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1941,6 +1941,8 @@ const SvxAutocorrWord* SvxAutoCorrect::SearchWordsInList(
             rLang = aLanguageTag;
             return pRet;
         }
+        else
+            return nullptr;
     }
 
     // If it still could not be found here, then keep on searching