From 643da8ec4e721d33dfdf8d78bedd50a915f1188d Mon Sep 17 00:00:00 2001 From: Paul Trojahn Date: Sat, 24 Jun 2017 13:46:46 +0200 Subject: Fix PageShape export to pptx The export code is not called, because the PageShape is actually of type presentation.PageShape and not drawing.PageShape. A PageShape has no text at all, which results in an empty p:txBody element that fails validation, so it needs to be checked first if the shape actually has text. Change-Id: I559f15c2396739c74d5c4f36eb952754bc040ce8 Reviewed-on: https://gerrit.libreoffice.org/38574 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- oox/source/export/shapes.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'oox') diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 810391e22623..4775b1bfb901 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -1445,7 +1445,8 @@ ShapeExport& ShapeExport::WriteTextBox( const Reference< XInterface >& xIface, s } } - if( NonEmptyText( xIface ) ) + Reference< XText > xXText( xIface, UNO_QUERY ); + if( NonEmptyText( xIface ) && xXText.is() ) { FSHelperPtr pFS = GetFS(); -- cgit