[Libreoffice-commits] core.git: sw/source

[Adam Co]

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

New commits:
commit a8c378805a5b384e46bd0fd292fb6f7142aca2dc
Author: Adam Co <rattles2013 at gmail.com>
Date:   Mon Dec 2 18:04:46 2013 +0200

    moved 'mergeTopMarks' out of 'WriteCollectedRunProperties'
    
    The reason for this - is that the function 'WriteCollectedRunProperties'
    needs to be used by the redline exporter (to export collected 'redlined'
    properties) - and the 'mergeTopMarks' is not needed there.
    
    Change-Id: I10063b2f28adab53949b4d9de8acd0dab66553b0
    Reviewed-on: https://gerrit.libreoffice.org/6899
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index b546b37..4ee5656 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -599,15 +599,15 @@ void DocxAttributeOutput::WriteCollectedParagraphProperties()
 
         m_pSerializer->singleElementNS( XML_w, XML_spacing, xAttrList );
     }
-
-    // Merge the marks for the ordered elements
-    m_pSerializer->mergeTopMarks( );
 }
 
 void DocxAttributeOutput::EndParagraphProperties()
 {
     WriteCollectedParagraphProperties();
 
+    // Merge the marks for the ordered elements
+    m_pSerializer->mergeTopMarks( );
+
     // insert copy of <rPr>
     m_pSerializer->copyTopMarkPop();
 
@@ -1153,9 +1153,6 @@ void DocxAttributeOutput::WriteCollectedRunProperties()
 
         m_pSerializer->singleElementNS( XML_w, XML_lang, xAttrList );
     }
-
-    // Merge the marks for the ordered elements
-    m_pSerializer->mergeTopMarks();
 }
 
 void DocxAttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData )
@@ -1166,6 +1163,9 @@ void DocxAttributeOutput::EndRunProperties( const SwRedlineData* pRedlineData )
 
     WriteCollectedRunProperties();
 
+    // Merge the marks for the ordered elements
+    m_pSerializer->mergeTopMarks();
+
     m_pSerializer->endElementNS( XML_w, XML_rPr );
 
     // Clone <rPr>...</rPr> for later re-use, in pPr
@@ -1518,6 +1518,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedline)
         }
 
         m_pSerializer->endElementNS( XML_w, XML_rPrChange );
+
         break;
     default:
         SAL_WARN("sw.ww8", "Unhandled redline type for export " << pRedline->GetType());
@@ -3889,11 +3890,19 @@ void DocxAttributeOutput::EndStyleProperties( bool bParProp )
     if ( bParProp )
     {
         WriteCollectedParagraphProperties();
+
+        // Merge the marks for the ordered elements
+        m_pSerializer->mergeTopMarks( );
+
         m_pSerializer->endElementNS( XML_w, XML_pPr );
     }
     else
     {
         WriteCollectedRunProperties();
+
+        // Merge the marks for the ordered elements
+        m_pSerializer->mergeTopMarks();
+
         m_pSerializer->endElementNS( XML_w, XML_rPr );
     }
 }