filter/source/graphicfilter/idxf/dxfentrd.cxx | 21 +-------------------- filter/source/graphicfilter/idxf/dxfentrd.hxx | 10 ++++------ 2 files changed, 5 insertions(+), 26 deletions(-)
New commits: commit 9128d38cabfa5d2ed3dd51f6a767263df321c281 Author: Caolán McNamara <caol...@redhat.com> Date: Tue Jan 17 21:07:05 2017 +0000 drop now unnecessary dtors Change-Id: I61dbac2004b2de0f78e01069e7e4099b073d6295 diff --git a/filter/source/graphicfilter/idxf/dxfentrd.cxx b/filter/source/graphicfilter/idxf/dxfentrd.cxx index 892c0b3..28f3a39 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.cxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.cxx @@ -446,10 +446,6 @@ void DXFLWPolyLineEntity::EvaluateGroup( DXFGroupReader & rDGR ) } } -DXFLWPolyLineEntity::~DXFLWPolyLineEntity() -{ -} - //--------------------------DXFHatchEntity------------------------------------- DXFEdgeTypeLine::DXFEdgeTypeLine() : @@ -457,10 +453,7 @@ DXFEdgeTypeLine::DXFEdgeTypeLine() : { } -DXFEdgeTypeLine::~DXFEdgeTypeLine() -{ -} bool DXFEdgeTypeLine::EvaluateGroup( DXFGroupReader & rDGR ) { bool bExecutingGroupCode = true; @@ -483,9 +476,7 @@ DXFEdgeTypeCircularArc::DXFEdgeTypeCircularArc() : nIsCounterClockwiseFlag( 0 ) { } -DXFEdgeTypeCircularArc::~DXFEdgeTypeCircularArc() -{ -} + bool DXFEdgeTypeCircularArc::EvaluateGroup( DXFGroupReader & rDGR ) { bool bExecutingGroupCode = true; @@ -510,10 +501,7 @@ DXFEdgeTypeEllipticalArc::DXFEdgeTypeEllipticalArc() : nIsCounterClockwiseFlag( 0 ) { } -DXFEdgeTypeEllipticalArc::~DXFEdgeTypeEllipticalArc() -{ -} bool DXFEdgeTypeEllipticalArc::EvaluateGroup( DXFGroupReader & rDGR ) { bool bExecutingGroupCode = true; @@ -541,10 +529,7 @@ DXFEdgeTypeSpline::DXFEdgeTypeSpline() : nControlCount( 0 ) { } -DXFEdgeTypeSpline::~DXFEdgeTypeSpline() -{ -} bool DXFEdgeTypeSpline::EvaluateGroup( DXFGroupReader & rDGR ) { bool bExecutingGroupCode = true; @@ -713,10 +698,6 @@ void DXFHatchEntity::EvaluateGroup( DXFGroupReader & rDGR ) } } -DXFHatchEntity::~DXFHatchEntity() -{ -} - //--------------------------DXFVertexEntity------------------------------------- DXFVertexEntity::DXFVertexEntity() : DXFBasicEntity(DXF_VERTEX) diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index e39ff48..61bd59c 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -335,7 +335,6 @@ class DXFLWPolyLineEntity : public DXFBasicEntity std::unique_ptr<DXFVector[]> pP; DXFLWPolyLineEntity(); - virtual ~DXFLWPolyLineEntity() override; protected: @@ -354,14 +353,15 @@ struct DXFEdgeType DXFEdgeType( sal_Int32 EdgeType ):nEdgeType(EdgeType){}; }; + struct DXFEdgeTypeLine : public DXFEdgeType { DXFVector aStartPoint; // 10,20 DXFVector aEndPoint; // 11,21 DXFEdgeTypeLine(); - virtual ~DXFEdgeTypeLine() override; virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; + struct DXFEdgeTypeCircularArc : public DXFEdgeType { DXFVector aCenter; // 10,20 @@ -370,9 +370,9 @@ struct DXFEdgeTypeCircularArc : public DXFEdgeType double fEndAngle; // 51 sal_Int32 nIsCounterClockwiseFlag; // 73 DXFEdgeTypeCircularArc(); - virtual ~DXFEdgeTypeCircularArc() override; virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; + struct DXFEdgeTypeEllipticalArc : public DXFEdgeType { DXFVector aCenter; // 10,20 @@ -383,9 +383,9 @@ struct DXFEdgeTypeEllipticalArc : public DXFEdgeType sal_Int32 nIsCounterClockwiseFlag; // 73 DXFEdgeTypeEllipticalArc(); - virtual ~DXFEdgeTypeEllipticalArc() override; virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; + struct DXFEdgeTypeSpline : public DXFEdgeType { sal_Int32 nDegree; // 94 @@ -395,7 +395,6 @@ struct DXFEdgeTypeSpline : public DXFEdgeType sal_Int32 nControlCount; // 76 DXFEdgeTypeSpline(); - virtual ~DXFEdgeTypeSpline() override; virtual bool EvaluateGroup( DXFGroupReader & rDGR ) override; }; @@ -443,7 +442,6 @@ class DXFHatchEntity : public DXFBasicEntity std::unique_ptr<DXFBoundaryPathData[]> pBoundaryPathData; DXFHatchEntity(); - virtual ~DXFHatchEntity() override; protected:
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits