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

[Nikhil Walvekar]

 sw/source/filter/ww8/docxattributeoutput.cxx |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 7e4823772ceb00d18301497fdad1a5b2678872bf
Author: Nikhil Walvekar <nikhil.walvekar at synerzip.com>
Date:   Wed Jan 15 15:23:40 2014 +0530

    FILESAVE: DOCX Preserve Font information for Para marker
    
    Change-Id: Ic8cb9fec8a62f14e47899056beaededd791b590d
    Reviewed-on: https://gerrit.libreoffice.org/7438
    Tested-by: Adam CloudOn <rattles2013 at gmail.com>
    Reviewed-by: Adam CloudOn <rattles2013 at gmail.com>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 20ce7f0..c70a2a4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -519,6 +519,18 @@ void DocxAttributeOutput::EndParagraphProperties( const boost::shared_ptr<SfxIte
 
         if(pParagraphMarkerProperties)
         {
+            // The 'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList', 'm_pCharLangAttrList' are used to hold information
+            // that should be collected by different properties in the core, and are all flushed together
+            // to the DOCX when the function 'WriteCollectedRunProperties' gets called.
+            // So we need to store the current status of these lists, so that we can revert back to them when
+            // we are done exporting the redline attributes.
+            ::sax_fastparser::FastAttributeList *pFontsAttrList_Original           = m_pFontsAttrList;
+            ::sax_fastparser::FastAttributeList *pEastAsianLayoutAttrList_Original = m_pEastAsianLayoutAttrList;
+            ::sax_fastparser::FastAttributeList *pCharLangAttrList_Original        = m_pCharLangAttrList;
+            m_pFontsAttrList           = NULL;
+            m_pEastAsianLayoutAttrList = NULL;
+            m_pCharLangAttrList        = NULL;
+
             SfxWhichIter aIter( *pParagraphMarkerProperties );
             sal_uInt16 nWhichId = aIter.FirstWhich();
             const SfxPoolItem* pItem = 0;
@@ -532,18 +544,6 @@ void DocxAttributeOutput::EndParagraphProperties( const boost::shared_ptr<SfxIte
                 nWhichId = aIter.NextWhich();
             }
 
-            // The 'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList', 'm_pCharLangAttrList' are used to hold information
-            // that should be collected by different properties in the core, and are all flushed together
-            // to the DOCX when the function 'WriteCollectedRunProperties' gets called.
-            // So we need to store the current status of these lists, so that we can revert back to them when
-            // we are done exporting the redline attributes.
-            ::sax_fastparser::FastAttributeList *pFontsAttrList_Original           = m_pFontsAttrList;
-            ::sax_fastparser::FastAttributeList *pEastAsianLayoutAttrList_Original = m_pEastAsianLayoutAttrList;
-            ::sax_fastparser::FastAttributeList *pCharLangAttrList_Original        = m_pCharLangAttrList;
-            m_pFontsAttrList           = NULL;
-            m_pEastAsianLayoutAttrList = NULL;
-            m_pCharLangAttrList        = NULL;
-
             // Write the collected run properties that are stored in 'm_pFontsAttrList', 'm_pEastAsianLayoutAttrList', 'm_pCharLangAttrList'
             WriteCollectedRunProperties();