From 5145f60cc9046369923fca9a336f2009c426e9eb Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 23 Jan 2017 14:00:12 +0200 Subject: loplugin: unnecessary destructor: basctl..codemaker Change-Id: Iadcfa9bc4fe9efb8d24d6d6afaf2b9b3def0bc3c Reviewed-on: https://gerrit.libreoffice.org/33452 Tested-by: Jenkins Reviewed-by: Noel Grandin --- basctl/source/basicide/baside2.hxx | 1 - basctl/source/basicide/moduldl2.cxx | 1 - basegfx/source/polygon/b2dpolygontriangulator.cxx | 4 ---- basegfx/source/polygon/b3dpolygon.cxx | 16 ---------------- basic/source/basmgr/basmgr.cxx | 6 ------ .../chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx | 1 - .../chartapiwrapper/WrappedStatisticProperties.cxx | 1 - chart2/source/inc/WeakListenerAdapter.hxx | 2 -- codemaker/source/cppumaker/cppuoptions.hxx | 2 -- codemaker/source/javamaker/javaoptions.hxx | 2 -- include/basegfx/point/b3dpoint.hxx | 3 --- include/basegfx/tuple/b2i64tuple.hxx | 3 --- include/basegfx/vector/b3dvector.hxx | 3 --- include/basic/codecompletecache.hxx | 1 - include/basic/sbx.hxx | 1 - include/codemaker/exceptiontree.hxx | 2 -- include/codemaker/generatedtypeset.hxx | 2 -- 17 files changed, 51 deletions(-) diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index eac82321f975..35ffe34c125c 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -540,7 +540,6 @@ private: public: UnoTypeCodeCompletetor( const std::vector< OUString >& aVect, const OUString& sVarType ); - ~UnoTypeCodeCompletetor(){} std::vector< OUString > GetXIdlClassMethods() const; std::vector< OUString > GetXIdlClassFields() const; diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index e54ac691789e..43c8dc012ecd 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -102,7 +102,6 @@ public: : m_aDocument(rDocument) { } - ~LibUserData() {}; const ScriptDocument& GetDocument() const { return m_aDocument; } }; diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx index ccc0680134dc..c54a700aef6a 100644 --- a/basegfx/source/polygon/b2dpolygontriangulator.cxx +++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx @@ -71,10 +71,6 @@ namespace basegfx mfAtan2 = atan2(maEnd.getY() - maStart.getY(), maEnd.getX() - maStart.getX()); } - ~EdgeEntry() - { - } - bool operator<(const EdgeEntry& rComp) const { if(::basegfx::fTools::equal(maStart.getY(), rComp.maStart.getY())) diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx index e7f088210bd0..69a375eed4c5 100644 --- a/basegfx/source/polygon/b3dpolygon.cxx +++ b/basegfx/source/polygon/b3dpolygon.cxx @@ -87,10 +87,6 @@ public: { } - ~CoordinateDataArray3D() - { - } - ::basegfx::B3DVector getNormal() const { ::basegfx::B3DVector aRetval; @@ -285,10 +281,6 @@ public: } } - ~BColorArray() - { - } - bool operator==(const BColorArray& rCandidate) const { return (maVector == rCandidate.maVector); @@ -442,10 +434,6 @@ public: } } - ~NormalsArray3D() - { - } - bool operator==(const NormalsArray3D& rCandidate) const { return (maVector == rCandidate.maVector); @@ -609,10 +597,6 @@ public: } } - ~TextureCoordinate2D() - { - } - bool operator==(const TextureCoordinate2D& rCandidate) const { return (maVector == rCandidate.maVector); diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 5df35bc110ad..21ffb5b90a2f 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -111,14 +111,8 @@ struct BasicManagerImpl BasicManagerImpl() {} - ~BasicManagerImpl(); }; -BasicManagerImpl::~BasicManagerImpl() -{ -} - - // BasMgrContainerListenerImpl diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index a959aebf58c8..14bbb7d4fd5e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -58,7 +58,6 @@ public: , m_ePropertyType( ePropertyType ) { } - virtual ~WrappedSeriesOrDiagramProperty() override {}; bool detectInnerValue( PROPERTYTYPE& rValue, bool& rHasAmbiguousValue ) const { diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 390cc5b0cd1d..31e51a863943 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -176,7 +176,6 @@ public: , tSeriesOrDiagramPropertyType ePropertyType ) : WrappedSeriesOrDiagramProperty< PROPERTYTYPE >(rName,rDefaulValue,spChart2ModelContact,ePropertyType) {} - virtual ~WrappedStatisticProperty() {}; protected: static uno::Reference< beans::XPropertySet > getOrCreateErrorBarProperties( const Reference< beans::XPropertySet >& xSeriesPropertySet ) diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index b29dc538e22c..9bbff96bc079 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -52,8 +52,6 @@ public: explicit WeakListenerAdapter( const css::uno::WeakReference< Listener > & xListener ) : m_xListener( xListener ) {} - virtual ~WeakListenerAdapter() - {} protected: // ____ XEventListener (base of all listeners) ____ diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx index 5e879b79c768..9d5addf326e9 100644 --- a/codemaker/source/cppumaker/cppuoptions.hxx +++ b/codemaker/source/cppumaker/cppuoptions.hxx @@ -28,8 +28,6 @@ public: CppuOptions() : Options() {} - virtual ~CppuOptions() override {} - bool initOptions(int ac, char* av[], bool bCmdFile=false) throw( IllegalArgument ) override; diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx index 375fb5c9825f..817d8805e123 100644 --- a/codemaker/source/javamaker/javaoptions.hxx +++ b/codemaker/source/javamaker/javaoptions.hxx @@ -28,8 +28,6 @@ public: JavaOptions() : Options() {} - virtual ~JavaOptions() override {} - bool initOptions(int ac, char* av[], bool bCmdFile=false) throw( IllegalArgument ) override; diff --git a/include/basegfx/point/b3dpoint.hxx b/include/basegfx/point/b3dpoint.hxx index cc740203d631..c2711202d3de 100644 --- a/include/basegfx/point/b3dpoint.hxx +++ b/include/basegfx/point/b3dpoint.hxx @@ -80,9 +80,6 @@ namespace basegfx : B3DTuple(rTuple) {} - ~B3DPoint() - {} - /** *=operator to allow usage from B3DPoint, too */ B3DPoint& operator*=( const B3DPoint& rPnt ) diff --git a/include/basegfx/tuple/b2i64tuple.hxx b/include/basegfx/tuple/b2i64tuple.hxx index 124fea65eb3c..10942b0dd452 100644 --- a/include/basegfx/tuple/b2i64tuple.hxx +++ b/include/basegfx/tuple/b2i64tuple.hxx @@ -76,9 +76,6 @@ namespace basegfx mnY( rTup.mnY ) {} - ~B2I64Tuple() - {} - /// Get X-Coordinate of 2D Tuple sal_Int64 getX() const { diff --git a/include/basegfx/vector/b3dvector.hxx b/include/basegfx/vector/b3dvector.hxx index cf4b1b24983d..59d7d79f0747 100644 --- a/include/basegfx/vector/b3dvector.hxx +++ b/include/basegfx/vector/b3dvector.hxx @@ -80,9 +80,6 @@ namespace basegfx : B3DTuple(rTuple) {} - ~B3DVector() - {} - /** *=operator to allow usage from B3DVector, too */ B3DVector& operator*=( const B3DVector& rPnt ) diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx index f1c3a9f107d4..00151e83e3c5 100644 --- a/include/basic/codecompletecache.hxx +++ b/include/basic/codecompletecache.hxx @@ -82,7 +82,6 @@ private: public: CodeCompleteDataCache(){} - ~CodeCompleteDataCache(){} friend BASIC_DLLPUBLIC std::ostream& operator<< (std::ostream& aStream, const CodeCompleteDataCache& aCache); diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx index d52b6ce42d42..debfa2e535ea 100644 --- a/include/basic/sbx.hxx +++ b/include/basic/sbx.hxx @@ -55,7 +55,6 @@ struct SbxParamInfo sal_uInt32 nUserData; // IDs etc. SbxParamInfo( const OUString& s, SbxDataType t, SbxFlagBits n ) : aName( s ), eType( t ), nFlags( n ), nUserData( 0 ) {} - ~SbxParamInfo() {} }; typedef std::vector> SbxParams; diff --git a/include/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx index 9c6b3b919b94..8058cc8dcb29 100644 --- a/include/codemaker/exceptiontree.hxx +++ b/include/codemaker/exceptiontree.hxx @@ -79,8 +79,6 @@ class ExceptionTree { public: ExceptionTree(): m_root("com.sun.star.uno.Exception") {} - ~ExceptionTree() {} - /** Builds the exception hierarchy, by adding one exception type at a time. diff --git a/include/codemaker/generatedtypeset.hxx b/include/codemaker/generatedtypeset.hxx index f6cb452c1990..21c9d0b1ba2a 100644 --- a/include/codemaker/generatedtypeset.hxx +++ b/include/codemaker/generatedtypeset.hxx @@ -38,8 +38,6 @@ class GeneratedTypeSet { public: GeneratedTypeSet() {} - ~GeneratedTypeSet() {} - /** Add a type to the set of generated types. -- cgit