diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-03-18 10:53:00 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-03-18 10:53:00 +0000 |
| commit | 64595f591cdeebc389deee37adbc68e14f9a6286 (patch) | |
| tree | 693ff5ddcb374a5346cf54048ab621f23fbbcfbf | |
| parent | 38d0e65fa51a559b0f607b3f00f5db2527dbab57 (diff) | |
fdo#61256 - the Get.*Export methods also create and register styles
unwind problem introduced by cleanup in:
fd226710fef768543a3ad0fe5081f79dc875dcf3
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 2 | ||||
| -rw-r--r-- | xmloff/source/draw/shapeexport.cxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index b71f8513f20e..e2337d5029b7 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 30c814c2e777..db38c9d649c3 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 ); } |