[Libreoffice-commits] core.git: Branch 'libreoffice-6-4-0' - svx/source

[Serge Krot (via logerrit)]

 svx/source/accessibility/AccessibleShape.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1561a4f3f595bea5f0fe201310b04600704e2ea1
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Wed Jan 8 21:18:20 2020 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Jan 9 09:34:34 2020 +0100

    tdf#129887: fix crash during scrolling down document
    
    regression from tdf#129708
    
    Change-Id: I6c5d7eb90030234e899ab8ce5b3adec33e03962a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86454
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit a3c3f21a742f7c7f587bd63ee2617a150bb39b96)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86460
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 75265fad67c38827aec074e99e010109f9219079)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86461
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index debd4fa7243e..f248df629ff0 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -159,7 +159,7 @@ void AccessibleShape::Init()
             if( pSdrObject )
             {
                 SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>( pSdrObject  );
-                const bool hasOutlinerParaObject = pTextObj->CanCreateEditOutlinerParaObject() || pSdrObject->GetOutlinerParaObject() != nullptr;
+                const bool hasOutlinerParaObject = (pTextObj && pTextObj->CanCreateEditOutlinerParaObject()) || (pSdrObject->GetOutlinerParaObject() != nullptr);
 
                 // create AccessibleTextHelper to handle this shape's text
                 if( !hasOutlinerParaObject )