summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2018-07-11 15:09:16 +0300
committerJustin Luth <justin_luth@sil.org>2018-07-11 17:20:10 +0200
commit10272122b2ace68add7d2b0191aa516558f8401f (patch)
treead46a8116e249de2d06cc02b54a48eec8dbf2b20
parent85f4ec6e0ebf4f97c1253c723d3c9c9b823ae372 (diff)
related tdf#114845 oox: ensure rXShape.is()
Change-Id: Ic5a78d3f650bff82ce8d86a62ecfc025ca2062e0 Reviewed-on: https://gerrit.libreoffice.org/57276 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
-rw-r--r--oox/source/export/drawingml.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c9c390970440..039e41217ae2 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2090,7 +2090,7 @@ bool DrawingML::IsInGroupShape () const
bool DrawingML::IsGroupShape( const Reference< XShape >& rXShape, bool bOrChildShape ) const
{
bool bRet = bOrChildShape && IsInGroupShape();
- if ( !bRet )
+ if ( !bRet && rXShape.is() )
{
uno::Reference<lang::XServiceInfo> xServiceInfo(rXShape, uno::UNO_QUERY_THROW);
bRet = xServiceInfo->supportsService("com.sun.star.drawing.GroupShape");