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

Miklos Vajna (via logerrit) logerrit at kemper.freedesktop.org
Mon Jul 19 06:58:14 UTC 2021


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

New commits:
commit ccfedba1b951b2ae0cf949259b4ac122f4412f47
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Fri Jul 16 09:09:52 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Jul 19 08:57:40 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/+/119006
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119061
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 35af8293101e..7fa40dba919e 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1495,7 +1495,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);
             }


More information about the Libreoffice-commits mailing list