[PATCH libreoffice-4-0-2] fdo#61256 - the Get.*Export methods also create and register...

[Michael Meeks (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2815

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/15/2815/1

fdo#61256 - the Get.*Export methods also create and register styles

unwind problem introduced by cleanup in:
fd226710fef768543a3ad0fe5081f79dc875dcf3

Change-Id: Id5f7b20087cbbdeffe1a2e64e039ee0a11995faa
---
M xmloff/source/draw/sdxmlexp.cxx
M xmloff/source/draw/shapeexport.cxx
2 files changed, 4 insertions(+), 0 deletions(-)



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 @@
         // 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 @@
 {
     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 @@
     {
         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 );
     }

-- 
To view, visit https://gerrit.libreoffice.org/2815
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5f7b20087cbbdeffe1a2e64e039ee0a11995faa
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-2
Gerrit-Owner: Michael Meeks <michael.meeks at suse.com>