From 31c65a129afb3c1bf14a1acd88c60b64d4f555d1 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 5 Dec 2013 18:20:51 +0100 Subject: [PATCH] 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 --- sw/qa/extras/ooxmlimport/data/mce-nested.docx | Bin 0 -> 28318 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 10 ++++++++++ .../source/ooxml/OOXMLFastContextHandler.cxx | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 sw/qa/extras/ooxmlimport/data/mce-nested.docx diff --git a/sw/qa/extras/ooxmlimport/data/mce-nested.docx b/sw/qa/extras/ooxmlimport/data/mce-nested.docx new file mode 100644 index 0000000000000000000000000000000000000000..c110f63dae40b8fbb860dba73eb1ad89973f3f9f GIT binary patch literal 28318 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 xTextFramesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY); + uno::Reference xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY); + // positionV's posOffset from the bugdoc, was 0. + CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(2514600)), getProperty(xFrame, "VertOrientPosition")); +} + DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx") { // The document contains a rotated bitmap 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(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