oox/source/export/drawingml.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 7f4f9daeaa1655fea2157dff1eed6f6502bcdb50 Author: Justin Luth <[email protected]> AuthorDate: Wed Jul 11 15:09:16 2018 +0300 Commit: Eike Rathke <[email protected]> CommitDate: Sat Jul 14 22:17:36 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 <[email protected]> (cherry picked from commit 10272122b2ace68add7d2b0191aa516558f8401f) Reviewed-on: https://gerrit.libreoffice.org/57279 Reviewed-by: Eike Rathke <[email protected]> diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 8992ff3ba0ba..af1e76fc03b9 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"); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
