From 27f58d539d2e322f5a1c68e406abfea783be3e6a Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Mon, 29 Sep 2014 18:25:32 +0200
Subject: DOCX export: fix order of paragraph mark properties child elements

Change-Id: I9e272996b478abe138448d305a54920b762a89b5
---
 sw/source/filter/ww8/docxattributeoutput.cxx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sw')

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 14b31d963548..16f470041f53 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -891,6 +891,8 @@ void DocxAttributeOutput::EndParagraphProperties( const SfxItemSet* pParagraphMa
     if ( pRedlineParagraphMarkerDeleted || pRedlineParagraphMarkerInserted || pParagraphMarkerProperties)
     {
         m_pSerializer->startElementNS( XML_w, XML_rPr, FSEND );
+        // mark() before paragraph mark properties child elements.
+        InitCollectedRunProperties();
 
         if(pParagraphMarkerProperties)
         {
@@ -948,6 +950,8 @@ void DocxAttributeOutput::EndParagraphProperties( const SfxItemSet* pParagraphMa
             EndRedline( pRedlineParagraphMarkerInserted );
         }
 
+        // mergeTopMarks() after paragraph mark properties child elements.
+        m_pSerializer->mergeTopMarks();
         m_pSerializer->endElementNS( XML_w, XML_rPr );
     }
 
-- 
cgit