[Libreoffice-commits] .: sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Jan 14 07:50:26 PST 2013


 sw/source/filter/ww8/docxattributeoutput.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 8c178a50334109b34ef456ca6aa51cd3d98699ae
Author: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>
Date:   Fri Jan 11 14:38:12 2013 +0100

    docx export: also export rPr in <pPr> (paragraph mark styling)
    
    Change-Id: I179363e7d0acc3d6a1f95dcfe975275a9243e863
    Reviewed-on: https://gerrit.libreoffice.org/1649
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 273287b..e72e924 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -442,6 +442,9 @@ void DocxAttributeOutput::EndParagraphProperties()
 {
     WriteCollectedParagraphProperties();
 
+    // insert copy of <rPr>
+    m_pSerializer->copyTopMarkPop();
+
     m_pSerializer->endElementNS( XML_w, XML_pPr );
 
     if ( m_nColBreakStatus == COLBRK_WRITE )
@@ -973,6 +976,9 @@ void DocxAttributeOutput::EndRunProperties( const SwRedlineData* /*pRedlineData*
 
     m_pSerializer->endElementNS( XML_w, XML_rPr );
 
+    // Clone <rPr>...</rPr> for later re-use, in pPr
+    m_pSerializer->copyTopMarkPush();
+
     // write footnotes/endnotes if we have any
     FootnoteEndnoteReference();
 


More information about the Libreoffice-commits mailing list