diff options
Diffstat (limited to 'oox')
-rw-r--r-- | oox/inc/drawingml/diagram/diagram.hxx | 6 | ||||
-rw-r--r-- | oox/source/core/filterbase.cxx | 5 | ||||
-rw-r--r-- | oox/source/drawingml/diagram/diagram.cxx | 51 | ||||
-rw-r--r-- | oox/source/drawingml/shape.cxx | 8 |
4 files changed, 0 insertions, 70 deletions
diff --git a/oox/inc/drawingml/diagram/diagram.hxx b/oox/inc/drawingml/diagram/diagram.hxx index a528668c08b4..73431815dadb 100644 --- a/oox/inc/drawingml/diagram/diagram.hxx +++ b/oox/inc/drawingml/diagram/diagram.hxx @@ -42,12 +42,6 @@ void loadDiagram( ShapePtr const & pShape, const OUString& rColorStylePath, const oox::core::Relations& rRelations ); -void loadDiagram( const ShapePtr& pShape, - core::XmlFilterBase& rFilter, - const css::uno::Reference< css::xml::dom::XDocument>& rXDataModelDom, - const css::uno::Reference< css::xml::dom::XDocument>& rXLayoutDom, - const css::uno::Reference< css::xml::dom::XDocument>& rXQStyleDom, - const css::uno::Reference< css::xml::dom::XDocument>& rXColorStyleDom ); } } #endif diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx index 57226a5a3e5b..c19905417114 100644 --- a/oox/source/core/filterbase.cxx +++ b/oox/source/core/filterbase.cxx @@ -236,11 +236,6 @@ const Reference< XFrame >& FilterBase::getTargetFrame() const return mxImpl->mxTargetFrame; } -const Reference< XShape >& FilterBase::getParentShape() const -{ - return mxImpl->mxParentShape; -} - const Reference< XStatusIndicator >& FilterBase::getStatusIndicator() const { return mxImpl->mxStatusIndicator; diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index edbb6b4ebf59..64dc5dde6d91 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -535,57 +535,6 @@ void loadDiagram( ShapePtr const & pShape, pDiagram->addTo(pShape); } -void loadDiagram( const ShapePtr& pShape, - core::XmlFilterBase& rFilter, - const uno::Reference<xml::dom::XDocument>& rXDataModelDom, - const uno::Reference<xml::dom::XDocument>& rXLayoutDom, - const uno::Reference<xml::dom::XDocument>& rXQStyleDom, - const uno::Reference<xml::dom::XDocument>& rXColorStyleDom ) -{ - DiagramPtr pDiagram( new Diagram ); - - DiagramDataPtr pData( new DiagramData() ); - pDiagram->setData( pData ); - - DiagramLayoutPtr pLayout( new DiagramLayout(*pDiagram) ); - pDiagram->setLayout( pLayout ); - - // data - if( rXDataModelDom.is() ) - importFragment(rFilter, - rXDataModelDom, - "OOXData", - pDiagram, - new DiagramDataFragmentHandler( rFilter, "", pData )); - - // layout - if( rXLayoutDom.is() ) - importFragment(rFilter, - rXLayoutDom, - "OOXLayout", - pDiagram, - new DiagramLayoutFragmentHandler( rFilter, "", pLayout )); - - // style - if( rXQStyleDom.is() ) - importFragment(rFilter, - rXQStyleDom, - "OOXStyle", - pDiagram, - new DiagramQStylesFragmentHandler( rFilter, "", pDiagram->getStyles() )); - - // colors - if( rXColorStyleDom.is() ) - importFragment(rFilter, - rXColorStyleDom, - "OOXColor", - pDiagram, - new ColorFragmentHandler( rFilter, "", pDiagram->getColors() )); - - // diagram loaded. now lump together & attach to shape - pDiagram->addTo(pShape); -} - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 0872a8b0cf56..1d1e4d8be5a1 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -326,14 +326,6 @@ void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText ) mbHidden = rReferencedShape.mbHidden; } -void Shape::addChildren( ::oox::core::XmlFilterBase& rFilterBase, - const Theme* pTheme, - const Reference< XShapes >& rxShapes, - basegfx::B2DHomMatrix const & aTransformation ) -{ - addChildren(rFilterBase, *this, pTheme, rxShapes, nullptr, aTransformation); -} - struct ActionLockGuard { explicit ActionLockGuard(Reference<drawing::XShape> const& xShape) |