oox/source/export/shapes.cxx | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-)
New commits: commit d47ca56c8019d7112dbbc99853f9e081d04b93ff Author: Michael Meeks <[email protected]> Date: Thu May 2 11:22:41 2013 +0100 fdo#60549 - pptx export presentation as well as draw shape objects. Change-Id: Ibe6e0b9fa55bab7a7d02e55560c1db4c8ed84132 Signed-off-by: Muthu Subramanian <[email protected]> diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 87b8e55..af43620 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -826,11 +826,18 @@ void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, Graph if( NonEmptyText( xShape ) ) { - WriteTextShape( xShape ); + // avoid treating all 'IsPresentationObject' objects as having text. + Reference< XSimpleText > xText( xShape, UNO_QUERY ); - //DBG(dump_pset(mXPropSet)); + if( xText.is() && xText->getString().getLength() ) + { + DBG(printf("graphicObject: wrote only text\n")); - return; + WriteTextShape( xShape ); + + //DBG(dump_pset(mXPropSet)); + return; + } } DBG(printf("graphicObject without text\n")); @@ -1126,6 +1133,12 @@ static const NameToConvertMapType& lcl_GetConverters() shape_converters[ "com.sun.star.drawing.OLE2Shape" ] = &ShapeExport::WriteOLE2Shape; shape_converters[ "com.sun.star.drawing.TableShape" ] = &ShapeExport::WriteTableShape; shape_converters[ "com.sun.star.drawing.TextShape" ] = &ShapeExport::WriteTextShape; + + shape_converters[ "com.sun.star.presentation.GraphicObjectShape" ] = &ShapeExport::WriteGraphicObjectShape; + shape_converters[ "com.sun.star.presentation.OLE2Shape" ] = &ShapeExport::WriteOLE2Shape; + shape_converters[ "com.sun.star.presentation.TableShape" ] = &ShapeExport::WriteTableShape; + shape_converters[ "com.sun.star.presentation.TextShape" ] = &ShapeExport::WriteTextShape; + shape_converters[ "com.sun.star.presentation.DateTimeShape" ] = &ShapeExport::WriteTextShape; shape_converters[ "com.sun.star.presentation.FooterShape" ] = &ShapeExport::WriteTextShape; shape_converters[ "com.sun.star.presentation.HeaderShape" ] = &ShapeExport::WriteTextShape; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
