diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-06 11:23:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-06 15:07:29 +0100 |
| commit | c2c7e4d8d99483f74a7aa357de89240eb83c99d3 (patch) | |
| tree | a34d5d8cc1eb13a8fbfcf029a1141dde20a591dc /oox | |
| parent | 131f3230d98f24faf57d9404e333cb1fb183345b (diff) | |
DOCX import: handle groupshapes inside wpg elements (groupshapes)
Change-Id: Icb44f91219f75103f469f38f96d843b8e8251e92
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/shapegroupcontext.cxx | 8 | ||||
| -rw-r--r-- | oox/source/shape/WpgContext.cxx | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx index bae6d4c55015..10e419f7edf9 100644 --- a/oox/source/drawingml/shapegroupcontext.cxx +++ b/oox/source/drawingml/shapegroupcontext.cxx @@ -88,11 +88,19 @@ ContextHandlerRef ShapeGroupContext::onCreateContext( sal_Int32 aElementToken, c case XML_grpSp: // group shape return new ShapeGroupContext( *this, mpGroupShapePtr, ShapePtr( new Shape( "com.sun.star.drawing.GroupShape" ) ) ); case XML_sp: // shape + case XML_wsp: return new ShapeContext( *this, mpGroupShapePtr, ShapePtr( new Shape( "com.sun.star.drawing.CustomShape" ) ) ); case XML_pic: // CT_Picture return new GraphicShapeContext( *this, mpGroupShapePtr, ShapePtr( new Shape( "com.sun.star.drawing.GraphicObjectShape" ) ) ); case XML_graphicFrame: // CT_GraphicalObjectFrame return new GraphicalObjectFrameContext( *this, mpGroupShapePtr, ShapePtr( new Shape( "com.sun.star.drawing.GraphicObjectShape" ) ), true ); + case XML_cNvGrpSpPr: + break; + case XML_grpSpLocks: + break; + default: + SAL_WARN("oox", "ShapeGroupContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken)); + break; } return this; diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx index f83fe75ced27..c8ca50508664 100644 --- a/oox/source/shape/WpgContext.cxx +++ b/oox/source/shape/WpgContext.cxx @@ -47,6 +47,12 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken return new oox::drawingml::ShapeContext(*this, mpShape, pShape); } break; + case XML_grpSp: + { + oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.GroupShape")); + return new oox::drawingml::ShapeGroupContext(*this, mpShape, pShape); + } + break; default: SAL_WARN("oox", "WpgContext::createFastChildContext: unhandled element: " << getBaseToken(nElementToken)); break; |