[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - 2 commits - sw/source translations

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/textsh1.cxx |    4 +++-
 translations                        |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5ca39a9bd3ad005495eaede1755e20ff3e1a699f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Aug 23 16:55:27 2021 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Tue Aug 24 13:48:56 2021 +0200

    rhbz#1996735 SwEditShell::GetCorrection can return null
    
    Though the exact steps to reproduce are unknown. From the text seen in
    the backtrace the language is possibly Finnish in which case voikko is
    probably the spellchecking backend in use.
    
    Change-Id: I9b3186e4699946235ccc161575bba7d4a3820565
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120879
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Tested-by: Jenkins

diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 7fa40dba919e..7f000e1a59f1 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1490,7 +1490,9 @@ void SwTextShell::Execute(SfxRequest &rReq)
         else if (sApplyText == "Spelling")
         {
             SwRect aToFill;
-            uno::Reference< linguistic2::XSpellAlternatives >  xSpellAlt( rWrtSh.GetCorrection(nullptr, aToFill) );
+            uno::Reference<linguistic2::XSpellAlternatives>  xSpellAlt(rWrtSh.GetCorrection(nullptr, aToFill));
+            if (!xSpellAlt.is())
+                return;
             uno::Reference< linguistic2::XDictionary > xDictionary = LinguMgr::GetIgnoreAllList();
             OUString sWord(xSpellAlt->getWord());
             linguistic::DictionaryError nAddRes = linguistic::AddEntryToDic( xDictionary,
commit 2f8285c3d4dd4f9430300c52c248edec4d799682
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Tue Aug 24 13:48:33 2021 +0200
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Tue Aug 24 13:48:33 2021 +0200

    Update git submodules
    
    * Update translations from branch 'distro/collabora/co-2021'
      to 96ffb24921d7e554a3a353580b720915a95d2740
      - update translations for 7.1.6 rc1
    
        and force-fix errors using pocheck
    
        Change-Id: I01602df1c63103029e3c9198db5e7032addf89c2
    
      - update translations for 7.1.5 rc2
    
        and force-fix errors using pocheck
    
        Change-Id: I42501f3274956b38075932f254e33d4643a3040f

diff --git a/translations b/translations
index 5e70d5e11c07..96ffb24921d7 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 5e70d5e11c077090f4c8d43ca9816842bbdd6c6a
+Subproject commit 96ffb24921d7e554a3a353580b720915a95d2740