[Libreoffice-commits] .: sw/source

[Libreoffice Gerrit user]

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

New commits:
commit 82c46f1877c65042ac976312267c14bf0e5847f4
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Mon Aug 20 05:36:21 2012 +0200

    fdo#53175: docx export, close hyperlinks before fields
    
    Change-Id: Ic723149675c3fe2fca08c4ec095d14c5a39f4a8f

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index cbca1b6..c3143e1 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -575,17 +575,18 @@ void DocxAttributeOutput::EndRun()
 
     WritePostponedMath();
 
-    while ( m_Fields.begin() != m_Fields.end() )
-    {
-        EndField_Impl( m_Fields.front( ) );
-        m_Fields.erase( m_Fields.begin( ) );
-    }
+    // Close fields before any field end as we have started them after the field
     if ( m_closeHyperlinkInThisRun )
     {
         m_pSerializer->endElementNS( XML_w, XML_hyperlink );
         m_closeHyperlinkInThisRun = false;
     }
 
+    while ( m_Fields.begin() != m_Fields.end() )
+    {
+        EndField_Impl( m_Fields.front( ) );
+        m_Fields.erase( m_Fields.begin( ) );
+    }
     // if there is some redlining in the document, output it
     EndRedline();
 }