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 17:55:02 +0200 |
| commit | 7c7c7dc785750769d661df1dc36201b9f5566ea1 (patch) | |
| tree | 989ed89c59676075079d8a6d8d96e16b5607a02e /include | |
| parent | e0c9b690074cd476b03169397cbf1969f2239c1e (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
(cherry picked from commit 46d682eec92bb241f4604a4b6ab42a3859cd0d48)
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/drawingml/graphicshapecontext.hxx | 2 | ||||
| -rw-r--r-- | include/oox/ppt/pptshapegroupcontext.hxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx index 72881fe4a1c9..fe4b216bc7a7 100644 --- a/include/oox/drawingml/graphicshapecontext.hxx +++ b/include/oox/drawingml/graphicshapecontext.hxx @@ -44,9 +44,11 @@ public: GraphicalObjectFrameContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr pMasterShapePtr, ShapePtr pShapePtr, bool bEmbedShapesInChart ); virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; private: bool mbEmbedShapesInChart; + ::oox::core::ContextHandler2Helper* mpParent; }; 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: |