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

Adam Co rattles2013 at gmail.com
Wed Dec 11 00:20:22 PST 2013


 sw/source/filter/ww8/docxattributeoutput.cxx |   17 -----------------
 1 file changed, 17 deletions(-)

New commits:
commit 545f87379d1a9afb66bb9e4e5f64243f02729357
Author: Adam Co <rattles2013 at gmail.com>
Date:   Mon Dec 2 18:08:53 2013 +0200

    Removed 'XML_lang' tag being auto-written in redline case
    
    When there was a redline in a DOCX file that relates to formatting -
    the DOCX exporter automatically assumed that if the 'after' properties
    contains an 'XML_lang' node - then also the 'before' properties
    should also contain the 'XML_lang' node - and this is wrong.
    
    Change-Id: I383e10c11c228dd6847fd8eecb35c5c23c5f955e
    Reviewed-on: https://gerrit.libreoffice.org/6900
    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 4ee5656..f580b77 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1500,23 +1500,6 @@ void DocxAttributeOutput::Redline( const SwRedlineData* pRedline)
                 FSNS( XML_w, XML_date ), aDate.getStr(),
                 FSEND );
 
-        if ( m_pCharLangAttrList )
-        {
-            if (m_pCharLangAttrList->hasAttribute(FSNS(XML_w, XML_val)))
-            {
-                m_pSerializer->mark();
-                m_pSerializer->startElementNS( XML_w, XML_rPr, FSEND );
-                sVal = m_pCharLangAttrList->getValue(FSNS(XML_w, XML_val));
-                sOVal = OUStringToOString(sVal, RTL_TEXTENCODING_UTF8);
-                m_pSerializer->startElementNS(XML_w, XML_lang,
-                    FSNS(XML_w, XML_val), sOVal.getStr(),
-                    FSEND);
-                m_pSerializer->endElementNS(XML_w, XML_lang);
-                m_pSerializer->endElementNS( XML_w, XML_rPr );
-                m_pSerializer->mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND );
-            }
-        }
-
         m_pSerializer->endElementNS( XML_w, XML_rPrChange );
 
         break;


More information about the Libreoffice-commits mailing list