[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - svx/source

[Serge Krot (via logerrit)]

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

New commits:
commit d046a2cf14efe107db60050dc28667a5f78741f4
Author:     Serge Krot <Serge.Krot at cib.de>
AuthorDate: Wed Jan 8 21:18:20 2020 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Apr 28 01:10:48 2020 +0200

    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>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92651
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index 2d09f0f4db18..b67f4062722e 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -158,7 +158,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 )