[Libreoffice-commits] core.git: xmloff/source
Michael Meeks
michael.meeks at suse.com
Mon Mar 18 03:57:04 PDT 2013
xmloff/source/draw/sdxmlexp.cxx | 2 ++
xmloff/source/draw/shapeexport.cxx | 2 ++
2 files changed, 4 insertions(+)
New commits:
commit 64595f591cdeebc389deee37adbc68e14f9a6286
Author: Michael Meeks <michael.meeks at suse.com>
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
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index b71f851..e2337d5 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -448,6 +448,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 30c814c..db38c9d 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1014,6 +1014,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
@@ -1257,6 +1258,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 );
}
More information about the Libreoffice-commits
mailing list