diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-06 15:57:43 +0200 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-06-06 16:50:04 +0200 |
| commit | 46d682eec92bb241f4604a4b6ab42a3859cd0d48 (patch) | |
| tree | 1e691d8f2e96473dc2af3ef95b484d97d53ef5a8 /oox/source/ppt | |
| parent | 37183595bb3b4d58682f90fd9f6713bedcb852a2 (diff) | |
bnc#880763: PPTX import: wrong z-order becuause of wrong import order
importExtDrawings() must be called as soon as possible,
before parser starts to parse the next shape.
Call it when graphicFrame tag is closed. This tag include
the reference to the SmartArt.
Plus fix up import tests.
Change-Id: I9e8d54c2b1afeb78a1122390dc4982d580c152ae
Diffstat (limited to 'oox/source/ppt')
| -rw-r--r-- | oox/source/ppt/pptshapegroupcontext.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx index 0fd517f0c14c..9bf3d2bd5383 100644 --- a/oox/source/ppt/pptshapegroupcontext.cxx +++ b/oox/source/ppt/pptshapegroupcontext.cxx @@ -109,8 +109,6 @@ ContextHandlerRef PPTShapeGroupContext::onCreateContext( sal_Int32 aElementToken return new PPTGraphicShapeContext( *this, mpSlidePersistPtr, mpGroupShapePtr, oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.GraphicObjectShape" ) ) ); case PPT_TOKEN( graphicFrame ): // CT_GraphicalObjectFrame { - if( pGraphicShape ) - importExtDrawings(); pGraphicShape = oox::drawingml::ShapePtr( new PPTShape( meShapeLocation, "com.sun.star.drawing.OLE2Shape" ) ); return new oox::drawingml::GraphicalObjectFrameContext( *this, mpGroupShapePtr, pGraphicShape, true ); } @@ -150,11 +148,6 @@ void PPTShapeGroupContext::applyFontRefColor(oox::drawingml::ShapePtr pShape, co } } -void PPTShapeGroupContext::onEndElement() -{ - importExtDrawings(); -} - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |