summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerge Krot <Serge.Krot@cib.de>2020-01-08 21:18:20 +0100
committerXisco Faulí <xiscofauli@libreoffice.org>2020-01-09 09:34:34 +0100
commit1561a4f3f595bea5f0fe201310b04600704e2ea1 (patch)
treeba0bad7af2da2079e33a3395ba13a6aec70237c6
parentbump product version to 6.4.0.2.0+ (diff)
downloadcore-1561a4f3f595bea5f0fe201310b04600704e2ea1.tar.gz
core-1561a4f3f595bea5f0fe201310b04600704e2ea1.zip
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@yahoo.fr> Tested-by: Thorsten Behrens <Thorsten.Behrens@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@CIB.de> (cherry picked from commit 75265fad67c38827aec074e99e010109f9219079) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86461 Tested-by: Xisco Faulí <xiscofauli@libreoffice.org> Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx2
1 files changed, 1 insertions, 1 deletions
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 )