diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-03 11:59:42 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-03 15:39:04 +0100 |
| commit | 57450afb768c085df0ba2344aa94b5f843060178 (patch) | |
| tree | 19a4c28083ee2414102d70db2fcf6bd8ec410799 | |
| parent | ddbeaada1c7abb0fee88e709f3d6d824f06b39e0 (diff) | |
DOCX import: declare wps as a supported feature
This means in case we hit an mc:AlternateContent element, we will read
the mc:Choice branch of it, in case wps is the required feature, not the
mc:Fallback one, which contains the information in VML format (after a
lossy conversion).
Change-Id: I476156bd1a39927dda903d14540155d1e62a211e
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/mce.docx | bin | 0 -> 15667 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 6 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/mce.docx b/sw/qa/extras/ooxmlexport/data/mce.docx Binary files differnew file mode 100644 index 000000000000..d4790de4114c --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/mce.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 0bb2359d207d..084968c226b1 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2034,6 +2034,12 @@ DECLARE_OOXMLEXPORT_TEST(testOoxmlTriangle, "ooxml-triangle.docx") getShape(1); } +DECLARE_OOXMLEXPORT_TEST(testMce, "mce.docx") +{ + // The shape is red in Word2007, green in Word2010. Check that our import follows the later. + CPPUNIT_ASSERT_EQUAL(sal_Int32(0x9bbb59), getProperty<sal_Int32>(getShape(1), "FillColor")); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 35a63269a6f4..5cdcef4edf5e 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -186,7 +186,6 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Ref break; case OOXML_Choice: { -#if 0 // Disabled for now: enabling "wps" would introduce regressions, and SAL_N_ELEMENTS() needs at least one element. OUString aRequires = rAttribs->getOptionalValue(OOXML_Requires); static const char* aFeatures[] = { "wps", @@ -199,9 +198,6 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Ref return false; } } -#else - (void) rAttribs; -#endif return true; } break; |