From 02b7ea6dae700d3793792faa35d501369382915d Mon Sep 17 00:00:00 2001
From: Justin Luth <justin.luth@collabora.com>
Date: Wed, 11 Jul 2018 15:09:16 +0300
Subject: 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>
(cherry picked from commit 10272122b2ace68add7d2b0191aa516558f8401f)
Reviewed-on: https://gerrit.libreoffice.org/57442
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit c262dcbc1bc7d0293c971d01e323cc48e978872a)
---
 oox/source/export/drawingml.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'oox/source')

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 72ae498eb31f..3b0e5506a545 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2057,7 +2057,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");
-- 
cgit