diff options
Diffstat (limited to 'oox/source/drawingml/diagram')
10 files changed, 0 insertions, 71 deletions
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx index b93ac3d09582..04b14fb5c285 100644 --- a/oox/source/drawingml/diagram/constraintlistcontext.cxx +++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx @@ -36,7 +36,6 @@ ConstraintListContext::ConstraintListContext( ContextHandler2Helper& rParent, OSL_ENSURE( pNode, "Node must NOT be NULL" ); } - ConstraintListContext::~ConstraintListContext() { } @@ -72,7 +71,6 @@ ConstraintListContext::onCreateContext( ::sal_Int32 aElement, return this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx index dba149e018e6..ef8f9e4ab9cd 100644 --- a/oox/source/drawingml/diagram/datamodelcontext.cxx +++ b/oox/source/drawingml/diagram/datamodelcontext.cxx @@ -76,7 +76,6 @@ private: dgm::Connections& mrConnection; }; - // CT_presLayoutVars class PresLayoutVarsContext : public ContextHandler2 @@ -130,7 +129,6 @@ private: dgm::Point& mrPoint; }; - // CT_prSet class PropertiesContext : public ContextHandler2 @@ -197,7 +195,6 @@ private: dgm::Point& mrPoint; }; - // CL_Pt class PtContext : public ContextHandler2 @@ -220,7 +217,6 @@ public: mrPoint.msCnxId = rAttribs.getString( XML_cxnId ).get(); } - virtual ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE @@ -256,8 +252,6 @@ private: dgm::Point& mrPoint; }; - - // CT_PtList class PtListContext : public ContextHandler2 @@ -330,8 +324,6 @@ private: DiagramDataPtr mpDataModel; }; - - DataModelContext::DataModelContext( ContextHandler2Helper& rParent, const DiagramDataPtr & pDataModel ) : ContextHandler2( rParent ) @@ -340,7 +332,6 @@ DataModelContext::DataModelContext( ContextHandler2Helper& rParent, OSL_ENSURE( pDataModel, "Data Model must not be NULL" ); } - DataModelContext::~DataModelContext() { // some debug diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index a4ad2798a309..9f29bd68ed07 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <functional> #include <boost/bind.hpp> @@ -86,13 +85,11 @@ void DiagramData::dump() boost::bind( &dgm::Point::dump, _1 ) ); } - void Diagram::setData( const DiagramDataPtr & pData) { mpData = pData; } - void Diagram::setLayout( const DiagramLayoutPtr & pLayout) { mpLayout = pLayout; @@ -143,12 +140,10 @@ static sal_Int32 calcDepth( const OUString& rNodeName, return 0; } - void Diagram::build( ) { // build name-object maps - #if OSL_DEBUG_LEVEL > 1 std::ofstream output("/tmp/tree.dot"); @@ -423,7 +418,6 @@ void loadDiagram( ShapePtr& pShape, pDiagram->getDataRelsMap() = pShape->resolveRelationshipsOfTypeFromOfficeDoc( rFilter, xRefDataModel->getFragmentPath(), "image" ); - // Pass the info to pShape for( ::std::vector<OUString>::const_iterator aIt = pData->getExtDrawings().begin(), aEnd = pData->getExtDrawings().end(); aIt != aEnd; ++aIt ) diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx index 1218187d1474..2b811f91f408 100644 --- a/oox/source/drawingml/diagram/diagram.hxx +++ b/oox/source/drawingml/diagram/diagram.hxx @@ -65,7 +65,6 @@ struct Connection typedef std::vector< Connection > Connections; - /** A point */ struct Point @@ -152,13 +151,9 @@ typedef std::vector< Point > Points; class LayoutNode; typedef boost::shared_ptr< LayoutNode > LayoutNodePtr; - - typedef std::map< OUString, css::uno::Reference<css::xml::dom::XDocument> > DiagramDomMap; typedef css::uno::Sequence< css::uno::Sequence< css::uno::Any > > DiagramRelsMap; - - class DiagramData { public: @@ -200,10 +195,6 @@ private: typedef boost::shared_ptr< DiagramData > DiagramDataPtr; - - - - class DiagramLayout { public: @@ -250,8 +241,6 @@ private: typedef boost::shared_ptr< DiagramLayout > DiagramLayoutPtr; - - struct DiagramStyle { ShapeStyleRef maFillStyle; @@ -274,8 +263,6 @@ struct DiagramColor typedef std::map<OUString,DiagramColor> DiagramColorMap; - - class Diagram { public: @@ -310,7 +297,6 @@ private: DiagramRelsMap maDataRelsMap; }; - typedef boost::shared_ptr< Diagram > DiagramPtr; } } diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx index d5d5411bb0a0..cd304b93d81c 100644 --- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx +++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star::xml::sax; namespace oox { namespace drawingml { - // CT_DiagramDefinition DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper& rParent, const AttributeList& rAttributes, @@ -46,7 +45,6 @@ DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper& rPare mpLayout->setUniqueId( rAttributes.getString( XML_uniqueId ).get() ); } - DiagramDefinitionContext::~DiagramDefinitionContext() { mpLayout->getNode()->dump(0); @@ -92,7 +90,6 @@ DiagramDefinitionContext::onCreateContext( ::sal_Int32 aElement, return this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index 7c132340340e..59b183634e97 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -50,7 +50,6 @@ void SAL_CALL DiagramDataFragmentHandler::endDocument() } - ContextHandlerRef DiagramDataFragmentHandler::onCreateContext( ::sal_Int32 aElement, const AttributeList& ) @@ -66,8 +65,6 @@ DiagramDataFragmentHandler::onCreateContext( ::sal_Int32 aElement, return this; } - - DiagramLayoutFragmentHandler::DiagramLayoutFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, const DiagramLayoutPtr pDataPtr ) @@ -88,7 +85,6 @@ void SAL_CALL DiagramLayoutFragmentHandler::endDocument() } - ContextHandlerRef DiagramLayoutFragmentHandler::onCreateContext( ::sal_Int32 aElement, const AttributeList& rAttribs ) @@ -104,8 +100,6 @@ DiagramLayoutFragmentHandler::onCreateContext( ::sal_Int32 aElement, return this; } - - DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFilter, const OUString& rFragmentPath, DiagramQStyleMap& rStylesMap ) : @@ -163,7 +157,6 @@ DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFi return 0; } - void DiagramQStylesFragmentHandler::onStartElement( const AttributeList& rAttribs ) { if( getCurrentElement() == DGM_TOKEN( styleLbl ) ) @@ -173,8 +166,6 @@ void DiagramQStylesFragmentHandler::onStartElement( const AttributeList& rAttrib } } - - void DiagramQStylesFragmentHandler::onEndElement( ) { if( getCurrentElement() == DGM_TOKEN(styleLbl) ) @@ -231,7 +222,6 @@ ColorFragmentHandler::ColorFragmentHandler( ::oox::core::XmlFilterBase& rFilter, return 0; } - void ColorFragmentHandler::onStartElement( const AttributeList& rAttribs ) { if( getCurrentElement() == DGM_TOKEN(styleLbl) ) @@ -247,7 +237,6 @@ void ColorFragmentHandler::onEndElement( ) mrColorsMap[maColorName] = maColorEntry; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx index 6c2ffd6183b9..9d38870fcacf 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx @@ -25,7 +25,6 @@ namespace oox { namespace drawingml { - class DiagramDataFragmentHandler : public ::oox::core::FragmentHandler2 { public: @@ -40,8 +39,6 @@ private: DiagramDataPtr mpDataPtr; }; - - class DiagramLayoutFragmentHandler : public ::oox::core::FragmentHandler2 { public: diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx index ba1f8574961e..f1692ec30fb0 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx @@ -40,7 +40,6 @@ using namespace ::oox::core; namespace oox { namespace drawingml { - IteratorAttr::IteratorAttr( ) : mnAxis( 0 ) , mnCnt( -1 ) @@ -62,8 +61,6 @@ void IteratorAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr ) mnStep = attr.getInteger( XML_step, 1 ); } - - ConditionAttr::ConditionAttr() : mnFunc( 0 ) , mnArg( 0 ) @@ -72,7 +69,6 @@ ConditionAttr::ConditionAttr() } - void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr ) { mnFunc = xAttr->getOptionalValueToken( XML_func, 0 ); @@ -82,7 +78,6 @@ void ConditionAttr::loadFromXAttr( const Reference< XFastAttributeList >& xAttr msVal = xAttr->getOptionalValue( XML_val ); } - void LayoutAtom::dump(int level) { OSL_TRACE( "level = %d - %s of type %s", level, @@ -93,7 +88,6 @@ void LayoutAtom::dump(int level) boost::bind( &LayoutAtom::dump, _1, level + 1 ) ); } - ForEachAtom::ForEachAtom(const Reference< XFastAttributeList >& xAttributes) { maIter.loadFromXAttr(xAttributes); @@ -506,11 +500,8 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const Diagram& rDgm, sal_uI return false; } - - // Visitation - class ShapeLayoutingVisitor : public LayoutAtomVisitor { ShapePtr mpParentShape; diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx index ade9bde96bdd..6d57510d090c 100644 --- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx +++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx @@ -32,7 +32,6 @@ #include "oox/drawingml/shape.hxx" #include "diagram.hxx" - namespace oox { namespace drawingml { class DiagramLayout; @@ -194,7 +193,6 @@ private: typedef boost::shared_ptr< ForEachAtom > ForEachAtomPtr; - class ConditionAtom : public LayoutAtom { @@ -221,7 +219,6 @@ private: typedef boost::shared_ptr< ConditionAtom > ConditionAtomPtr; - /** "choose" statements. Atoms will be tested in order. */ class ChooseAtom : public LayoutAtom diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx index 10de2df161e7..1d092dc663a9 100644 --- a/oox/source/drawingml/diagram/layoutnodecontext.cxx +++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx @@ -43,8 +43,6 @@ public: {} }; - - class AlgorithmContext : public ContextHandler2 { @@ -84,7 +82,6 @@ private: AlgAtomPtr mpNode; }; - class ChooseContext : public ContextHandler2 { @@ -135,9 +132,6 @@ private: ConditionAtomPtr mpConditionNode; }; - - - class ForEachContext : public LayoutNodeContext { @@ -150,7 +144,6 @@ public: } }; - // CT_LayoutVariablePropertySet class LayoutVariablePropertySetContext : public ContextHandler2 @@ -181,7 +174,6 @@ private: LayoutNode::VarMap & mVariables; }; - // CT_LayoutNode LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, @@ -193,7 +185,6 @@ LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper& rParent, mpNode->setName( rAttribs.getString( XML_name ).get() ); } - LayoutNodeContext::~LayoutNodeContext() { } @@ -240,7 +231,6 @@ sal_Int32 LayoutNodeContext::tagToVarIdx( sal_Int32 aTag ) return nIdx; } - ContextHandlerRef LayoutNodeContext::onCreateContext( ::sal_Int32 aElement, const AttributeList& rAttribs ) @@ -346,7 +336,6 @@ LayoutNodeContext::onCreateContext( ::sal_Int32 aElement, return this; } - } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |