summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-03-16 13:45:20 +0100
committerMiklos Vajna <vmiklos@collabora.com>2020-04-03 19:21:35 +0200
commit1b03ca23961c5661adfbcae5fe705001d649ea30 (patch)
tree659139a4101b1462867efee5194fa9f5b57142f3
parente677f2724c9a6838f90542881457029eaffc11cd (diff)
DOCX import: declare w14 as a supported feature
This is needed (but not enough) to support markup like this: <mc:AlternateContent> <mc:Choice Requires="w14"> <w:numFmt w:val="custom" w:format="001, 002, 003, ..."/> </mc:Choice> <mc:Fallback> <w:numFmt w:val="decimal"/> </mc:Fallback> </mc:AlternateContent> Change-Id: I598b0452b5d29624ed0a6795682c29a09fd0dcfe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90564 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins (cherry picked from commit b0887393ceb0bf283841fe212baf5be3571782b9) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91635 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index be825d2f01d3..906320088987 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -116,6 +116,7 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t nElement, const uno::Ref
static const char* aFeatures[] = {
"wps",
"wpg",
+ "w14",
};
for (const char *p : aFeatures)
{