diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-29 18:25:32 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-29 18:35:09 +0200 |
| commit | 27f58d539d2e322f5a1c68e406abfea783be3e6a (patch) | |
| tree | e4f6b410b6bb5b273ff538e27ee33f1ef7ba193d /sw | |
| parent | 337d3940d6dd3eecb904c171ef0e83e62ccd1baf (diff) | |
DOCX export: fix order of paragraph mark properties child elements
Change-Id: I9e272996b478abe138448d305a54920b762a89b5
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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 ); } |