summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorXisco Fauli <xiscofauli@libreoffice.org>2023-07-05 09:55:18 +0200
committerXisco Fauli <xiscofauli@libreoffice.org>2023-07-05 12:10:43 +0200
commit4567008914239b26533c1968820bf461d606f96d (patch)
treeb68c5449ce70697fa53745fcdc9f2dd02ad2f7e8 /oox
parent79ddca4def81198e3eee42eca8aca42fef964c80 (diff)
oox: fix crash in lcl_GetGluePointId
See https://crashreport.libreoffice.org/stats/signature/static%20long%20oox::drawingml::lcl_GetGluePointId(const%20class%20com::sun::star::uno::Reference%3Ccom::sun::star::drawing::XShape%3E%20&%20const,%20long) Regression from b7c542b5085374f1d031183cb86ceeefcf24964d "tdf#154363 sd: fix line connectors regression of mirrored shapes" Change-Id: I926d32f5b68582df588c28a800b0ec10e7e3e19f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154021 Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com> Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/export/shapes.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index efde8de56f72..fc702c1c3a22 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1675,7 +1675,8 @@ static sal_Int32 lcl_GetGluePointId(const Reference<XShape>& xShape, sal_Int32 n
bool bFlipH = false;
bool bFlipV = false;
Reference<XPropertySet> xShapeProps(xShape, UNO_QUERY);
- if (xShapeProps->getPropertySetInfo()->hasPropertyByName("CustomShapeGeometry"))
+ if (xShapeProps.is() && xShapeProps->getPropertySetInfo()
+ && xShapeProps->getPropertySetInfo()->hasPropertyByName("CustomShapeGeometry"))
{
Sequence<PropertyValue> aGeometrySeq;
xShapeProps->getPropertyValue("CustomShapeGeometry") >>= aGeometrySeq;