diff options
| author | Paul Trojahn <paul.trojahn@gmail.com> | 2017-06-24 13:46:46 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2017-09-06 16:13:07 +0200 |
| commit | 9d43654080fcc5942610f57cbfec9827b9da2102 (patch) | |
| tree | 593b8925cf95cbc7ef3243fe47113d82dde0af64 /oox | |
| parent | 9c0387ef602d84d0079828f0ad4b53ada7ab1d8a (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-on: https://gerrit.libreoffice.org/42002
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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(); |