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 /writerfilter | |
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
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4 |
1 files changed, 0 insertions, 4 deletions
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; |