starmath/source/mathmlimport.cxx | 6 -- starmath/source/unofilter.cxx | 3 - stoc/source/corereflection/crenum.cxx | 5 -- stoc/source/defaultregistry/defaultregistry.cxx | 13 ------ stoc/source/implementationregistration/implreg.cxx | 6 -- stoc/source/inspect/introspection.cxx | 6 -- stoc/source/invocation/invocation.cxx | 7 --- stoc/source/javaloader/javaloader.cxx | 5 -- stoc/source/loader/dllcomponentloader.cxx | 5 -- stoc/source/namingservice/namingservice.cxx | 4 - stoc/source/proxy_factory/proxyfac.cxx | 11 ----- stoc/source/security/access_controller.cxx | 19 -------- stoc/source/security/file_policy.cxx | 4 - stoc/source/servicemanager/servicemanager.cxx | 21 --------- stoc/source/simpleregistry/simpleregistry.cxx | 2 stoc/source/typeconv/convert.cxx | 3 - svgio/source/svguno/xsvgparser.cxx | 5 -- svl/qa/unit/items/test_itempool.cxx | 1 svl/source/config/cjkoptions.cxx | 5 -- svtools/source/dialogs/addresstemplate.cxx | 7 --- svtools/source/edit/textwindowpeer.cxx | 2 svtools/source/filter/SvFilterOptionsDialog.cxx | 7 --- svtools/source/table/cellvalueconversion.cxx | 12 ----- svtools/source/uno/treecontrolpeer.cxx | 8 --- svtools/source/uno/unoimap.cxx | 5 -- svx/source/accessibility/AccessibleEmptyEditSource.cxx | 6 -- svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 4 - svx/source/dialog/SafeModeUI.cxx | 5 -- svx/source/dialog/crashreportui.cxx | 5 -- svx/source/form/fmscriptingenv.cxx | 7 --- svx/source/gallery2/galbrws2.cxx | 5 -- svx/source/mnuctrls/smarttagmenu.cxx | 5 -- svx/source/sdr/contact/viewobjectcontact.cxx | 5 -- svx/source/sidebar/PanelFactory.cxx | 7 --- svx/source/svdraw/svdograf.cxx | 5 -- svx/source/svdraw/svdotxln.cxx | 5 -- svx/source/table/cell.cxx | 7 --- svx/source/table/svdotable.cxx | 7 --- svx/source/table/tablehandles.cxx | 5 -- svx/source/tbxctrls/tbunocontroller.cxx | 5 -- svx/source/unodraw/UnoGraphicExporter.cxx | 10 ---- svx/source/unodraw/UnoNamespaceMap.cxx | 5 -- svx/source/unodraw/XPropertyTable.cxx | 6 -- svx/source/unodraw/gluepts.cxx | 5 -- svx/source/unodraw/recoveryui.cxx | 9 ---- svx/source/unodraw/unobtabl.cxx | 5 -- svx/source/unodraw/unodtabl.cxx | 5 -- svx/source/unodraw/unogtabl.cxx | 5 -- svx/source/unodraw/unohtabl.cxx | 5 -- svx/source/unodraw/unomod.cxx | 5 -- svx/source/unodraw/unoshcol.cxx | 6 -- svx/source/unodraw/unottabl.cxx | 5 -- svx/source/xml/xmleohlp.cxx | 5 -- svx/source/xml/xmlgrhlp.cxx | 5 -- svx/source/xml/xmlxtexp.cxx | 30 -------------- svx/source/xml/xmlxtimp.cxx | 5 -- sw/qa/core/Test-BigPtrArray.cxx | 4 - sw/source/core/doc/CntntIdxStore.cxx | 2 sw/source/core/docnode/finalthreadmanager.cxx | 3 - sw/source/core/draw/dcontact.cxx | 10 ---- sw/source/core/draw/dflyobj.cxx | 8 --- sw/source/core/layout/dbg_lay.cxx | 6 +- sw/source/core/layout/paintfrm.cxx | 3 - sw/source/core/ole/ndole.cxx | 5 -- sw/source/core/swg/SwXMLBlockImport.cxx | 28 ------------- sw/source/core/text/xmldump.cxx | 4 - sw/source/core/txtnode/fntcap.cxx | 2 sw/source/core/undo/unsect.cxx | 12 ----- sw/source/core/unocore/unoframe.cxx | 3 - sw/source/core/unocore/unostyle.cxx | 10 ---- sw/source/filter/html/htmlform.cxx | 5 -- sw/source/filter/html/htmltab.cxx | 14 ------ sw/source/filter/ww8/rtfexport.cxx | 4 - sw/source/filter/ww8/ww8par.cxx | 6 -- sw/source/filter/xml/xmlfmt.cxx | 18 -------- sw/source/filter/xml/xmlfmte.cxx | 5 -- sw/source/filter/xml/xmlimp.cxx | 28 ------------- sw/source/filter/xml/xmliteme.cxx | 6 -- sw/source/filter/xml/xmlitemi.cxx | 5 -- sw/source/filter/xml/xmltbli.cxx | 36 ----------------- sw/source/filter/xml/xmltext.cxx | 5 -- sw/source/ui/dbui/mmoutputtypepage.cxx | 5 -- sw/source/ui/envelp/mailmrge.cxx | 4 - sw/source/ui/vba/vbacells.cxx | 1 sw/source/ui/vba/vbaheadersfooters.cxx | 1 sw/source/ui/vba/vbapanes.cxx | 1 sw/source/ui/vba/vbasections.cxx | 2 sw/source/ui/vba/vbatablesofcontents.cxx | 2 sw/source/ui/vba/vbatabstops.cxx | 2 sw/source/uibase/dbui/dbmgr.cxx | 5 -- sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 8 --- sw/source/uibase/dbui/mmconfigitem.cxx | 5 -- sw/source/uibase/docvw/SidebarWinAcc.cxx | 3 - sw/source/uibase/ribbar/workctrl.cxx | 4 - sw/source/uibase/sidebar/SwPanelFactory.cxx | 5 -- 95 files changed, 8 insertions(+), 643 deletions(-)
New commits: commit 9f8986660cb0701bca7afcb43588dc7930da406b Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Dec 2 11:16:13 2016 +0100 loplugin:unnecessaryoverride (dtors) in starmath Change-Id: I7d987fdab23a708a75e7d2e8bd2aabdb96e53140 diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx index 4761508..b080317 100644 --- a/starmath/source/mathmlimport.cxx +++ b/starmath/source/mathmlimport.cxx @@ -1957,8 +1957,6 @@ public: sal_uInt16 i_nPrefix, const OUString & i_rLName, const uno::Reference<document::XDocumentProperties>& i_xDocProps); - virtual ~SmXMLFlatDocContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext(sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) override; }; @@ -1972,10 +1970,6 @@ SmXMLFlatDocContext_Impl::SmXMLFlatDocContext_Impl( SmXMLImport& i_rImport, { } -SmXMLFlatDocContext_Impl::~SmXMLFlatDocContext_Impl() -{ -} - SvXMLImportContext *SmXMLFlatDocContext_Impl::CreateChildContext( sal_uInt16 i_nPrefix, const OUString& i_rLocalName, const uno::Reference<xml::sax::XAttributeList>& i_xAttrList) diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx index d24d0b2..be7e0a4 100644 --- a/starmath/source/unofilter.cxx +++ b/starmath/source/unofilter.cxx @@ -30,7 +30,6 @@ class MathTypeFilter : public cppu::WeakImplHelper public: MathTypeFilter(); - ~MathTypeFilter() override; // XFilter sal_Bool SAL_CALL filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw (uno::RuntimeException, std::exception) override; @@ -47,8 +46,6 @@ public: MathTypeFilter::MathTypeFilter() = default; -MathTypeFilter::~MathTypeFilter() = default; - sal_Bool MathTypeFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescriptor) throw(uno::RuntimeException, std::exception) { bool bSuccess = false; commit ad91fa995e0af5f0191ee327fe936160081bbf05 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Dec 2 11:15:56 2016 +0100 loplugin:unnecessaryoverride (dtors) in stoc Change-Id: I60652dbac6a76eacdbb4e951a636e7a40e88a6a6 diff --git a/stoc/source/corereflection/crenum.cxx b/stoc/source/corereflection/crenum.cxx index 1b23133..74c7a56 100644 --- a/stoc/source/corereflection/crenum.cxx +++ b/stoc/source/corereflection/crenum.cxx @@ -42,7 +42,6 @@ public: : IdlMemberImpl( pReflection, rName, pTypeDescr, pTypeDescr ) , _nValue( nValue ) {} - virtual ~IdlEnumFieldImpl() override; // XInterface virtual Any SAL_CALL queryInterface( const Type & rType ) throw(css::uno::RuntimeException, std::exception) override; @@ -65,10 +64,6 @@ public: virtual void SAL_CALL set( Any & rObj, const Any & rValue ) throw(css::lang::IllegalArgumentException, css::lang::IllegalAccessException, css::uno::RuntimeException, std::exception) override; }; -IdlEnumFieldImpl::~IdlEnumFieldImpl() -{ -} - // XInterface Any IdlEnumFieldImpl::queryInterface( const Type & rType ) diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index 2885cca..75ee807 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.cxx @@ -52,8 +52,6 @@ class NestedRegistryImpl : public WeakAggImplHelper4 < XSimpleRegistry, XInit public: NestedRegistryImpl( ); - virtual ~NestedRegistryImpl() override; - // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; @@ -100,8 +98,6 @@ public: NestedKeyImpl( const OUString& aKeyName, NestedKeyImpl* pKey); - virtual ~NestedKeyImpl() override; - // XRegistryKey virtual OUString SAL_CALL getKeyName() throw(RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isReadOnly( ) throw(InvalidRegistryException, RuntimeException, std::exception) override; @@ -191,12 +187,6 @@ NestedKeyImpl::NestedKeyImpl( const OUString& rKeyName, m_state = m_xRegistry->m_state; } - -NestedKeyImpl::~NestedKeyImpl() -{ -} - - void NestedKeyImpl::computeChanges() { Guard< Mutex > aGuard( m_xRegistry->m_mutex ); @@ -1106,9 +1096,6 @@ NestedRegistryImpl::NestedRegistryImpl( ) : m_state(0) {} - -NestedRegistryImpl::~NestedRegistryImpl() {} - class RegistryEnumueration : public WeakImplHelper< XEnumeration > { public: diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx index f01737a..e174724 100644 --- a/stoc/source/implementationregistration/implreg.cxx +++ b/stoc/source/implementationregistration/implreg.cxx @@ -1196,7 +1196,6 @@ class ImplementationRegistration { public: explicit ImplementationRegistration( const Reference < XComponentContext > & rSMgr ); - virtual ~ImplementationRegistration() override; // XServiceInfo OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; @@ -1277,11 +1276,6 @@ ImplementationRegistration::ImplementationRegistration( const Reference < XCompo , m_xCtx( xCtx ) {} - -// ~ImplementationRegistration() - -ImplementationRegistration::~ImplementationRegistration() {} - // XServiceInfo OUString ImplementationRegistration::getImplementationName() throw(RuntimeException, std::exception) { diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index a755443..9043ded 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -707,7 +707,6 @@ class ImplIntrospectionAccess : public IntrospectionAccessHelper public: ImplIntrospectionAccess( const Any& obj, rtl::Reference< IntrospectionAccessStatic_Impl > const & pStaticImpl_ ); - virtual ~ImplIntrospectionAccess() override; // Methods from XIntrospectionAccess virtual sal_Int32 SAL_CALL getSuppliedMethodConcepts() @@ -832,11 +831,6 @@ ImplIntrospectionAccess::ImplIntrospectionAccess mnLastMethodConcept = -1; } -ImplIntrospectionAccess::~ImplIntrospectionAccess() -{ -} - - Reference<XElementAccess> ImplIntrospectionAccess::getXElementAccess() { ResettableGuard< Mutex > aGuard( m_aMutex ); diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx index 99ec15e..9f965dc 100644 --- a/stoc/source/invocation/invocation.cxx +++ b/stoc/source/invocation/invocation.cxx @@ -99,7 +99,6 @@ public: Invocation_Impl( const Any & rAdapted, const Reference<XTypeConverter> &, const Reference<XIntrospection> &, const Reference<XIdlReflection> & ); - virtual ~Invocation_Impl() override; // XInterface virtual Any SAL_CALL queryInterface( const Type & aType) throw( RuntimeException, std::exception ) override; @@ -246,9 +245,6 @@ Invocation_Impl::Invocation_Impl setMaterial( rAdapted ); } -Invocation_Impl::~Invocation_Impl() {} - - //### INTERFACE IMPLEMENTATIONS #################################################################### @@ -1072,7 +1068,6 @@ class InvocationService { public: explicit InvocationService( const Reference<XComponentContext> & xCtx ); - virtual ~InvocationService() override; // XServiceInfo OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; @@ -1102,8 +1097,6 @@ InvocationService::InvocationService( const Reference<XComponentContext> & xCtx xIntrospection = theIntrospection::get(xCtx); } -InvocationService::~InvocationService() {} - // XServiceInfo OUString InvocationService::getImplementationName() throw( RuntimeException, std::exception ) { diff --git a/stoc/source/javaloader/javaloader.cxx b/stoc/source/javaloader/javaloader.cxx index 48d88e9..f625f61 100644 --- a/stoc/source/javaloader/javaloader.cxx +++ b/stoc/source/javaloader/javaloader.cxx @@ -102,7 +102,6 @@ class JavaComponentLoader : public WeakImplHelper<XImplementationLoader, XServic public: explicit JavaComponentLoader(const css::uno::Reference<XComponentContext> & xCtx) throw(RuntimeException); - virtual ~JavaComponentLoader() throw() override; public: // XServiceInfo @@ -296,10 +295,6 @@ JavaComponentLoader::JavaComponentLoader(const css::uno::Reference<XComponentCon } -JavaComponentLoader::~JavaComponentLoader() throw() -{ -} - // XServiceInfo OUString SAL_CALL JavaComponentLoader::getImplementationName() throw(css::uno::RuntimeException, std::exception) diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx index a443e64..8b765f4 100644 --- a/stoc/source/loader/dllcomponentloader.cxx +++ b/stoc/source/loader/dllcomponentloader.cxx @@ -59,7 +59,6 @@ class DllComponentLoader { public: explicit DllComponentLoader( const Reference<XComponentContext> & xCtx ); - virtual ~DllComponentLoader() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; @@ -83,10 +82,6 @@ DllComponentLoader::DllComponentLoader( const Reference<XComponentContext> & xCt m_xSMgr.set( xCtx->getServiceManager(), UNO_QUERY ); } - -DllComponentLoader::~DllComponentLoader() {} - - OUString SAL_CALL DllComponentLoader::getImplementationName( ) throw(css::uno::RuntimeException, std::exception) { diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 40af050..8e3fda8 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -76,7 +76,6 @@ class NamingService_Impl HashMap_OWString_Interface aMap; public: NamingService_Impl(); - virtual ~NamingService_Impl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -101,9 +100,6 @@ static Reference<XInterface> SAL_CALL NamingService_Impl_create( NamingService_Impl::NamingService_Impl() {} - -NamingService_Impl::~NamingService_Impl() {} - // XServiceInfo OUString NamingService_Impl::getImplementationName() throw(css::uno::RuntimeException, std::exception) diff --git a/stoc/source/proxy_factory/proxyfac.cxx b/stoc/source/proxy_factory/proxyfac.cxx index 6006907..b60af0b 100644 --- a/stoc/source/proxy_factory/proxyfac.cxx +++ b/stoc/source/proxy_factory/proxyfac.cxx @@ -75,7 +75,6 @@ struct FactoryImpl : public ::cppu::WeakImplHelper< lang::XServiceInfo, typelib_InterfaceTypeDescription * pTypeDescr ); FactoryImpl(); - virtual ~FactoryImpl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -169,7 +168,6 @@ struct ProxyRoot : public ::cppu::OWeakAggObject virtual Any SAL_CALL queryAggregation( Type const & rType ) throw (RuntimeException, std::exception) override; - virtual ~ProxyRoot() override; inline ProxyRoot( ::rtl::Reference< FactoryImpl > const & factory, Reference< XInterface > const & xTarget ); @@ -303,12 +301,6 @@ inline binuno_Proxy::binuno_Proxy( uno_Interface::pDispatcher = binuno_proxy_dispatch; } - -ProxyRoot::~ProxyRoot() -{ -} - - inline ProxyRoot::ProxyRoot( ::rtl::Reference< FactoryImpl > const & factory, Reference< XInterface > const & xTarget ) @@ -417,9 +409,6 @@ FactoryImpl::FactoryImpl() OSL_ENSURE( m_cpp2uno.is(), "### cannot get bridge C++ <-> uno!" ); } - -FactoryImpl::~FactoryImpl() {} - // XProxyFactory Reference< XAggregation > FactoryImpl::createProxy( diff --git a/stoc/source/security/access_controller.cxx b/stoc/source/security/access_controller.cxx index 11e0fcd..246ea6f 100644 --- a/stoc/source/security/access_controller.cxx +++ b/stoc/source/security/access_controller.cxx @@ -79,8 +79,6 @@ class acc_Intersection Reference< security::XAccessControlContext > const & x2 ); public: - virtual ~acc_Intersection() override; - static inline Reference< security::XAccessControlContext > create( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ); @@ -98,9 +96,6 @@ inline acc_Intersection::acc_Intersection( , m_x2( x2 ) {} -acc_Intersection::~acc_Intersection() -{} - inline Reference< security::XAccessControlContext > acc_Intersection::create( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) @@ -132,8 +127,6 @@ class acc_Union Reference< security::XAccessControlContext > const & x2 ); public: - virtual ~acc_Union() override; - static inline Reference< security::XAccessControlContext > create( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ); @@ -151,9 +144,6 @@ inline acc_Union::acc_Union( , m_x2( x2 ) {} -acc_Union::~acc_Union() -{} - inline Reference< security::XAccessControlContext > acc_Union::create( Reference< security::XAccessControlContext > const & x1, Reference< security::XAccessControlContext > const & x2 ) @@ -192,17 +182,12 @@ public: : m_permissions( permissions ) {} - virtual ~acc_Policy() override; - // XAccessControlContext impl virtual void SAL_CALL checkPermission( Any const & perm ) throw (RuntimeException, std::exception) override; }; -acc_Policy::~acc_Policy() -{} - void acc_Policy::checkPermission( Any const & perm ) throw (RuntimeException, std::exception) @@ -338,7 +323,6 @@ protected: public: explicit AccessController( Reference< XComponentContext > const & xComponentContext ); - virtual ~AccessController() override; // XInitialization impl virtual void SAL_CALL initialize( @@ -431,9 +415,6 @@ AccessController::AccessController( Reference< XComponentContext > const & xComp } } -AccessController::~AccessController() -{} - void AccessController::disposing() { m_mode = OFF; // avoid checks from now on xxx todo review/ better DYNAMIC_ONLY? diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index 212e506..bc3f3fe 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -72,7 +72,6 @@ protected: public: explicit FilePolicy( Reference< XComponentContext > const & xComponentContext ); - virtual ~FilePolicy() override; // XPolicy impl virtual Sequence< Any > SAL_CALL getPermissions( @@ -99,9 +98,6 @@ FilePolicy::FilePolicy( Reference< XComponentContext > const & xComponentContext , m_init( false ) {} -FilePolicy::~FilePolicy() -{} - void FilePolicy::disposing() { m_userPermissions.clear(); diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 3dd9274..f47b0b0 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -161,7 +161,6 @@ public: : aFactories( rFactories ) , nIt( 0 ) {} - virtual ~ServiceEnumeration_Impl() override {} // XEnumeration sal_Bool SAL_CALL hasMoreElements() @@ -253,7 +252,6 @@ public: : aImplementationMap( rImplementationMap ) , aIt( aImplementationMap.begin() ) {} - virtual ~ImplementationEnumeration_Impl() override; // XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() @@ -267,8 +265,6 @@ private: HashSet_Ref::iterator aIt; }; -ImplementationEnumeration_Impl::~ImplementationEnumeration_Impl() {} - // XEnumeration sal_Bool ImplementationEnumeration_Impl::hasMoreElements() throw(css::uno::RuntimeException, std::exception) @@ -372,7 +368,6 @@ class OServiceManager { public: explicit OServiceManager( Reference< XComponentContext > const & xContext ); - virtual ~OServiceManager() override; // XInitialization void SAL_CALL initialize( Sequence< Any > const & args ) @@ -512,7 +507,6 @@ protected: public: explicit OServiceManagerWrapper( Reference< XComponentContext > const & xContext ); - virtual ~OServiceManagerWrapper() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override @@ -642,8 +636,6 @@ void OServiceManagerWrapper::disposing() m_root.clear(); } -OServiceManagerWrapper::~OServiceManagerWrapper() {} - OServiceManagerWrapper::OServiceManagerWrapper( Reference< XComponentContext > const & xContext ) : t_OServiceManagerWrapper_impl( m_mutex ) @@ -667,11 +659,6 @@ OServiceManager::OServiceManager( Reference< XComponentContext > const & xContex , m_bInDisposing( false ) {} -/** - * Destroy the ServiceManager - */ -OServiceManager::~OServiceManager() {} - // XComponent void OServiceManager::dispose() throw(css::uno::RuntimeException, std::exception) @@ -1270,7 +1257,6 @@ class ORegistryServiceManager : public OServiceManager { public: explicit ORegistryServiceManager( Reference< XComponentContext > const & xContext ); - virtual ~ORegistryServiceManager() override; // XInitialization void SAL_CALL initialize(const Sequence< Any >& Arguments) @@ -1332,13 +1318,6 @@ ORegistryServiceManager::ORegistryServiceManager( Reference< XComponentContext > { } -/** - * Destroy the ServiceManager - */ -ORegistryServiceManager::~ORegistryServiceManager() -{ -} - // XComponent void ORegistryServiceManager::dispose() throw(css::uno::RuntimeException, std::exception) diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index 3dd67ce..c48913f 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -58,8 +58,6 @@ class SimpleRegistry: public: SimpleRegistry() {} - virtual ~SimpleRegistry() override {} - osl::Mutex mutex_; private: diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx index 214d24a..59849df3 100644 --- a/stoc/source/typeconv/convert.cxx +++ b/stoc/source/typeconv/convert.cxx @@ -251,7 +251,6 @@ class TypeConverter_Impl : public WeakImplHelper< XTypeConverter, XServiceInfo > public: TypeConverter_Impl(); - virtual ~TypeConverter_Impl() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; @@ -269,8 +268,6 @@ public: TypeConverter_Impl::TypeConverter_Impl() {} -TypeConverter_Impl::~TypeConverter_Impl() {} - // XServiceInfo OUString TypeConverter_Impl::getImplementationName() throw( RuntimeException, std::exception ) { commit b610d25131cc29bd6906e7b380147d60488bd4f4 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Dec 2 11:15:42 2016 +0100 loplugin:unnecessaryoverride (dtors) in svgio Change-Id: Icff1b3d5072c9a854de7ae12141131b0a9650b91 diff --git a/svgio/source/svguno/xsvgparser.cxx b/svgio/source/svguno/xsvgparser.cxx index e84f5f6..c4e8d5c 100644 --- a/svgio/source/svguno/xsvgparser.cxx +++ b/svgio/source/svguno/xsvgparser.cxx @@ -48,7 +48,6 @@ namespace svgio public: explicit XSvgParser( uno::Reference< uno::XComponentContext > const & context); - virtual ~XSvgParser() override; XSvgParser(const XSvgParser&) = delete; XSvgParser& operator=(const XSvgParser&) = delete; @@ -97,10 +96,6 @@ namespace svgio { } - XSvgParser::~XSvgParser() - { - } - uno::Sequence< uno::Reference< ::graphic::XPrimitive2D > > XSvgParser::getDecomposition( const uno::Reference< ::io::XInputStream >& xSVGStream, const OUString& aAbsolutePath ) throw (uno::RuntimeException, std::exception) commit 70b0b2f9683100888aaefdb2185eb017406b9d71 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Dec 2 11:15:31 2016 +0100 loplugin:unnecessaryoverride (dtors) in svl Change-Id: I6dd35199e15aebf547578642692db2b1983ebd95 diff --git a/svl/qa/unit/items/test_itempool.cxx b/svl/qa/unit/items/test_itempool.cxx index 0f53390..714c170 100644 --- a/svl/qa/unit/items/test_itempool.cxx +++ b/svl/qa/unit/items/test_itempool.cxx @@ -19,7 +19,6 @@ class PoolItemTest : public CppUnit::TestFixture { public: PoolItemTest() {} - virtual ~PoolItemTest() override {} void testPool(); diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 6919488..c1dede9 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -62,7 +62,6 @@ class SvtCJKOptions_Impl : public utl::ConfigItem public: SvtCJKOptions_Impl(); - virtual ~SvtCJKOptions_Impl() override; virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; void Load(); @@ -114,10 +113,6 @@ SvtCJKOptions_Impl::SvtCJKOptions_Impl() : { } -SvtCJKOptions_Impl::~SvtCJKOptions_Impl() -{ -} - void SvtCJKOptions_Impl::SetAll(bool bSet) { if ( commit 7ca8ff7ff74df1f0805e391fef9a3e554dd28778 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Dec 2 11:15:15 2016 +0100 loplugin:unnecessaryoverride (dtors) in svtools Change-Id: I5b0f4b335cd383702324ff6ea04581476309ca70 diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 2dd42da..4aed39d 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -256,7 +256,6 @@ namespace svt public: AssignmentPersistentData(); - virtual ~AssignmentPersistentData() override; // IAssigmentData overridables virtual OUString getDatasourceName() const override; @@ -295,12 +294,6 @@ void AssignmentPersistentData::ImplCommit() m_aStoredFields.insert(*pStoredNames); } - - AssignmentPersistentData::~AssignmentPersistentData() - { - } - - bool AssignmentPersistentData::hasFieldAssignment(const OUString& _rLogicalName) { return (m_aStoredFields.end() != m_aStoredFields.find(_rLogicalName)); diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx index ca54379..5bfc39d 100644 --- a/svtools/source/edit/textwindowpeer.cxx +++ b/svtools/source/edit/textwindowpeer.cxx @@ -36,8 +36,6 @@ class TextWindowPeer: public VCLXWindow { public: explicit TextWindowPeer(TextView & view); - virtual ~TextWindowPeer() override {} - TextWindowPeer(const TextWindowPeer&) = delete; TextWindowPeer& operator=(const TextWindowPeer&) = delete; diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx index 0ce7295..7675a59 100644 --- a/svtools/source/filter/SvFilterOptionsDialog.cxx +++ b/svtools/source/filter/SvFilterOptionsDialog.cxx @@ -77,7 +77,6 @@ class SvFilterOptionsDialog : public cppu::WeakImplHelper public: explicit SvFilterOptionsDialog( const uno::Reference< uno::XComponentContext >& _rxORB ); - virtual ~SvFilterOptionsDialog() override; // XInterface virtual void SAL_CALL acquire() throw() override; @@ -122,12 +121,6 @@ SvFilterOptionsDialog::SvFilterOptionsDialog( const uno::Reference< uno::XCompon { } - -SvFilterOptionsDialog::~SvFilterOptionsDialog() -{ -} - - void SAL_CALL SvFilterOptionsDialog::acquire() throw() { OWeakObject::acquire(); diff --git a/svtools/source/table/cellvalueconversion.cxx b/svtools/source/table/cellvalueconversion.cxx index db62a06..8c6141a 100644 --- a/svtools/source/table/cellvalueconversion.cxx +++ b/svtools/source/table/cellvalueconversion.cxx @@ -152,8 +152,6 @@ namespace svt OSL_VERIFY( i_value >>= returnValue ); return returnValue; } - - virtual ~DoubleNormalization() override { } }; @@ -167,8 +165,6 @@ namespace svt { } - virtual ~IntegerNormalization() override {} - virtual double convertToDouble( Any const & i_value ) const override { sal_Int64 value( 0 ); @@ -188,8 +184,6 @@ namespace svt { } - virtual ~BooleanNormalization() override {} - virtual double convertToDouble( Any const & i_value ) const override { bool value( false ); @@ -209,8 +203,6 @@ namespace svt { } - virtual ~DateTimeNormalization() override {} - virtual double convertToDouble( Any const & i_value ) const override { double returnValue(0); @@ -243,8 +235,6 @@ namespace svt { } - virtual ~DateNormalization() override {} - virtual double convertToDouble( Any const & i_value ) const override { double returnValue(0); @@ -273,8 +263,6 @@ namespace svt { } - virtual ~TimeNormalization() override {} - virtual double convertToDouble( Any const & i_value ) const override { double returnValue(0); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index ece1379..fa2a391 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -107,7 +107,7 @@ class UnoTreeListItem : public SvLBoxString { public: UnoTreeListItem(); - virtual ~UnoTreeListItem() override; + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem * = nullptr ) override; void SetImage( const Image& rImage ); const OUString& GetGraphicURL() const { return maGraphicURL;} @@ -1495,12 +1495,6 @@ UnoTreeListItem::UnoTreeListItem() { } - -UnoTreeListItem::~UnoTreeListItem() -{ -} - - void UnoTreeListItem::Paint( const Point& rPos, SvTreeListBox& rDev, vcl::RenderContext& rRenderContext, const SvViewDataEntry* /*pView*/, const SvTreeListEntry& rEntry) { diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index 5859455..7fd3163 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -73,7 +73,6 @@ class SvUnoImageMapObject : public OWeakAggObject, public: SvUnoImageMapObject( sal_uInt16 nType, const SvEventDescription* pSupportedMacroItems ); SvUnoImageMapObject( const IMapObject& rMapObject, const SvEventDescription* pSupportedMacroItems ); - virtual ~SvUnoImageMapObject() throw() override; UNO3_GETIMPLEMENTATION_DECL( SvUnoImageMapObject ) @@ -245,10 +244,6 @@ SvUnoImageMapObject::SvUnoImageMapObject( const IMapObject& rMapObject, const Sv mxEvents = new SvMacroTableEventDescriptor( rMapObject.GetMacroTable(), pSupportedMacroItems ); } -SvUnoImageMapObject::~SvUnoImageMapObject() throw() -{ -} - IMapObject* SvUnoImageMapObject::createIMapObject() const { const OUString aURL( maURL ); commit 6eb60ca80115c35fbfce2789146e485835e7709e Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Dec 2 11:14:51 2016 +0100 loplugin:unnecessaryoverride (dtors) in svx Change-Id: Icc4d9919cedadc00f1420939564dd095fab74cca diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index 4541572..37b9ed2 100644 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -53,7 +53,6 @@ namespace accessibility AccessibleProxyEditSource_Impl( SdrObject& rObj, SdrView& rView, const vcl::Window& rViewWindow ); - virtual ~AccessibleProxyEditSource_Impl() override; // from the SvxEditSource interface SvxTextForwarder* GetTextForwarder() override; @@ -78,7 +77,6 @@ namespace accessibility public: AccessibleEmptyEditSource_Impl() {} - virtual ~AccessibleEmptyEditSource_Impl() override {} // SvxEditSource SvxTextForwarder* GetTextForwarder() override { return this; } @@ -176,10 +174,6 @@ namespace accessibility { } - AccessibleProxyEditSource_Impl::~AccessibleProxyEditSource_Impl() - { - } - SvxTextForwarder* AccessibleProxyEditSource_Impl::GetTextForwarder() { return maEditSource.GetTextForwarder(); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index bb26ebd..b2f5bee 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -76,7 +76,6 @@ class EnhancedCustomShapeEngine : public cppu::WeakImplHelper public: EnhancedCustomShapeEngine(); - virtual ~EnhancedCustomShapeEngine() override; // XInterface virtual void SAL_CALL acquire() throw() override; @@ -109,9 +108,6 @@ EnhancedCustomShapeEngine::EnhancedCustomShapeEngine() : mbForceGroupWithText ( false ) { } -EnhancedCustomShapeEngine::~EnhancedCustomShapeEngine() -{ -} // XInterface void SAL_CALL EnhancedCustomShapeEngine::acquire() throw() diff --git a/svx/source/dialog/SafeModeUI.cxx b/svx/source/dialog/SafeModeUI.cxx index a0afd1d..024d17b 100644 --- a/svx/source/dialog/SafeModeUI.cxx +++ b/svx/source/dialog/SafeModeUI.cxx @@ -25,7 +25,6 @@ class SafeModeUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo, { public: SafeModeUI(); - virtual ~SafeModeUI() override; // css.lang.XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -47,10 +46,6 @@ SafeModeUI::SafeModeUI() { } -SafeModeUI::~SafeModeUI() -{ -} - OUString SAL_CALL SafeModeUI::getImplementationName() throw(css::uno::RuntimeException, std::exception) { diff --git a/svx/source/dialog/crashreportui.cxx b/svx/source/dialog/crashreportui.cxx index 2b29da3..62e5edd 100644 --- a/svx/source/dialog/crashreportui.cxx +++ b/svx/source/dialog/crashreportui.cxx @@ -25,7 +25,6 @@ class CrashReportUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo { public: explicit CrashReportUI(const css::uno::Reference< css::uno::XComponentContext >& xContext); - virtual ~CrashReportUI() override; // css.lang.XServiceInfo @@ -53,10 +52,6 @@ CrashReportUI::CrashReportUI(const css::uno::Reference<css::uno::XComponentConte } -CrashReportUI::~CrashReportUI() -{ -} - OUString SAL_CALL CrashReportUI::getImplementationName() throw(css::uno::RuntimeException, std::exception) { diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index 74e32c9..f80ca7a 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -151,7 +151,6 @@ namespace svxform public: explicit FormScriptingEnvironment( FmFormModel& _rModel ); - virtual ~FormScriptingEnvironment() override; FormScriptingEnvironment(const FormScriptingEnvironment&) = delete; FormScriptingEnvironment& operator=(const FormScriptingEnvironment&) = delete; @@ -908,12 +907,6 @@ namespace svxform // This cycle is broken up when our instance is disposed. } - - FormScriptingEnvironment::~FormScriptingEnvironment() - { - } - - void FormScriptingEnvironment::impl_registerOrRevoke_throw( const Reference< XEventAttacherManager >& _rxManager, bool _bRegister ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 3b52074..2782d82e 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -129,7 +129,6 @@ public: sal_uIntPtr nObjectPos, bool bPreview, GalleryBrowser2* pBrowser ); - virtual ~GalleryThemePopup() override; void ExecutePopup( vcl::Window *pParent, const ::Point &aPos ); @@ -170,10 +169,6 @@ GalleryThemePopup::GalleryThemePopup( } -GalleryThemePopup::~GalleryThemePopup() -{ -} - void SAL_CALL GalleryThemePopup::statusChanged( const css::frame::FeatureStateEvent &rEvent ) throw ( css::uno::RuntimeException, std::exception ) diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx index 404062f..fea4e30 100644 --- a/svx/source/mnuctrls/smarttagmenu.cxx +++ b/svx/source/mnuctrls/smarttagmenu.cxx @@ -28,7 +28,6 @@ class SmartTagMenuController : public svt::PopupMenuControllerBase { public: explicit SmartTagMenuController( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~SmartTagMenuController() override; // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) override; @@ -58,10 +57,6 @@ SmartTagMenuController::SmartTagMenuController( const css::uno::Reference< css:: { } -SmartTagMenuController::~SmartTagMenuController() -{ -} - void SmartTagMenuController::statusChanged( const css::frame::FeatureStateEvent& rEvent ) throw ( css::uno::RuntimeException, std::exception ) { diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index 6223316..6a18666 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -73,7 +73,6 @@ public: const drawinglayer::geometry::ViewInformation2D& rViewInformation, bool bTextAnimationAllowed, bool bGraphicAnimationAllowed); - virtual ~AnimatedExtractingProcessor2D() override; // data access const drawinglayer::primitive2d::Primitive2DContainer& getPrimitive2DSequence() const { return maPrimitive2DSequence; } @@ -92,10 +91,6 @@ AnimatedExtractingProcessor2D::AnimatedExtractingProcessor2D( { } -AnimatedExtractingProcessor2D::~AnimatedExtractingProcessor2D() -{ -} - void AnimatedExtractingProcessor2D::processBasePrimitive2D(const drawinglayer::primitive2d::BasePrimitive2D& rCandidate) { // known implementation, access directly diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx index 664586e..ebe0191 100644 --- a/svx/source/sidebar/PanelFactory.cxx +++ b/svx/source/sidebar/PanelFactory.cxx @@ -65,7 +65,6 @@ class PanelFactory { public: PanelFactory(); - virtual ~PanelFactory() override; PanelFactory(const PanelFactory&) = delete; PanelFactory& operator=(const PanelFactory&) = delete; @@ -96,12 +95,6 @@ PanelFactory::PanelFactory() { } - -PanelFactory::~PanelFactory() -{ -} - - Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 4ca13f6..90f91f1 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -131,7 +131,6 @@ class SdrGraphicUpdater : public ::osl::Thread { public: SdrGraphicUpdater( const OUString& rFileName, const OUString& rFilterName, SdrGraphicLink& ); - virtual ~SdrGraphicUpdater() override; void SAL_CALL Terminate(); @@ -167,10 +166,6 @@ SdrGraphicUpdater::SdrGraphicUpdater( const OUString& rFileName, const OUString& create(); } -SdrGraphicUpdater::~SdrGraphicUpdater() -{ -} - void SdrGraphicUpdater::Terminate() { mbIsTerminated = true; diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 16566fb..d46f645 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -44,17 +44,12 @@ public: : ::sfx2::SvBaseLink( ::SfxLinkUpdateMode::ONCALL, SotClipboardFormatId::SIMPLE_FILE ), pSdrObj( pObj1 ) {} - virtual ~ImpSdrObjTextLink() override; virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& rMimeType, const css::uno::Any & rValue ) override; }; -ImpSdrObjTextLink::~ImpSdrObjTextLink() -{ -} - void ImpSdrObjTextLink::Closed() { if (pSdrObj ) diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 9a96ec9..65fc32d 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -159,9 +159,6 @@ namespace sdr // constructor for copying, but using new object CellProperties(const CellProperties& rProps, SdrObject& rObj, sdr::table::Cell* pCell); - // destructor - virtual ~CellProperties() override; - // Clone() operator, normally just calls the local copy constructor BaseProperties& Clone(SdrObject& rObj) const override; @@ -216,10 +213,6 @@ namespace sdr { } - CellProperties::~CellProperties() - { - } - BaseProperties& CellProperties::Clone(SdrObject& rObj) const { OSL_FAIL("CellProperties::Clone(), does not work yet!"); diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 2c8a990..eadd5a9 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -94,9 +94,6 @@ public: // constructor for copying, but using new object TableProperties(const TableProperties& rProps, SdrObject& rObj ); - // destructor - virtual ~TableProperties() override; - // Clone() operator, normally just calls the local copy constructor BaseProperties& Clone(SdrObject& rObj) const override; @@ -113,10 +110,6 @@ TableProperties::TableProperties(const TableProperties& rProps, SdrObject& rObj) { } -TableProperties::~TableProperties() -{ -} - BaseProperties& TableProperties::Clone(SdrObject& rObj) const { return *(new TableProperties(*this, rObj)); diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 53647e9..a6645d2 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -52,7 +52,6 @@ protected: public: OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, bool bVisible ); - virtual ~OverlayTableEdge() override; }; @@ -205,10 +204,6 @@ OverlayTableEdge::OverlayTableEdge( const basegfx::B2DPolyPolygon& rPolyPolygon, { } -OverlayTableEdge::~OverlayTableEdge() -{ -} - drawinglayer::primitive2d::Primitive2DContainer OverlayTableEdge::createOverlayObjectPrimitive2DSequence() { drawinglayer::primitive2d::Primitive2DContainer aRetval; diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index c42d262..8ae9fe8 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -49,7 +49,6 @@ class FontHeightToolBoxControl : public svt::ToolboxController, public: explicit FontHeightToolBoxControl( const css::uno::Reference< css::uno::XComponentContext >& rServiceManager ); - virtual ~FontHeightToolBoxControl() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; @@ -272,10 +271,6 @@ FontHeightToolBoxControl::FontHeightToolBoxControl( const uno::Reference< uno::X addStatusListener( ".uno:CharFontName"); } -FontHeightToolBoxControl::~FontHeightToolBoxControl() -{ -} - // XInterface css::uno::Any SAL_CALL FontHeightToolBoxControl::queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index deedad6..2a852fc 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -140,7 +140,6 @@ namespace { { public: GraphicExporter(); - virtual ~GraphicExporter() override; // XFilter virtual sal_Bool SAL_CALL filter( const Sequence< PropertyValue >& aDescriptor ) throw(RuntimeException, std::exception) override; @@ -283,7 +282,6 @@ class ImplExportCheckVisisbilityRedirector : public sdr::contact::ViewObjectCont { public: explicit ImplExportCheckVisisbilityRedirector( SdrPage* pCurrentPage ); - virtual ~ImplExportCheckVisisbilityRedirector() override; virtual drawinglayer::primitive2d::Primitive2DContainer createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, @@ -298,10 +296,6 @@ ImplExportCheckVisisbilityRedirector::ImplExportCheckVisisbilityRedirector( SdrP { } -ImplExportCheckVisisbilityRedirector::~ImplExportCheckVisisbilityRedirector() -{ -} - drawinglayer::primitive2d::Primitive2DContainer ImplExportCheckVisisbilityRedirector::createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) @@ -333,10 +327,6 @@ GraphicExporter::GraphicExporter() { } -GraphicExporter::~GraphicExporter() -{ -} - IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) { if( pInfo ) diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index e542d61..548865e 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -55,7 +55,6 @@ namespace svx public: NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool ); - virtual ~NamespaceMap() override; // XNameAccess virtual Any SAL_CALL getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; @@ -186,10 +185,6 @@ NamespaceMap::NamespaceMap( sal_uInt16* pWhichIds, SfxItemPool* pPool ) { } -NamespaceMap::~NamespaceMap() -{ -} - // XNameAccess Any SAL_CALL NamespaceMap::getByName( const OUString& aName ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 83a64e9..2b1f579 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -53,8 +53,6 @@ private: public: SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw(); - virtual ~SvxUnoXPropertyTable() throw() override; - virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) = 0; virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException, lang::IllegalArgumentException) = 0; @@ -82,10 +80,6 @@ SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pLi { } -SvxUnoXPropertyTable::~SvxUnoXPropertyTable() throw() -{ -} - const XPropertyEntry* SvxUnoXPropertyTable::get(long index) const { if( mpList ) diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index b70c6d7..150d5be 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -42,7 +42,6 @@ private: public: explicit SvxUnoGluePointAccess( SdrObject* pObject ) throw(); - virtual ~SvxUnoGluePointAccess() throw() override; // XIdentifierContainer virtual sal_Int32 SAL_CALL insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; @@ -196,10 +195,6 @@ SvxUnoGluePointAccess::SvxUnoGluePointAccess( SdrObject* pObject ) throw() { } -SvxUnoGluePointAccess::~SvxUnoGluePointAccess() throw() -{ -} - // XIdentifierContainer sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) throw (lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 0404e39..90ab284 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -78,11 +78,6 @@ class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo /** @short TODO */ explicit RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& xContext); - - /** @short TODO */ - virtual ~RecoveryUI() override; - - // css.lang.XServiceInfo virtual OUString SAL_CALL getImplementationName() @@ -120,10 +115,6 @@ RecoveryUI::RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >& { } -RecoveryUI::~RecoveryUI() -{ -} - OUString SAL_CALL RecoveryUI::getImplementationName() throw(css::uno::RuntimeException, std::exception) { diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index f2f927f..388c2e4 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -39,7 +39,6 @@ class SvxUnoBitmapTable : public SvxUnoNameItemTable { public: explicit SvxUnoBitmapTable( SdrModel* pModel ) throw(); - virtual ~SvxUnoBitmapTable() throw() override; virtual NameOrIndex* createItem() const throw() override; virtual bool isValid( const NameOrIndex* pItem ) const override; @@ -57,10 +56,6 @@ SvxUnoBitmapTable::SvxUnoBitmapTable( SdrModel* pModel ) throw() { } -SvxUnoBitmapTable::~SvxUnoBitmapTable() throw() -{ -} - bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const { if( SvxUnoNameItemTable::isValid( pItem ) ) diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 07ebbb3..5574ec2 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -37,7 +37,6 @@ class SvxUnoDashTable : public SvxUnoNameItemTable { public: explicit SvxUnoDashTable( SdrModel* pModel ) throw(); - virtual ~SvxUnoDashTable() throw() override; virtual NameOrIndex* createItem() const throw() override; @@ -54,10 +53,6 @@ SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw() { } -SvxUnoDashTable::~SvxUnoDashTable() throw() -{ -} - OUString SAL_CALL SvxUnoDashTable::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SvxUnoDashTable"); diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 82519d2..148bc63 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -36,7 +36,6 @@ class SvxUnoGradientTable : public SvxUnoNameItemTable { public: explicit SvxUnoGradientTable( SdrModel* pModel ) throw(); - virtual ~SvxUnoGradientTable() throw() override; virtual NameOrIndex* createItem() const throw() override; @@ -53,10 +52,6 @@ SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw() { } -SvxUnoGradientTable::~SvxUnoGradientTable() throw() -{ -} - OUString SAL_CALL SvxUnoGradientTable::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SvxUnoGradientTable"); diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 0bdd10a..dcfda97 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -36,7 +36,6 @@ class SvxUnoHatchTable : public SvxUnoNameItemTable { public: explicit SvxUnoHatchTable( SdrModel* pModel ) throw(); - virtual ~SvxUnoHatchTable() throw() override; virtual NameOrIndex* createItem() const throw() override; @@ -53,10 +52,6 @@ SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw() { } -SvxUnoHatchTable::~SvxUnoHatchTable() throw() -{ -} - OUString SAL_CALL SvxUnoHatchTable::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SvxUnoHatchTable"); diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index 40f02f2..55033c6 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -73,7 +73,6 @@ private: public: explicit SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) throw(); - virtual ~SvxUnoDrawPagesAccess() throw() override; // XDrawPages virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL insertNewByIndex( sal_Int32 nIndex ) throw(css::uno::RuntimeException, std::exception) override; @@ -577,10 +576,6 @@ SvxUnoDrawPagesAccess::SvxUnoDrawPagesAccess( SvxUnoDrawingModel& rMyModel ) th { } -SvxUnoDrawPagesAccess::~SvxUnoDrawPagesAccess() throw() -{ -} - // XIndexAccess sal_Int32 SAL_CALL SvxUnoDrawPagesAccess::getCount() throw(uno::RuntimeException, std::exception) diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index d284912..7ab047d 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -53,7 +53,6 @@ private: public: SvxShapeCollection() throw(); - virtual ~SvxShapeCollection() throw() override; // XInterface virtual void SAL_CALL release() throw() override; @@ -86,11 +85,6 @@ SvxShapeCollection::SvxShapeCollection() throw() { } - -SvxShapeCollection::~SvxShapeCollection() throw() -{ -} - // XInterface void SvxShapeCollection::release() throw() { diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index bf856ed..f2f9f58 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -36,7 +36,6 @@ class SvxUnoTransGradientTable : public SvxUnoNameItemTable { public: explicit SvxUnoTransGradientTable( SdrModel* pModel ) throw(); - virtual ~SvxUnoTransGradientTable() throw() override; virtual NameOrIndex* createItem() const throw() override; @@ -53,10 +52,6 @@ SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw() { } -SvxUnoTransGradientTable::~SvxUnoTransGradientTable() throw() -{ -} - OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("SvxUnoTransGradientTable"); diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index eaba0c9..3bf4c0d 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -73,7 +73,6 @@ class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper<XOutputStream> public: OutputStorageWrapper_Impl(); - virtual ~OutputStorageWrapper_Impl() override; // css::io::XOutputStream virtual void SAL_CALL writeBytes(const Sequence< sal_Int8 >& aData) throw(NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception) override; @@ -92,10 +91,6 @@ OutputStorageWrapper_Impl::OutputStorageWrapper_Impl() xOut = new OOutputStreamWrapper( *pStream ); } -OutputStorageWrapper_Impl::~OutputStorageWrapper_Impl() -{ -} - SvStream *OutputStorageWrapper_Impl::GetStream() { if( bStreamClosed ) diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 6ac0f44..597f3bc 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -89,7 +89,6 @@ private: public: explicit SvXMLGraphicInputStream( const OUString& rGraphicId ); - virtual ~SvXMLGraphicInputStream() override; SvXMLGraphicInputStream(const SvXMLGraphicInputStream&) = delete; SvXMLGraphicInputStream& operator=(const SvXMLGraphicInputStream&) = delete; @@ -151,10 +150,6 @@ SvXMLGraphicInputStream::SvXMLGraphicInputStream( const OUString& rGraphicId ) } } -SvXMLGraphicInputStream::~SvXMLGraphicInputStream() -{ -} - sal_Int32 SAL_CALL SvXMLGraphicInputStream::readBytes( Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) throw( NotConnectedException, BufferSizeExceededException, RuntimeException, std::exception ) { diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 7e847fa..2339131 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -79,7 +79,6 @@ class SvxXMLColorEntryExporter : public SvxXMLTableEntryExporter { public: explicit SvxXMLColorEntryExporter( SvXMLExport& rExport ); - virtual ~SvxXMLColorEntryExporter() override; virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override; }; @@ -88,7 +87,6 @@ class SvxXMLLineEndEntryExporter : public SvxXMLTableEntryExporter { public: explicit SvxXMLLineEndEntryExporter( SvXMLExport& rExport ); - virtual ~SvxXMLLineEndEntryExporter() override; virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override; private: @@ -99,7 +97,6 @@ class SvxXMLDashEntryExporter : public SvxXMLTableEntryExporter { public: explicit SvxXMLDashEntryExporter( SvXMLExport& rExport ); - virtual ~SvxXMLDashEntryExporter() override; virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override; @@ -111,7 +108,6 @@ class SvxXMLHatchEntryExporter : public SvxXMLTableEntryExporter { public: explicit SvxXMLHatchEntryExporter( SvXMLExport& rExport ); - virtual ~SvxXMLHatchEntryExporter() override; virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override; private: @@ -122,7 +118,6 @@ class SvxXMLGradientEntryExporter : public SvxXMLTableEntryExporter { public: explicit SvxXMLGradientEntryExporter( SvXMLExport& rExport ); - virtual ~SvxXMLGradientEntryExporter() override; virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override; private: @@ -133,7 +128,6 @@ class SvxXMLBitmapEntryExporter : public SvxXMLTableEntryExporter { public: explicit SvxXMLBitmapEntryExporter( SvXMLExport& rExport ); - virtual ~SvxXMLBitmapEntryExporter() override; virtual void exportEntry( const OUString& rStrName, const Any& rValue ) override; }; @@ -428,10 +422,6 @@ SvxXMLColorEntryExporter::SvxXMLColorEntryExporter( SvXMLExport& rExport ) { } -SvxXMLColorEntryExporter::~SvxXMLColorEntryExporter() -{ -} - void SvxXMLColorEntryExporter::exportEntry( const OUString& rStrName, const Any& rValue ) { mrExport.AddAttribute( XML_NAMESPACE_DRAW, XML_NAME, rStrName ); @@ -452,10 +442,6 @@ SvxXMLLineEndEntryExporter::SvxXMLLineEndEntryExporter( SvXMLExport& rExport ) { } -SvxXMLLineEndEntryExporter::~SvxXMLLineEndEntryExporter() -{ -} - void SvxXMLLineEndEntryExporter::exportEntry( const OUString& rStrName, const Any& rValue ) { maMarkerStyle.exportXML( rStrName, rValue ); @@ -467,10 +453,6 @@ SvxXMLDashEntryExporter::SvxXMLDashEntryExporter( SvXMLExport& rExport ) { } -SvxXMLDashEntryExporter::~SvxXMLDashEntryExporter() -{ -} - void SvxXMLDashEntryExporter::exportEntry( const OUString& rStrName, const Any& rValue ) { maDashStyle.exportXML( rStrName, rValue ); @@ -482,10 +464,6 @@ SvxXMLHatchEntryExporter::SvxXMLHatchEntryExporter( SvXMLExport& rExport ) { } -SvxXMLHatchEntryExporter::~SvxXMLHatchEntryExporter() -{ -} - void SvxXMLHatchEntryExporter::exportEntry( const OUString& rStrName, const Any& rValue ) { maHatchStyle.exportXML( rStrName, rValue ); @@ -497,10 +475,6 @@ SvxXMLGradientEntryExporter::SvxXMLGradientEntryExporter( SvXMLExport& rExport ) { } -SvxXMLGradientEntryExporter::~SvxXMLGradientEntryExporter() -{ -} - void SvxXMLGradientEntryExporter::exportEntry( const OUString& rStrName, const Any& rValue ) { maGradientStyle.exportXML( rStrName, rValue ); @@ -512,10 +486,6 @@ SvxXMLBitmapEntryExporter::SvxXMLBitmapEntryExporter( SvXMLExport& rExport ) { } -SvxXMLBitmapEntryExporter::~SvxXMLBitmapEntryExporter() -{ -} - void SvxXMLBitmapEntryExporter::exportEntry( const OUString& rStrName, const Any& rValue ) { XMLImageStyle::exportXML( rStrName, rValue, mrExport ); diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 186b00c..e0db2a9 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -73,7 +73,6 @@ class SvxXMLTableImportContext : public SvXMLImportContext public: SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, bool bOOoFormat ); - virtual ~SvxXMLTableImportContext() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ) override; @@ -98,10 +97,6 @@ SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uI { } -SvxXMLTableImportContext::~SvxXMLTableImportContext() -{ -} - SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList ) { if( XML_NAMESPACE_DRAW == nPrefix ) commit 0e513fdc44c36df54949628d7497345cff804f59 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Dec 2 11:14:23 2016 +0100 loplugin:unnecessaryoverride (dtors) in sw Change-Id: Ia54c3e8b8e307ddb89347e4471e2792d4097a96e diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx index c38f58f..d22daa6 100644 --- a/sw/qa/core/Test-BigPtrArray.cxx +++ b/sw/qa/core/Test-BigPtrArray.cxx @@ -45,10 +45,6 @@ namespace /* private */ { } - virtual ~BigPtrEntryMock() override - { - } - sal_uLong getCount() const { return count_; diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx index fafb771..cb6fe9f 100644 --- a/sw/source/core/doc/CntntIdxStore.cxx +++ b/sw/source/core/doc/CntntIdxStore.cxx @@ -170,7 +170,7 @@ namespace RestoreUnoCursors(aUpdater); RestoreShellCursors(aUpdater); } - virtual ~ContentIdxStoreImpl() override {}; + private: inline void SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent); inline void RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater); diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx index 5a36166..288dc1a 100644 --- a/sw/source/core/docnode/finalthreadmanager.cxx +++ b/sw/source/core/docnode/finalthreadmanager.cxx @@ -44,8 +44,6 @@ class CancelJobsThread : public osl::Thread { } - virtual ~CancelJobsThread() override {} - void addJobs( std::list< css::uno::Reference< css::util::XCancellable > >& rJobs ); bool allJobsCancelled() const; void stopWhenAllJobsCancelled(); @@ -159,7 +157,6 @@ class TerminateOfficeThread : public osl::Thread { } - virtual ~TerminateOfficeThread() override {} void StopOfficeTermination(); private: diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 4908cc9..2ce6cad 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -2002,8 +2002,6 @@ namespace sdr : ViewObjectContactOfSdrObj(rObjectContact, rViewContact) { } - - virtual ~VOCOfDrawVirtObj() override; }; class VCOfDrawVirtObj : public ViewContactOfVirtObj @@ -2022,7 +2020,6 @@ namespace sdr : ViewContactOfVirtObj(rObj) { } - virtual ~VCOfDrawVirtObj() override; /// access to SwDrawVirtObj SwDrawVirtObj& GetSwDrawVirtObj() const @@ -2129,18 +2126,11 @@ namespace sdr return xRetval; } - VOCOfDrawVirtObj::~VOCOfDrawVirtObj() - { - } - ViewObjectContact& VCOfDrawVirtObj::CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) { return *(new VOCOfDrawVirtObj(rObjectContact, *this)); } - VCOfDrawVirtObj::~VCOfDrawVirtObj() - { - } } // end of namespace contact } // end of namespace sdr diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 0a360cc..bd38e86 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -92,7 +92,6 @@ namespace sdr : ViewContactOfSdrObj(rObj) { } - virtual ~VCOfSwFlyDrawObj() override; }; drawinglayer::primitive2d::Primitive2DContainer VCOfSwFlyDrawObj::createViewIndependentPrimitive2DSequence() const @@ -101,9 +100,6 @@ namespace sdr return drawinglayer::primitive2d::Primitive2DContainer(); } - VCOfSwFlyDrawObj::~VCOfSwFlyDrawObj() - { - } } // end of namespace contact } // end of namespace sdr @@ -265,7 +261,6 @@ namespace sdr : ViewContactOfVirtObj(rObj) { } - virtual ~VCOfSwVirtFlyDrawObj() override; /// access to SwVirtFlyDrawObj SwVirtFlyDrawObj& GetSwVirtFlyDrawObj() const @@ -305,9 +300,6 @@ namespace sdr return xRetval; } - VCOfSwVirtFlyDrawObj::~VCOfSwVirtFlyDrawObj() - { - } } // end of namespace contact } // end of namespace sdr diff --git a/sw/source/core/layout/dbg_lay.cxx b/sw/source/core/layout/dbg_lay.cxx index 8c61c12..03fca24 100644 --- a/sw/source/core/layout/dbg_lay.cxx +++ b/sw/source/core/layout/dbg_lay.cxx @@ -177,7 +177,7 @@ class SwSizeEnterLeave : public SwImplEnterLeave public: SwSizeEnterLeave( const SwFrame* pF, PROT nFunct, DbgAction nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrameHeight( pF->Frame().Height() ) {} - virtual ~SwSizeEnterLeave() override {} + virtual void Leave() override; // resize message }; @@ -187,7 +187,7 @@ class SwUpperEnterLeave : public SwImplEnterLeave public: SwUpperEnterLeave( const SwFrame* pF, PROT nFunct, DbgAction nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), nFrameId( 0 ) {} - virtual ~SwUpperEnterLeave() override {} + virtual void Enter() override; // message virtual void Leave() override; // message of FrameId from upper }; @@ -198,7 +198,7 @@ class SwFrameChangesLeave : public SwImplEnterLeave public: SwFrameChangesLeave( const SwFrame* pF, PROT nFunct, DbgAction nAct, void* pPar ) : SwImplEnterLeave( pF, nFunct, nAct, pPar ), aFrame( pF->Frame() ) {} - virtual ~SwFrameChangesLeave() override {} + virtual void Enter() override; // no message virtual void Leave() override; // message when resizing the Frame area }; diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index a5471f7..34f2f2dc 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3127,9 +3127,6 @@ namespace : mrViewShell( rSh ) {}; - virtual ~SwViewObjectContactRedirector() override - {} - virtual drawinglayer::primitive2d::Primitive2DContainer createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, const sdr::contact::DisplayInfo& rDisplayInfo) override diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 2ca0d18a..a69d2e6 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -151,7 +151,6 @@ class SwEmbedObjectLink : public sfx2::SvBaseLink public: explicit SwEmbedObjectLink(SwOLENode* pNode); - virtual ~SwEmbedObjectLink() override; virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( @@ -167,10 +166,6 @@ SwEmbedObjectLink::SwEmbedObjectLink(SwOLENode* pNode): SetSynchron( false ); } -SwEmbedObjectLink::~SwEmbedObjectLink() -{ -} - ::sfx2::SvBaseLink::UpdateResult SwEmbedObjectLink::DataChanged( const OUString&, const uno::Any& ) { diff --git a/sw/source/core/swg/SwXMLBlockImport.cxx b/sw/source/core/swg/SwXMLBlockImport.cxx index b05d364..2fae105 100644 --- a/sw/source/core/swg/SwXMLBlockImport.cxx +++ b/sw/source/core/swg/SwXMLBlockImport.cxx @@ -51,7 +51,6 @@ private: public: SwXMLBlockListContext( SwXMLBlockListImport& rImport, sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); - virtual ~SwXMLBlockListContext() override; virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) @@ -63,7 +62,6 @@ class SwXMLBlockContext : public SvXMLImportContext public: SwXMLBlockContext( SwXMLBlockListImport& rImport, sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ); - virtual ~SwXMLBlockContext() override; }; class SwXMLTextBlockDocumentContext : public SvXMLImportContext @@ -78,8 +76,6 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - - virtual ~SwXMLTextBlockDocumentContext() override; }; class SwXMLTextBlockBodyContext : public SvXMLImportContext @@ -94,8 +90,6 @@ public: virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - - virtual ~SwXMLTextBlockBodyContext() override; }; class SwXMLTextBlockTextContext : public SvXMLImportContext @@ -111,8 +105,6 @@ public: sal_Int32 Element, const css::uno::Reference< css::xml::sax::XFastAttributeList > & xAttrList ) throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) override; - - virtual ~SwXMLTextBlockTextContext() override; }; class SwXMLTextBlockParContext : public SvXMLImportContext @@ -197,10 +189,6 @@ SwXMLBlockListContext::SwXMLBlockListContext( rImport.getBlockList().SetName( xAttrList->getValue( SwXMLBlockListToken::LIST_NAME ) ); } -SwXMLBlockListContext::~SwXMLBlockListContext() -{ -} - uno::Reference< ::xml::sax::XFastContextHandler > SAL_CALL SwXMLBlockListContext::createFastChildContext( sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList > & xAttrList ) @@ -241,10 +229,6 @@ SwXMLBlockContext::SwXMLBlockContext( rImport.getBlockList().AddName( aShort, aLong, aPackageName, bTextOnly); } -SwXMLBlockContext::~SwXMLBlockContext() -{ -} - SwXMLTextBlockDocumentContext::SwXMLTextBlockDocumentContext( SwXMLTextBlockImport& rImport, sal_Int32 /*Element*/, @@ -265,10 +249,6 @@ SwXMLTextBlockDocumentContext::createFastChildContext( sal_Int32 Element, return new SvXMLImportContext( rLocalRef ); } -SwXMLTextBlockDocumentContext::~SwXMLTextBlockDocumentContext() -{ -} - SwXMLTextBlockTextContext::SwXMLTextBlockTextContext( SwXMLTextBlockImport& rImport, sal_Int32 /*Element*/, @@ -289,10 +269,6 @@ SwXMLTextBlockTextContext::createFastChildContext( sal_Int32 Element, return new SvXMLImportContext( rLocalRef ); } -SwXMLTextBlockTextContext::~SwXMLTextBlockTextContext() -{ -} - SwXMLTextBlockBodyContext::SwXMLTextBlockBodyContext( SwXMLTextBlockImport& rImport, sal_Int32 /*Element*/, @@ -315,10 +291,6 @@ SwXMLTextBlockBodyContext::createFastChildContext( sal_Int32 Element, return new SvXMLImportContext( rLocalRef ); } -SwXMLTextBlockBodyContext::~SwXMLTextBlockBodyContext() -{ -} - SwXMLTextBlockParContext::SwXMLTextBlockParContext( SwXMLTextBlockImport& rImport, sal_Int32 /*Element*/, diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx index 7161ac7..5585891 100644 --- a/sw/source/core/text/xmldump.cxx +++ b/sw/source/core/text/xmldump.cxx @@ -107,10 +107,6 @@ class XmlPortionDumper:public SwPortionHandler { } - virtual ~ XmlPortionDumper( ) override - { - } - /** @param nLength length of this portion in the model string diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 8e4cbd1..0afe25a 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -400,8 +400,6 @@ public: nCapWidth( nCapitalWidth ), nOrgWidth( rInfo.GetWidth() ) { } - - virtual ~SwDoDrawStretchCapital() override {} }; void SwDoDrawStretchCapital::Do() diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx index 8f12aa7..891f645 100644 --- a/sw/source/core/undo/unsect.cxx +++ b/sw/source/core/undo/unsect.cxx @@ -288,8 +288,6 @@ public: SwUndoDelSection( SwSectionFormat const&, SwSection const&, SwNodeIndex const*const); - virtual ~SwUndoDelSection() override; - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; @@ -315,10 +313,6 @@ SwUndoDelSection::SwUndoDelSection( { } -SwUndoDelSection::~SwUndoDelSection() -{ -} - void SwUndoDelSection::UndoImpl(::sw::UndoRedoContext & rContext) { SwDoc & rDoc = rContext.GetDoc(); @@ -396,8 +390,6 @@ public: SwUndoUpdateSection( SwSection const&, SwNodeIndex const*const, bool const bOnlyAttr); - virtual ~SwUndoUpdateSection() override; - virtual void UndoImpl( ::sw::UndoRedoContext & ) override; virtual void RedoImpl( ::sw::UndoRedoContext & ) override; }; @@ -420,10 +412,6 @@ SwUndoUpdateSection::SwUndoUpdateSection( { } -SwUndoUpdateSection::~SwUndoUpdateSection() -{ -} - void SwUndoUpdateSection::UndoImpl(::sw::UndoRedoContext & rContext) { SwDoc & rDoc = rContext.GetDoc(); diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 33565d3..dbc5180 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -956,7 +956,6 @@ class SwFrameProperties_Impl : public BaseFrameProperties_Impl { public: SwFrameProperties_Impl(); - virtual ~SwFrameProperties_Impl() override {} bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrameSet, SfxItemSet& rSet, bool& rSizeFound) override; }; @@ -1021,7 +1020,6 @@ class SwGraphicProperties_Impl : public BaseFrameProperties_Impl { public: SwGraphicProperties_Impl(); - virtual ~SwGraphicProperties_Impl() override {} virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrameSet, SfxItemSet& rSet, bool& rSizeFound) override; }; @@ -1123,7 +1121,6 @@ class SwOLEProperties_Impl : public SwFrameProperties_Impl public: SwOLEProperties_Impl() : SwFrameProperties_Impl(/*aSwMapProvider.GetPropertyMap(PROPERTY_MAP_EMBEDDED_OBJECT)*/ ){} - virtual ~SwOLEProperties_Impl() override {} virtual bool AnyToItemSet( SwDoc* pDoc, SfxItemSet& rFrameSet, SfxItemSet& rSet, bool& rSizeFound) override; }; diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 382255e..0615ff5 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -197,8 +197,6 @@ namespace sw StartListening(*m_pBasePool); } - virtual ~XStyleFamily() override {}; - //XIndexAccess virtual sal_Int32 SAL_CALL getCount() throw( uno::RuntimeException, std::exception ) override { @@ -397,7 +395,6 @@ public: const OUString& rStyleName) : SwXStyle(&rPool, SfxStyleFamily::Frame, pDoc, rStyleName){} explicit SwXFrameStyle(SwDoc *pDoc); - virtual ~SwXFrameStyle() override; virtual void SAL_CALL acquire( ) throw() override {SwXStyle::acquire();} virtual void SAL_CALL release( ) throw() override {SwXStyle::release();} @@ -423,7 +420,6 @@ protected: public: SwXPageStyle(SfxStyleSheetBasePool& rPool, SwDocShell* pDocSh, const OUString& rStyleName); explicit SwXPageStyle(SwDocShell* pDocSh); - virtual ~SwXPageStyle() override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; @@ -2799,9 +2795,6 @@ SwXPageStyle::SwXPageStyle(SwDocShell* pDocSh) : SwXStyle(pDocSh->GetDoc(), SfxStyleFamily::Page) { } -SwXPageStyle::~SwXPageStyle() -{ } - void SwXStyle::PutItemToSet(const SvxSetItem* pSetItem, const SfxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry& rEntry, const uno::Any& rVal, SwStyleBase_Impl& rBaseImpl) { // create a new SvxSetItem and get it's ItemSet as new target @@ -3298,9 +3291,6 @@ SwXFrameStyle::SwXFrameStyle(SwDoc *pDoc) : SwXStyle(pDoc, SfxStyleFamily::Frame, false) { } -SwXFrameStyle::~SwXFrameStyle() -{ } - void SwXFrameStyle::SetItem(enum RES_FRMATR eAtr, const SfxPoolItem& rItem) { SfxStyleSheetBase* pBase = GetStyleSheetBase(); diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index 532efa4..9160240 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -372,7 +372,6 @@ class SwHTMLImageWatcher : public: SwHTMLImageWatcher( const uno::Reference< drawing::XShape > & rShape, bool bWidth, bool bHeight ); - virtual ~SwHTMLImageWatcher() override; // startProduction darf nicht im Konstruktor gerufen werden, weil // wir und ggf. selbst zerstoeren ... Deshlab eine eigene Methode. @@ -435,10 +434,6 @@ SwHTMLImageWatcher::SwHTMLImageWatcher( xSrc->getImageProducer()->addConsumer( xThis ); } -SwHTMLImageWatcher::~SwHTMLImageWatcher() -{ -} - void SwHTMLImageWatcher::clear() { // Am Shape als Event-Listener abmelden diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx index d5d5736..94e4dc9 100644 --- a/sw/source/filter/html/htmltab.cxx +++ b/sw/source/filter/html/htmltab.cxx @@ -2953,7 +2953,6 @@ public: HTMLTable *m_pTable; explicit SectionSaveStruct( SwHTMLParser& rParser ); - virtual ~SectionSaveStruct() override; #if OSL_DEBUG_LEVEL > 0 size_t GetContextStAttrMin() const { return m_nContextStAttrMinSave; } @@ -2985,9 +2984,6 @@ SectionSaveStruct::SectionSaveStruct( SwHTMLParser& rParser ) : rParser.m_nDefListDeep = 0; } -SectionSaveStruct::~SectionSaveStruct() -{} - void SectionSaveStruct::Restore( SwHTMLParser& rParser ) { // Font-Stacks wieder auftauen @@ -4726,13 +4722,8 @@ public: // Die alte Numerierung wieder aufspannen rParser.GetNumInfo().Set( aNumRuleInfo ); } - - virtual ~CaptionSaveStruct() override; }; -CaptionSaveStruct::~CaptionSaveStruct() -{} - void SwHTMLParser::BuildTableCaption( HTMLTable *pCurTable ) { // <CAPTION> wurde bereits gelesen @@ -4932,17 +4923,12 @@ public: m_pCurrentTable( pCurTable ) {} - virtual ~TableSaveStruct() override; - // Aufbau der Tabelle anstossen und die Tabelle ggf. in einen // Rahmen packen. Wenn true zurueckgegeben wird muss noch ein // Absatz eingefuegt werden! void MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ); }; -TableSaveStruct::~TableSaveStruct() -{} - void TableSaveStruct::MakeTable( sal_uInt16 nWidth, SwPosition& rPos, SwDoc *pDoc ) { m_pCurrentTable->MakeTable(nullptr, nWidth); diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 80dedfb..5e31a3c 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -1314,7 +1314,7 @@ private: public: SwRTFWriter(const OUString& rFilterName, const OUString& rBaseURL); - ~SwRTFWriter() override; + sal_uLong WriteStream() override; }; @@ -1325,8 +1325,6 @@ SwRTFWriter::SwRTFWriter(const OUString& rFltName, const OUString& rBaseURL) m_bOutOutlineOnly = rFltName.startsWith("O"); } -SwRTFWriter::~SwRTFWriter() = default; - sal_uLong SwRTFWriter::WriteStream() { SwPaM aPam(*pCurPam->End(), *pCurPam->Start()); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 4bc3a34..dffd691 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -457,7 +457,7 @@ struct SBBItem public: Sttb(); - virtual ~Sttb() override; + bool Read(SvStream &rS) override; #if OSL_DEBUG_LEVEL > 1 virtual void Print( FILE* fp ) override; @@ -472,10 +472,6 @@ Sttb::Sttb() { } -Sttb::~Sttb() -{ -} - bool Sttb::Read( SvStream& rS ) { SAL_INFO("sw.ww8", "stream pos " << rS.Tell()); diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx index b65cb0d..dd792d3 100644 --- a/sw/source/filter/xml/xmlfmt.cxx +++ b/sw/source/filter/xml/xmlfmt.cxx @@ -203,8 +203,6 @@ public: SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLConditionContext_Impl() override; - bool IsValid() const { return 0 != nCondition; } }; @@ -247,11 +245,6 @@ SwXMLConditionContext_Impl::SwXMLConditionContext_Impl( } } -SwXMLConditionContext_Impl::~SwXMLConditionContext_Impl() -{ -} - - typedef std::vector<rtl::Reference<SwXMLConditionContext_Impl>> SwXMLConditions_Impl; class SwXMLTextStyleContext_Impl : public XMLTextStyleContext @@ -662,7 +655,6 @@ public: const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList, bool bAuto ); - virtual ~SwXMLStylesContext_Impl() override; virtual bool InsertStyleFamily( sal_uInt16 nFamily ) const override; @@ -766,10 +758,6 @@ SwXMLStylesContext_Impl::SwXMLStylesContext_Impl( { } -SwXMLStylesContext_Impl::~SwXMLStylesContext_Impl() -{ -} - bool SwXMLStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const { const SwXMLImport& rSwImport = GetSwImport(); @@ -870,7 +858,7 @@ public: SwXMLImport& rImport, const OUString& rLName , const uno::Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLMasterStylesContext_Impl() override; + virtual void EndElement() override; }; @@ -883,10 +871,6 @@ SwXMLMasterStylesContext_Impl::SwXMLMasterStylesContext_Impl( { } -SwXMLMasterStylesContext_Impl::~SwXMLMasterStylesContext_Impl() -{ -} - bool SwXMLMasterStylesContext_Impl::InsertStyleFamily( sal_uInt16 nFamily ) const { bool bIns; diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx index 5bdfba1..7429a27 100644 --- a/sw/source/filter/xml/xmlfmte.cxx +++ b/sw/source/filter/xml/xmlfmte.cxx @@ -263,7 +263,6 @@ protected: public: explicit SwXMLAutoStylePoolP( SvXMLExport& rExport ); - virtual ~SwXMLAutoStylePoolP() override; }; void SwXMLAutoStylePoolP::exportStyleAttributes( @@ -328,10 +327,6 @@ SwXMLAutoStylePoolP::SwXMLAutoStylePoolP(SvXMLExport& rExp ) : { } -SwXMLAutoStylePoolP::~SwXMLAutoStylePoolP() -{ -} - SvXMLAutoStylePoolP* SwXMLExport::CreateAutoStylePool() { return new SwXMLAutoStylePoolP( *this ); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 1197184..aa7d63b 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -123,8 +123,6 @@ public: SwXMLBodyContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLBodyContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -138,11 +136,6 @@ SwXMLBodyContext_Impl::SwXMLBodyContext_Impl( SwXMLImport& rImport, { } -SwXMLBodyContext_Impl::~SwXMLBodyContext_Impl() -{ -} - - SvXMLImportContext *SwXMLBodyContext_Impl::CreateChildContext( sal_uInt16 /*nPrefix*/, const OUString& rLocalName, @@ -166,8 +159,6 @@ public: SwXMLDocContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLDocContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -181,11 +172,6 @@ SwXMLDocContext_Impl::SwXMLDocContext_Impl( SwXMLImport& rImport, { } -SwXMLDocContext_Impl::~SwXMLDocContext_Impl() -{ -} - - SvXMLImportContext *SwXMLDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -254,8 +240,6 @@ public: const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList, const Reference< document::XDocumentProperties >& xDocProps); - virtual ~SwXMLOfficeDocContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, @@ -275,11 +259,6 @@ SwXMLOfficeDocContext_Impl::SwXMLOfficeDocContext_Impl( { } -SwXMLOfficeDocContext_Impl::~SwXMLOfficeDocContext_Impl() -{ -} - - SvXMLImportContext* SwXMLOfficeDocContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -316,8 +295,6 @@ public: sal_uInt16 nPrfx, const OUString& rLName, const Reference< xml::sax::XAttributeList > & xAttrList ); - virtual ~SwXMLDocStylesContext_Impl() override; - virtual void EndElement() override; }; @@ -332,11 +309,6 @@ SwXMLDocStylesContext_Impl::SwXMLDocStylesContext_Impl( { } -SwXMLDocStylesContext_Impl::~SwXMLDocStylesContext_Impl() -{ -} - - void SwXMLDocStylesContext_Impl::EndElement() { // assign paragraph styles to list levels of outline style after all styles diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx index fdb699b..5db0f19 100644 --- a/sw/source/filter/xml/xmliteme.cxx +++ b/sw/source/filter/xml/xmliteme.cxx @@ -68,8 +68,6 @@ public: SvXMLItemMapEntriesRef rMapEntries, SwXMLExport& rExp ); - virtual ~SwXMLTableItemMapper_Impl() override; - virtual void handleSpecialItem( SvXMLAttributeList& rAttrList, const SvXMLItemMapEntry& rEntry, const SfxPoolItem& rItem, @@ -97,10 +95,6 @@ SwXMLTableItemMapper_Impl::SwXMLTableItemMapper_Impl( { } -SwXMLTableItemMapper_Impl::~SwXMLTableItemMapper_Impl() -{ -} - void SwXMLTableItemMapper_Impl::AddAttribute( sal_uInt16 nPrefix, enum XMLTokenEnum eLName, const OUString& rValue, diff --git a/sw/source/filter/xml/xmlitemi.cxx b/sw/source/filter/xml/xmlitemi.cxx index f13405a..c03be01 100644 --- a/sw/source/filter/xml/xmlitemi.cxx +++ b/sw/source/filter/xml/xmlitemi.cxx @@ -63,7 +63,6 @@ class SwXMLImportTableItemMapper_Impl: public SvXMLImportItemMapper public: explicit SwXMLImportTableItemMapper_Impl(SvXMLItemMapEntriesRef rMapEntries); - virtual ~SwXMLImportTableItemMapper_Impl() override; virtual bool handleSpecialItem( const SvXMLItemMapEntry& rEntry, SfxPoolItem& rItem, @@ -99,10 +98,6 @@ SwXMLImportTableItemMapper_Impl::SwXMLImportTableItemMapper_Impl( Reset(); } -SwXMLImportTableItemMapper_Impl::~SwXMLImportTableItemMapper_Impl() -{ -} - void SwXMLImportTableItemMapper_Impl::Reset() { m_FoMarginValue.clear(); diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 05d0d15..89cc3c5 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -426,8 +426,6 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable ); - virtual ~SwXMLTableCellContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -570,10 +568,6 @@ SwXMLTableCellContext_Impl::SwXMLTableCellContext_Impl( } } -SwXMLTableCellContext_Impl::~SwXMLTableCellContext_Impl() -{ -} - inline void SwXMLTableCellContext_Impl::InsertContent_() { SwStartNode const*const pStartNode( GetTable()->InsertTableSection(nullptr, @@ -740,8 +734,6 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable ); - virtual ~SwXMLTableColContext_Impl() override; - SwXMLImport& GetSwImport() { return static_cast<SwXMLImport&>(GetImport()); } }; @@ -808,10 +800,6 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl( } } -SwXMLTableColContext_Impl::~SwXMLTableColContext_Impl() -{ -} - class SwXMLTableColsContext_Impl : public SvXMLImportContext { SvXMLImportContextRef xMyTable; @@ -826,8 +814,6 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable ); - virtual ~SwXMLTableColsContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -844,10 +830,6 @@ SwXMLTableColsContext_Impl::SwXMLTableColsContext_Impl( { } -SwXMLTableColsContext_Impl::~SwXMLTableColsContext_Impl() -{ -} - SvXMLImportContext *SwXMLTableColsContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -883,8 +865,6 @@ public: const Reference< xml::sax::XAttributeList > & xAttrList, SwXMLTableContext *pTable, bool bInHead=false ); - virtual ~SwXMLTableRowContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -956,10 +936,6 @@ void SwXMLTableRowContext_Impl::EndElement() } } -SwXMLTableRowContext_Impl::~SwXMLTableRowContext_Impl() -{ -} - SvXMLImportContext *SwXMLTableRowContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) @@ -1004,8 +980,6 @@ public: SwXMLTableContext *pTable, bool bHead ); - virtual ~SwXMLTableRowsContext_Impl() override; - virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) override; @@ -1025,10 +999,6 @@ SwXMLTableRowsContext_Impl::SwXMLTableRowsContext_Impl( SwXMLImport& rImport, { } -SwXMLTableRowsContext_Impl::~SwXMLTableRowsContext_Impl() -{ -} - SvXMLImportContext *SwXMLTableRowsContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -1064,8 +1034,6 @@ public: SwXMLDDETableContext_Impl( SwXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName); - virtual ~SwXMLDDETableContext_Impl() override; - virtual void StartElement( const Reference<xml::sax::XAttributeList> & xAttrList) override; @@ -1088,10 +1056,6 @@ SwXMLDDETableContext_Impl::SwXMLDDETableContext_Impl( { } -SwXMLDDETableContext_Impl::~SwXMLDDETableContext_Impl() -{ -} - void SwXMLDDETableContext_Impl::StartElement( const Reference<xml::sax::XAttributeList> & xAttrList) { diff --git a/sw/source/filter/xml/xmltext.cxx b/sw/source/filter/xml/xmltext.cxx index 8b4e15e..14257d6 100644 --- a/sw/source/filter/xml/xmltext.cxx +++ b/sw/source/filter/xml/xmltext.cxx @@ -31,7 +31,6 @@ class SwXMLBodyContentContext_Impl : public SvXMLImportContext public: SwXMLBodyContentContext_Impl( SwXMLImport& rImport, const OUString& rLName ); - virtual ~SwXMLBodyContentContext_Impl() override; virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, @@ -48,10 +47,6 @@ SwXMLBodyContentContext_Impl::SwXMLBodyContentContext_Impl( SwXMLImport& rImport { } -SwXMLBodyContentContext_Impl::~SwXMLBodyContentContext_Impl() -{ -} - SvXMLImportContext *SwXMLBodyContentContext_Impl::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const Reference< xml::sax::XAttributeList > & xAttrList ) diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index 5e42b2f..aa84a12 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -139,7 +139,6 @@ class SwMailDispatcherListener_Impl : public IMailDispatcherListener public: explicit SwMailDispatcherListener_Impl(SwSendMailDialog& rParentDlg); - virtual ~SwMailDispatcherListener_Impl() override; virtual void started(::rtl::Reference<MailDispatcher> xMailDispatcher) override; virtual void stopped(::rtl::Reference<MailDispatcher> xMailDispatcher) override; @@ -157,10 +156,6 @@ SwMailDispatcherListener_Impl::SwMailDispatcherListener_Impl(SwSendMailDialog& r { } -SwMailDispatcherListener_Impl::~SwMailDispatcherListener_Impl() -{ -} - void SwMailDispatcherListener_Impl::started(::rtl::Reference<MailDispatcher> /*xMailDispatcher*/) { } diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 5ee023d..9074bbc 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -89,7 +89,6 @@ class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper SwMailMergeDlg& rParent; public: explicit SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg); - virtual ~SwXSelChgLstnr_Impl() override; virtual void SAL_CALL selectionChanged( const EventObject& aEvent ) throw (RuntimeException, std::exception) override; virtual void SAL_CALL disposing( const EventObject& Source ) throw (RuntimeException, std::exception) override; @@ -99,9 +98,6 @@ SwXSelChgLstnr_Impl::SwXSelChgLstnr_Impl(SwMailMergeDlg& rParentDlg) : rParent(rParentDlg) {} -SwXSelChgLstnr_Impl::~SwXSelChgLstnr_Impl() -{} - void SwXSelChgLstnr_Impl::selectionChanged( const EventObject& ) throw (RuntimeException, std::exception) { //call the parent to enable selection mode diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx index 3bb791c..2e36a33 100644 --- a/sw/source/ui/vba/vbacells.cxx +++ b/sw/source/ui/vba/vbacells.cxx @@ -66,7 +66,6 @@ public: CellCollectionHelper( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::text::XTextTable >& xTextTable, sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) throw ( css::uno::RuntimeException ): mxParent( xParent ), mxContext( xContext ), mxTextTable( xTextTable ), mnLeft( nLeft ), mnTop( nTop ), mnRight( nRight ), mnBottom( nBottom ) { } - virtual ~CellCollectionHelper() override {} virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx index 40892d3..db97153 100644 --- a/sw/source/ui/vba/vbaheadersfooters.cxx +++ b/sw/source/ui/vba/vbaheadersfooters.cxx @@ -36,7 +36,6 @@ private: public: HeadersFootersIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel, const uno::Reference< beans::XPropertySet >& xPageStyleProps, bool bHeader ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ), mxPageStyleProps( xPageStyleProps ), mbHeader( bHeader ) {} - virtual ~HeadersFootersIndexAccess() override {} // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx index 75108ff..7a163fe 100644 --- a/sw/source/ui/vba/vbapanes.cxx +++ b/sw/source/ui/vba/vbapanes.cxx @@ -33,7 +33,6 @@ private: public: PanesIndexAccess( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< frame::XModel >& xModel ) : mxParent( xParent ), mxContext( xContext ), mxModel( xModel ) {} - virtual ~PanesIndexAccess() override {} // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx index 3b611ae..ffc62b7 100644 --- a/sw/source/ui/vba/vbasections.cxx +++ b/sw/source/ui/vba/vbasections.cxx @@ -88,8 +88,6 @@ public: mxSections.push_back( xPageProps ); } - virtual ~SectionCollectionHelper() override {} - // XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx index 37decce..8a426e1 100644 --- a/sw/source/ui/vba/vbatablesofcontents.cxx +++ b/sw/source/ui/vba/vbatablesofcontents.cxx @@ -75,8 +75,6 @@ public: } } - virtual ~TableOfContentsCollectionHelper() override {} - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { return maToc.size(); diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx index d9514d1..f85426e 100644 --- a/sw/source/ui/vba/vbatabstops.cxx +++ b/sw/source/ui/vba/vbatabstops.cxx @@ -79,8 +79,6 @@ public: mnTabStops = lcl_getTabStops( xParaProps ).getLength(); } - virtual ~TabStopCollectionHelper() override {} - virtual sal_Int32 SAL_CALL getCount( ) throw (uno::RuntimeException, std::exception) override { return mnTabStops; diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 398486c..b7a15fc3 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -210,7 +210,6 @@ private: public: explicit SwConnectionDisposedListener_Impl(SwDBManager& rMgr); - virtual ~SwConnectionDisposedListener_Impl() override; void Dispose() { m_pDBManager = nullptr; } @@ -3069,10 +3068,6 @@ SwConnectionDisposedListener_Impl::SwConnectionDisposedListener_Impl(SwDBManager { } -SwConnectionDisposedListener_Impl::~SwConnectionDisposedListener_Impl() -{ -} - void SwConnectionDisposedListener_Impl::disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) { diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index c2783bb..52317b1 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -50,10 +50,6 @@ public: { } - virtual ~MMCurrentEntryController() override - { - } - // XInterface virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) throw (uno::RuntimeException, std::exception) override { @@ -115,10 +111,6 @@ public: { } - virtual ~MMExcludeEntryController() override - { - } - // XInterface virtual uno::Any SAL_CALL queryInterface(const uno::Type& aType) throw (uno::RuntimeException, std::exception) override { diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 9a82de3..8ec6815 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -155,7 +155,6 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem public: SwMailMergeConfigItem_Impl(); - virtual ~SwMailMergeConfigItem_Impl() override; virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; const Sequence< OUString> @@ -343,10 +342,6 @@ SwMailMergeConfigItem_Impl::SwMailMergeConfigItem_Impl() : } -SwMailMergeConfigItem_Impl::~SwMailMergeConfigItem_Impl() -{ -} - void SwMailMergeConfigItem_Impl::SetCurrentAddressBlockIndex( sal_Int32 nSet ) { if(m_aAddressBlocks.size() >= sal::static_int_cast<sal_uInt32, sal_Int32>(nSet)) diff --git a/sw/source/uibase/docvw/SidebarWinAcc.cxx b/sw/source/uibase/docvw/SidebarWinAcc.cxx index f620405..db28a18 100644 --- a/sw/source/uibase/docvw/SidebarWinAcc.cxx +++ b/sw/source/uibase/docvw/SidebarWinAcc.cxx @@ -43,9 +43,6 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent rSidebarWin.SetAccessibleRole( css::accessibility::AccessibleRole::COMMENT ); } - virtual ~SidebarWinAccessibleContext() override - {} - void ChangeAnchor( const SwFrame* pAnchorFrame ) { osl::MutexGuard aGuard(maMutex); diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 4107d35..5b05a35 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -360,7 +360,6 @@ public: SwZoomBox_Impl( vcl::Window* pParent, sal_uInt16 nSlot ); - virtual ~SwZoomBox_Impl() override; protected: virtual void Select() override; @@ -392,9 +391,6 @@ SwZoomBox_Impl::SwZoomBox_Impl(vcl::Window* pParent, sal_uInt16 nSlot) } -SwZoomBox_Impl::~SwZoomBox_Impl() -{} - void SwZoomBox_Impl::Select() { if ( !IsTravelSelect() ) diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index d1d85d1..a0a1a85 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -60,7 +60,6 @@ private: public: SwPanelFactory(); - virtual ~SwPanelFactory() override; // XUIElementFactory css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement( @@ -89,10 +88,6 @@ SwPanelFactory::SwPanelFactory() { } -SwPanelFactory::~SwPanelFactory() -{ -} - Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( const OUString& rsResourceURL, const css::uno::Sequence<css::beans::PropertyValue>& rArguments) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits