diff options
author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-08-20 11:30:51 +0200 |
---|---|---|
committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-08-20 11:32:57 +0200 |
commit | 516c4f2a7f0af06f7e6301128df9885599128291 (patch) | |
tree | 28dad05a713eb1b63c48db8955c5772445587e6b /sw | |
parent | b95d203bc17c83ec0fe5139f519d53ed1d842d3a (diff) |
Revert "fdo#53175: docx export, close hyperlinks before fields"
This reverts commit 82c46f1877c65042ac976312267c14bf0e5847f4 as it breaks
a unit test. Needs to find a better fix.
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c3143e123f31..cbca1b64a400 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -575,18 +575,17 @@ void DocxAttributeOutput::EndRun() 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 ) { 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(); } |