summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-03-18 10:53:00 +0000
committerPetr Mladek <pmladek@suse.cz>2013-03-18 14:17:31 +0000
commitced7d3008c15643a3e35b8d0bc8391e847476a62 (patch)
tree91872646e1f3c44f5aae0cf8ac4fed92376b1a88
parent7ee2a988e5deee45f86ce41840934fc49ba2773a (diff)
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 <sbergman@redhat.com> Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
-rw-r--r--xmloff/source/draw/sdxmlexp.cxx2
-rw-r--r--xmloff/source/draw/shapeexport.cxx2
2 files changed, 4 insertions, 0 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index e80ccdac10be..632a28db7cca 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 8a39d027d57b..a4c71b474d99 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 );
}