diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-04 11:49:33 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-04 12:13:33 +0100 |
| commit | cbeb028519d0383ae3089c48f9ceefe9ee817188 (patch) | |
| tree | e6877cfd2699ee4522765dece346202b82ee4401 /writerfilter | |
| parent | 14d49ded7177856f095d665edec92ddee5dbb86c (diff) | |
DOCX import: parse drawingML group shapes in oox only
This is similar to commit d5c934d150cb6cea5f96cbbee4fb5e8312bf027e
(n#792778 DOCX import: parse group shapes in oox only, 2012-12-14),
except that was for the VML importer.
The only difference is that in case of drawingML,
OOXMLFastContextHandlerShape::lcl_createFastChildContext() is only
called for the children of the group shape, not for the element itself,
so compare against the start token, not the current element.
Change-Id: Iddeabb20bbd5f0153e2fc4e6df463830126fdd37
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 5cdcef4edf5e..14787f73a0eb 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -2156,6 +2156,8 @@ OOXMLFastContextHandlerShape::lcl_createFastChildContext uno::Reference< xml::sax::XFastContextHandler > xContextHandler; bool bGroupShape = Element == Token_t(NS_vml | OOXML_group); + // drawingML version also counts as a group shape. + bGroupShape |= mrShapeContext->getStartToken() == Token_t(NS_wpg | OOXML_wgp); sal_uInt32 nNamespace = Element & 0xffff0000; switch (nNamespace) |