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

[Miklos Vajna (via logerrit)]

 sw/source/uibase/shells/textsh1.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1721cc19fc6d5bd587642a13919e004d4636d7f2
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Jul 16 09:09:52 2021 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Mon Jul 19 15:54:41 2021 +0200

    sw: xDictionary may be an empty reference in SID_SPELLCHECK_IGNORE_ALL
    
    Seen in a crashreport:
    
            handleFatalSignal
                    ./common/SigUtil.cpp:255
    /lib/x86_64-linux-gnu/libpthread.so.0
            __restore_rt
                    ??:?
    program/../program/libswlo.so
            SwTextShell::Execute(SfxRequest&)
                    sw/source/uibase/shells/textsh1.cxx:1496
    
    Change-Id: I709f361a1396abbb07cea06509afc41bb5f5c9a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119067
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 801b607fc6b3890eb36d310074f1a68db9ae1f5e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119173
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    (cherry picked from commit 426c6ee3b4dfe64d07e7e01eefd1d16defa913bf)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119176
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index a41c9e9d3d9c..7ebde86a383c 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1505,7 +1505,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             OUString sWord(xSpellAlt->getWord());
             linguistic::DictionaryError nAddRes = linguistic::AddEntryToDic( xDictionary,
                     sWord, false, OUString() );
-            if (linguistic::DictionaryError::NONE != nAddRes && !xDictionary->getEntry(sWord).is())
+            if (linguistic::DictionaryError::NONE != nAddRes && xDictionary.is() && !xDictionary->getEntry(sWord).is())
             {
                 SvxDicError(rWrtSh.GetView().GetFrameWeld(), nAddRes);
             }