Kaydet (Commit) c262dcbc authored tarafından Justin Luth's avatar Justin Luth Kaydeden (comit) Eike Rathke

related tdf#114845 oox: ensure rXShape.is()

Change-Id: Ic5a78d3f650bff82ce8d86a62ecfc025ca2062e0
Reviewed-on: https://gerrit.libreoffice.org/57276
Tested-by: Jenkins
Reviewed-by: 's avatarJustin Luth <justin_luth@sil.org>
(cherry picked from commit 10272122)
Reviewed-on: https://gerrit.libreoffice.org/57442Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
üst 4a8ecfd9
...@@ -2035,7 +2035,7 @@ bool DrawingML::IsInGroupShape () const ...@@ -2035,7 +2035,7 @@ bool DrawingML::IsInGroupShape () const
bool DrawingML::IsGroupShape( const Reference< XShape >& rXShape, bool bOrChildShape ) const bool DrawingML::IsGroupShape( const Reference< XShape >& rXShape, bool bOrChildShape ) const
{ {
bool bRet = bOrChildShape && IsInGroupShape(); bool bRet = bOrChildShape && IsInGroupShape();
if ( !bRet ) if ( !bRet && rXShape.is() )
{ {
uno::Reference<lang::XServiceInfo> xServiceInfo(rXShape, uno::UNO_QUERY_THROW); uno::Reference<lang::XServiceInfo> xServiceInfo(rXShape, uno::UNO_QUERY_THROW);
bRet = xServiceInfo->supportsService("com.sun.star.drawing.GroupShape"); bRet = xServiceInfo->supportsService("com.sun.star.drawing.GroupShape");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment