oox/source/export/shapes.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 9d43654080fcc5942610f57cbfec9827b9da2102
Author: Paul Trojahn <paul.troj...@gmail.com>
Date: Sat Jun 24 13:46:46 2017 +0200
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 <c...@libreoffice.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/42002
Reviewed-by: Jan Holesovsky <ke...@collabora.com>
Tested-by: Jan Holesovsky <ke...@collabora.com>
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 066a1ecf1021..c4edcf07f1bb 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1450,7 +1450,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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
