[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - oox/source

[Libreoffice Gerrit user]

 oox/source/export/drawingml.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c262dcbc1bc7d0293c971d01e323cc48e978872a
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Wed Jul 11 15:09:16 2018 +0300
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Sat Jul 14 23:57:01 2018 +0200

    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 at sil.org>
    (cherry picked from commit 10272122b2ace68add7d2b0191aa516558f8401f)
    Reviewed-on: https://gerrit.libreoffice.org/57442
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index d83f9165656f..d123095a305d 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2035,7 +2035,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");