diff options
| author | Korrawit Pruegsanusak <detective.conan.1412@gmail.com> | 2012-10-12 21:09:42 +0700 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-10-22 15:48:40 +0200 |
| commit | d4287fb59bc2bc6cf54fe0ea2786b48ad3afa982 (patch) | |
| tree | 5d50a5c71aae82d611d9fc983f4e3362832af84c | |
| parent | d8643c11d4c89f0534b3caebd4e0fbf212777140 (diff) | |
Fix fdo#47669: also check if we started the tag before ending it
The problem is we created imbalance end tag </w:hyperlink> which shouldn't
be there. So, place a check before inserting end tag should help.
Inspired by (read: copied from) c1c2688912e769dfd7654e11e87dae380a8ce1eb ;)
(cherry picked from commit 3b042335208cb2c995f4860bf8ba3bd1e2f2e859)
Change-Id: Ic933f6da44c788cba48bb2fe6fa29658985310b6
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 179c2f62204e..387c9ea419be 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -546,7 +546,11 @@ void DocxAttributeOutput::EndRun() if ( m_closeHyperlinkInPreviousRun ) { - m_pSerializer->endElementNS( XML_w, XML_hyperlink ); + if ( m_startedHyperlink ) + { + m_pSerializer->endElementNS( XML_w, XML_hyperlink ); + m_startedHyperlink = false; + } m_closeHyperlinkInPreviousRun = false; } |