summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-01-06 09:51:46 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-01-06 10:16:28 +0100
commit430246ef14e79643ff93a981d56086acd259d055 (patch)
tree59cd7f64dda22bcb063d30825857928c2112f742 /oox
parentc6d1ccd8024c9a90bf8f5732ce1e2b957e8048e7 (diff)
oox: handle pic:pic in WPG groupshape import
Change-Id: I7de11251bc4e1b58f9cb308e8b698d4c8c1a58d3
Diffstat (limited to 'oox')
-rw-r--r--oox/source/shape/WpgContext.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index 8e6c8ea429b3..6e3161269971 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -10,6 +10,7 @@
#include "WpgContext.hxx"
#include <oox/drawingml/shapepropertiescontext.hxx>
#include <oox/drawingml/shapegroupcontext.hxx>
+#include <oox/drawingml/graphicshapecontext.hxx>
using namespace com::sun::star;
@@ -54,6 +55,9 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken
return new oox::drawingml::ShapeContext(*this, mpShape, pShape);
}
break;
+ case XML_pic:
+ return new oox::drawingml::GraphicShapeContext(*this, mpShape, oox::drawingml::ShapePtr(new oox::drawingml::Shape("com.sun.star.drawing.GraphicObjectShape")));
+ break;
case XML_grpSp:
{
oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.GroupShape"));