diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-05 18:20:51 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-05 18:34:54 +0100 |
commit | 31c65a129afb3c1bf14a1acd88c60b64d4f555d1 (patch) | |
tree | 02eb7ff34f06b8527aad655c3851947ec25c3a2d /writerfilter | |
parent | b780e0c263edf7124d261a616a5daed723cc2cf6 (diff) |
DOCX import: never call lcl_start/endElement if handling mce elements
The problem was that after handling the mce elements
(AlternativeContent, Choice, Fallback) we still invoked the lcl version
of these methods and this resulted in duplicated properties in the
dmapper, finally resulting in incorrect position of the textbox.
Change-Id: Ib581162cba703fc1e2e44c1a9e63358891d6f78c
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index ed1ae178a0e5..a50f449bd83c 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -242,7 +242,7 @@ void SAL_CALL OOXMLFastContextHandler::startFastElement if (oox::getNamespace(Element) == static_cast<sal_Int32>(NS_mce)) m_bDiscardChildren = prepareMceContext(Element, Attribs); - if (!m_bDiscardChildren) + else if (!m_bDiscardChildren) { attributes(Attribs); lcl_startFastElement(Element, Attribs); @@ -283,7 +283,7 @@ throw (uno::RuntimeException, xml::sax::SAXException) m_bTookChoice = aState.m_bTookChoice; } - if (!m_bDiscardChildren) + else if (!m_bDiscardChildren) lcl_endFastElement(Element); #ifdef DEBUG_CONTEXT_HANDLER |