xmloff/source/draw/sdxmlexp.cxx | 2 ++ xmloff/source/draw/shapeexport.cxx | 2 ++ 2 files changed, 4 insertions(+)
New commits: commit ced7d3008c15643a3e35b8d0bc8391e847476a62 Author: Michael Meeks <[email protected]> Date: Mon Mar 18 10:53:00 2013 +0000 fdo#61256 - the Get.*Export methods also create and register styles unwind problem introduced by cleanup in: fd226710fef768543a3ad0fe5081f79dc875dcf3 Change-Id: Id5f7b20087cbbdeffe1a2e64e039ee0a11995faa Reviewed-on: https://gerrit.libreoffice.org/2815 Reviewed-by: Stephan Bergmann <[email protected]> Reviewed-by: Fridrich Strba <[email protected]> Reviewed-by: Petr Mladek <[email protected]> Tested-by: Petr Mladek <[email protected]> diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index e80ccda..632a28d 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -447,6 +447,8 @@ void SAL_CALL SdXMLExport::setSourceDocument( const Reference< lang::XComponent // construct PropertySetMapper UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( aFactoryRef); + // get or create text paragraph export + GetTextParagraphExport(); mpPropertySetMapper = new XMLShapeExportPropertyMapper( xMapper, *this ); // set lock to avoid deletion mpPropertySetMapper->acquire(); diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index 8a39d02..a4c71b4 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -1013,6 +1013,7 @@ SvXMLExportPropertyMapper* XMLShapeExport::CreateShapePropMapper( { UniReference< XMLPropertyHandlerFactory > xFactory = new XMLSdPropHdlFactory( rExport.GetModel(), rExport ); UniReference < XMLPropertySetMapper > xMapper = new XMLShapePropertySetMapper( xFactory ); + rExport.GetTextParagraphExport(); // get or create text paragraph export SvXMLExportPropertyMapper* pResult = new XMLShapeExportPropertyMapper( xMapper, rExport ); // chain text attributes @@ -1262,6 +1263,7 @@ const rtl::Reference< XMLTableExport >& XMLShapeExport::GetShapeTableExport() { rtl::Reference< XMLPropertyHandlerFactory > xFactory( new XMLSdPropHdlFactory( mrExport.GetModel(), mrExport ) ); UniReference < XMLPropertySetMapper > xMapper( new XMLShapePropertySetMapper( xFactory.get() ) ); + mrExport.GetTextParagraphExport(); // get or create text paragraph export rtl::Reference< SvXMLExportPropertyMapper > xPropertySetMapper( new XMLShapeExportPropertyMapper( xMapper, mrExport ) ); mxShapeTableExport = new XMLTableExport( mrExport, xPropertySetMapper, xFactory ); } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
