diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-11-06 17:05:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-08 10:28:04 -0600 |
| commit | 267addb68a7665e71d3f263030c05466d746cbc8 (patch) | |
| tree | 55030e5874a8a29ba422d5ce577b759501002ee8 /sw/source/filter/ww8 | |
| parent | 3fff431f152f23180e2ce58e7d1dc6b6b45ab332 (diff) | |
cp#1000015 DOCX export: fix not-well-formed XML on redline end + hyperlink
(cherry picked from commit 7813bd3113beb2b2860f9eb213c5c67ef54f5bf0)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I3a87a0277952ba0a422df8988151f8b14e166e06
Reviewed-on: https://gerrit.libreoffice.org/6606
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/filter/ww8')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index d7c008fac99a..15e2c558f519 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -648,6 +648,9 @@ void DocxAttributeOutput::EndRun() WritePostponedMath(); WritePendingPlaceholder(); + // if there is some redlining in the document, output it + EndRedline(); + if ( m_closeHyperlinkInThisRun ) { if ( m_startedHyperlink ) @@ -665,9 +668,6 @@ void DocxAttributeOutput::EndRun() delete m_Fields.front().pField; m_Fields.erase( m_Fields.begin( ) ); } - - // if there is some redlining in the document, output it - EndRedline(); } void DocxAttributeOutput::WriteCommentRanges() |