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

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Mon Oct 14 20:32:47 UTC 2019


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

New commits:
commit 0836ea3ea6d56cf91e4da8d65b2bf6fd4466febd
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Mon Oct 14 17:42:27 2019 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Oct 14 22:32:08 2019 +0200

    tdf#128139: add missing nullptr check
    
    Regression after ef2ec07b4113fdadf863352c832af657b5ae205c
    
    Change-Id: I5eed95e8136a812813145283e6b533a808324380
    Reviewed-on: https://gerrit.libreoffice.org/80782
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 8a69d0212fa7e3f7f8f2ccf29f9393b9414282a2)
    Reviewed-on: https://gerrit.libreoffice.org/80795
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index ddf7c6a4902d..d48a5a4199c0 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2660,7 +2660,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
         if (bNormalChar)
         {
             const bool bAutoTextShown
-                = pACfg->IsAutoTextTip() && ShowAutoText(rSh.GetChunkForAutoText());
+                = pACfg && pACfg->IsAutoTextTip() && ShowAutoText(rSh.GetChunkForAutoText());
             if (!bAutoTextShown && pACorr && pACorr->GetSwFlags().bAutoCompleteWords)
                 ShowAutoCorrectQuickHelp(rSh.GetPrevAutoCorrWord(*pACorr), *pACorr);
         }


More information about the Libreoffice-commits mailing list