From 46d682eec92bb241f4604a4b6ab42a3859cd0d48 Mon Sep 17 00:00:00 2001 From: Zolnai Tamás Date: Fri, 6 Jun 2014 15:57:43 +0200 Subject: 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 --- include/oox/ppt/pptshapegroupcontext.hxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/oox/ppt') diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx index 847d9b6479ee..5cae54d241a9 100644 --- a/include/oox/ppt/pptshapegroupcontext.hxx +++ b/include/oox/ppt/pptshapegroupcontext.hxx @@ -32,7 +32,6 @@ class PPTShapeGroupContext : public ::oox::drawingml::ShapeGroupContext ShapeLocation meShapeLocation; oox::drawingml::ShapePtr pGraphicShape; - void importExtDrawings(); void applyFontRefColor(oox::drawingml::ShapePtr pShape, const oox::drawingml::Color& rFontRefColor); public: @@ -46,7 +45,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void onEndElement() SAL_OVERRIDE; + void importExtDrawings(); protected: -- cgit