Kaydet (Commit) 516c4f2a authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

Revert "fdo#53175: docx export, close hyperlinks before fields"

This reverts commit 82c46f18 as it breaks
a unit test. Needs to find a better fix.
üst b95d203b
...@@ -575,18 +575,17 @@ void DocxAttributeOutput::EndRun() ...@@ -575,18 +575,17 @@ void DocxAttributeOutput::EndRun()
WritePostponedMath(); WritePostponedMath();
// Close fields before any field end as we have started them after the field while ( m_Fields.begin() != m_Fields.end() )
{
EndField_Impl( m_Fields.front( ) );
m_Fields.erase( m_Fields.begin( ) );
}
if ( m_closeHyperlinkInThisRun ) if ( m_closeHyperlinkInThisRun )
{ {
m_pSerializer->endElementNS( XML_w, XML_hyperlink ); m_pSerializer->endElementNS( XML_w, XML_hyperlink );
m_closeHyperlinkInThisRun = false; 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 // if there is some redlining in the document, output it
EndRedline(); EndRedline();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment