sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a5b84a6888deaa406786b350a0adcf9ef9020f48
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Aug 1 11:48:30 2018 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri Aug 3 10:55:03 2018 +0200
forcepoint#64 null deref
Change-Id: I4acf03a7911aa203fc4ef10b6a96b0135d6adbbc
Reviewed-on: https://gerrit.libreoffice.org/58415
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
index 75410c627865..a81396b1cf8b 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
@@ -201,7 +201,7 @@ void XMLTableShapeImportHelper::finishShape(
// the group
Point aStartPoint( rShape->getPosition().X,rShape->getPosition().Y
);
uno::Reference< drawing::XShape > xChild( rShapes, uno::UNO_QUERY
);
- if (SvxShape* pGroupShapeImp = SvxShape::getImplementation(
lcl_getTopLevelParent( xChild ) ))
+ if (SvxShape* pGroupShapeImp = xChild.is() ?
SvxShape::getImplementation(lcl_getTopLevelParent(xChild)) : nullptr)
{
if (SdrObject *pSdrObj = pGroupShapeImp->GetSdrObject())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
