diff options
| author | Justin Luth <justin.luth@collabora.com> | 2018-07-11 15:09:16 +0300 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-07-14 23:57:01 +0200 |
| commit | c262dcbc1bc7d0293c971d01e323cc48e978872a (patch) | |
| tree | 999a27a7737571e6a52ef957bf61822c3f9b4178 | |
| parent | 4a8ecfd9fdb6d8460bc7eee8773580d4ae550b18 (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>
(cherry picked from commit 10272122b2ace68add7d2b0191aa516558f8401f)
Reviewed-on: https://gerrit.libreoffice.org/57442
Reviewed-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | oox/source/export/drawingml.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |