n#655408: Importing extLst of drawings in diagrams.

data*.xml contains the list of drawings which can be imported
instead. These are easier to import now that we support better
smartart.

3 files changed, 9 insertions, 1 deletions

diff --git a/oox/inc/oox/drawingml/diagram/diagram.hxx b/oox/inc/oox/drawingml/diagram/diagram.hxx
index 9b75667f631a..4c0a40d857f3 100644
--- a/oox/inc/oox/drawingml/diagram/diagram.hxx
+++ b/oox/inc/oox/drawingml/diagram/diagram.hxx
@@ -43,7 +43,7 @@ namespace oox { namespace drawingml {
     generate and layout the shapes, and push it as children into the
     referenced shape.
  */
-void loadDiagram( const ShapePtr& pShape,
+void loadDiagram( ShapePtr& pShape,
                   core::XmlFilterBase& rFilter,
                   const ::rtl::OUString& rDataModelPath,
                   const ::rtl::OUString& rLayoutPath,
diff --git a/oox/inc/oox/drawingml/shape.hxx b/oox/inc/oox/drawingml/shape.hxx
index ab7637ad543d..772f6993289d 100644
--- a/oox/inc/oox/drawingml/shape.hxx
+++ b/oox/inc/oox/drawingml/shape.hxx
@@ -107,6 +107,7 @@ public:
 
     void                              setChildPosition( com::sun::star::awt::Point nPosition ){ maChPosition = nPosition; }
     void                              setChildSize( com::sun::star::awt::Size aSize ){ maChSize = aSize; }
+    void                              moveAllToPosition( const com::sun::star::awt::Point &rPoint );
 
     void                              setPosition( com::sun::star::awt::Point nPosition ){ maPosition = nPosition; }
     const com::sun::star::awt::Point& getPosition() const { return maPosition; }
@@ -173,6 +174,9 @@ public:
                         getXShape() const { return mxShape; }
 
     virtual void        applyShapeReference( const Shape& rReferencedShape );
+    const ::std::vector<rtl::OUString>&
+                        getExtDrawings() { return maExtDrawings; }
+    void                addExtDrawingRelId( const ::rtl::OUString &rRelId ) { maExtDrawings.push_back( rRelId ); }
 
 protected:
 
@@ -233,6 +237,7 @@ protected:
 
     com::sun::star::awt::Size       maSize;
     com::sun::star::awt::Point      maPosition;
+    ::std::vector<rtl::OUString>    maExtDrawings;
 
 private:
     enum FrameType
diff --git a/oox/inc/oox/ppt/pptshapegroupcontext.hxx b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
index 948ee7961224..7e2a6d3b5f67 100644
--- a/oox/inc/oox/ppt/pptshapegroupcontext.hxx
+++ b/oox/inc/oox/ppt/pptshapegroupcontext.hxx
@@ -38,6 +38,7 @@ class PPTShapeGroupContext : public ::oox::drawingml::ShapeGroupContext
 {
     SlidePersistPtr     mpSlidePersistPtr;
     ShapeLocation       meShapeLocation;
+    oox::drawingml::ShapePtr    pGraphicShape;
 
 public:
     PPTShapeGroupContext(
@@ -50,6 +51,8 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
         createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
 
+    virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+
 protected:
 
 };