diff options
27 files changed, 1 insertions, 120 deletions
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index 074515e83c40..3ff9e4a72639 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -43,17 +43,12 @@ namespace comphelper ComponentDescriptions m_aRegisteredComponents; OModuleImpl(); - ~OModuleImpl(); }; OModuleImpl::OModuleImpl() { } - OModuleImpl::~OModuleImpl() - { - } - OModule::OModule() : m_nClients(0) , m_pImpl(new OModuleImpl) diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index a20e5cfd7f14..02a65efd5f61 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -48,9 +48,6 @@ public: , m_bRestartRequested( false ) {} - virtual ~OOfficeRestartManager() override - {} - // XRestartManager virtual void SAL_CALL requestRestart( const css::uno::Reference< css::task::XInteractionHandler >& xInteractionHandler ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL isRestartRequested( sal_Bool bInitialized ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 0b6f3a321ce0..31e923fcf40c 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -281,7 +281,6 @@ public: HighlighterLanguage const aLanguage; explicit Tokenizer( HighlighterLanguage aLang ); - ~Tokenizer(); void getHighlightPortions(const OUString& rLine, /*out*/std::vector<HighlightPortion>& portions) const; @@ -667,10 +666,6 @@ SyntaxHighlighter::Tokenizer::Tokenizer( HighlighterLanguage aLang ): aLanguage( nKeyWordCount = 0; } -SyntaxHighlighter::Tokenizer::~Tokenizer() -{ -} - void SyntaxHighlighter::Tokenizer::getHighlightPortions(const OUString& rLine, /*out*/std::vector<HighlightPortion>& portions) const { diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index f1c74d7e9af3..c6f1477480de 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -35,7 +35,6 @@ class AutoOGuardArray public: explicit AutoOGuardArray( sal_Int32 nNumElements ); - ~AutoOGuardArray(); std::unique_ptr< osl::Guard< comphelper::SolarMutex > > & operator[] ( sal_Int32 i ) { return maGuardArray[i]; } }; @@ -44,10 +43,6 @@ AutoOGuardArray::AutoOGuardArray( sal_Int32 nNumElements ) : maGuardArray(nNumEl { } -AutoOGuardArray::~AutoOGuardArray() -{ -} - using namespace ::comphelper; using namespace ::com::sun::star; diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index e8383c362c80..acc253b2ca17 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -258,7 +258,6 @@ namespace internal public: explicit PropertyForwarder( OPropertySetAggregationHelper& _rAggregationHelper ); - ~PropertyForwarder(); /** declares that the forwarder should be responsible for the given property @@ -287,11 +286,6 @@ namespace internal } - PropertyForwarder::~PropertyForwarder() - { - } - - void PropertyForwarder::takeResponsibilityFor( sal_Int32 _nHandle ) { m_aProperties.insert( _nHandle ); diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index 9125d694a71d..0673b6ffe93b 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -35,7 +35,6 @@ class PropertyMapImpl final { public: PropertyMapImpl() throw(); - ~PropertyMapImpl() throw(); void add(PropertyMapEntry const * pMap) throw(); void remove( const OUString& aName ) throw(); @@ -58,10 +57,6 @@ PropertyMapImpl::PropertyMapImpl() throw() { } -PropertyMapImpl::~PropertyMapImpl() throw() -{ -} - void PropertyMapImpl::add(PropertyMapEntry const * pMap) throw() { while (!pMap->maName.isEmpty()) diff --git a/configmgr/source/nodemap.hxx b/configmgr/source/nodemap.hxx index 1fcfed87f81e..0c6a9f04c5c1 100644 --- a/configmgr/source/nodemap.hxx +++ b/configmgr/source/nodemap.hxx @@ -39,8 +39,7 @@ class NodeMap typedef NodeMapImpl::const_iterator const_iterator; typedef NodeMapImpl::value_type value_type; - NodeMap() { clearCache(); } - ~NodeMap() {} + NodeMap() { clearCache(); } bool empty() const { return maImpl.empty(); } iterator find(const OUString &aStr) { return maImpl.find( aStr ); } diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index f074257e2e80..c261aeca4d24 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -52,7 +52,6 @@ namespace connectivity { public: explicit SQLError_Impl( const Reference<XComponentContext> & _rxContext ); - ~SQLError_Impl(); // versions of the public SQLError methods which are just delegated to this impl-class static const OUString& getMessagePrefix(); @@ -95,11 +94,6 @@ namespace connectivity } - SQLError_Impl::~SQLError_Impl() - { - } - - const OUString& SQLError_Impl::getMessagePrefix() { static const OUString s_sMessagePrefix( "[OOoBase]" ); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index dd941f844e28..073a561b021a 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -62,7 +62,6 @@ class ButtonBox { mnCurrentButton = NO_BUTTON_SELECTED; }; - ~ButtonBox() {}; void AddButton(VclPtr<PushButton> pButton) { maButtonList.push_back(pButton); diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 462285fd0f69..e0281c5e774b 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -121,7 +121,6 @@ public: const css::uno::Reference< css::script::browse::XBrowseNode >& entryNodes , const css::uno::Reference< css::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; } SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; } - ~SFEntry() {} const css::uno::Reference< css::script::browse::XBrowseNode >& GetNode() { return nodes ;} const css::uno::Reference< css::frame::XModel >& GetModel() { return model ;}; bool isLoaded() const { return loaded; } diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 4e9dfbe161eb..71e50780a5ff 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -48,16 +48,10 @@ const sal_Char cCharacterCompressionType[] = "CharacterCompressionType"; struct SvxForbiddenChars_Impl { - ~SvxForbiddenChars_Impl(); - bool bRemoved; std::unique_ptr<ForbiddenCharacters> pCharacters; }; -SvxForbiddenChars_Impl::~SvxForbiddenChars_Impl() -{ -} - typedef ::std::map< LanguageType, SvxForbiddenChars_Impl* > SvxForbiddenCharacterMap_Impl; struct SvxAsianLayoutPage_Impl diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index cd322650e540..d1713c0885d5 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -483,7 +483,6 @@ class SvxLinguData_Impl public: SvxLinguData_Impl(); SvxLinguData_Impl( const SvxLinguData_Impl &rData ); - ~SvxLinguData_Impl(); SvxLinguData_Impl & operator = (const SvxLinguData_Impl &rData); @@ -841,10 +840,6 @@ SvxLinguData_Impl & SvxLinguData_Impl::operator = (const SvxLinguData_Impl &rDat return *this; } -SvxLinguData_Impl::~SvxLinguData_Impl() -{ -} - void SvxLinguData_Impl::SetChecked(const Sequence<OUString>& rConfiguredServices) { const OUString* pConfiguredServices = rConfiguredServices.getConstArray(); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 8ca666b2c533..44f2a9e42c06 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -65,17 +65,12 @@ struct SvxSaveTabPage_Impl bool bInitialized; SvxSaveTabPage_Impl(); - ~SvxSaveTabPage_Impl(); }; SvxSaveTabPage_Impl::SvxSaveTabPage_Impl() : bInitialized( false ) { } -SvxSaveTabPage_Impl::~SvxSaveTabPage_Impl() -{ -} - // class SvxSaveTabPage -------------------------------------------------- SvxSaveTabPage::SvxSaveTabPage( vcl::Window* pParent, const SfxItemSet& rCoreSet ) : diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 91452777ee62..2c9511536d3b 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -603,10 +603,6 @@ public: m_SolarGuard.reset(); // SolarMutex first m_OslGuard.reset(); } - - ~ModelMethodGuard() - { - } }; } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index afdd5ffb350c..1fd7d3c60765 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -716,10 +716,6 @@ public: { } - ~DocumentGuard() - { - } - void clear() { ModelMethodGuard::clear(); diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 60b8a5952a1f..0a25424f0327 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -544,7 +544,6 @@ namespace dbmm public: explicit ScriptsStorage( MigrationLog& _rLogger ); ScriptsStorage( const Reference< XModel >& _rxDocument, MigrationLog& _rLogger ); - ~ScriptsStorage(); /** determines whether the instance is valid, i.e. refers to a valid root storage for reading/storing scripts @@ -606,10 +605,6 @@ namespace dbmm bind( _rxDocument ); } - ScriptsStorage::~ScriptsStorage() - { - } - bool ScriptsStorage::commit() { return lcl_commitStorage_nothrow( m_xScriptsStorage ); @@ -784,7 +779,6 @@ namespace dbmm IMigrationProgress& _rProgress, MigrationLog& _rLogger ); - ~MigrationEngine_Impl(); inline size_t getFormCount() const { return m_nFormCount; } inline size_t getReportCount()const { return m_nReportCount; } @@ -917,10 +911,6 @@ namespace dbmm OSL_VERIFY( impl_collectSubDocuments_nothrow() ); } - MigrationEngine_Impl::~MigrationEngine_Impl() - { - } - bool MigrationEngine_Impl::migrateAll() { if ( m_aSubDocs.empty() ) diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 0ff17e83ba5d..9a8ae98fda57 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -216,10 +216,6 @@ public: m_aSelectionListeners.disposeAndClear( aEvent ); } - ~SelectionNotifier() - { - } - struct SelectionGuardAccess { friend class SelectionGuard; private: SelectionGuardAccess() { } }; /** enters a block which modifies the selection of our owner. diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index 8f1bba1d6354..5c612ca7b2e2 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -40,7 +40,6 @@ class OModuleImpl public: /// ctor OModuleImpl(); - ~OModuleImpl(); /// get the manager for the resources of the module ResMgr* getResManager(); @@ -52,10 +51,6 @@ OModuleImpl::OModuleImpl() } -OModuleImpl::~OModuleImpl() -{ -} - ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 2826aba9c32d..7c9372ca1558 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -135,7 +135,6 @@ class RequestHandlerController : public ::cppu::WeakImplHelper< { public: RequestHandlerController() {} - virtual ~RequestHandlerController() override {} // XServiceInfo virtual OUString SAL_CALL getImplementationName() diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx index e1ebacefba5d..4bc3309c3e36 100644 --- a/desktop/source/deployment/manager/dp_properties.hxx +++ b/desktop/source/deployment/manager/dp_properties.hxx @@ -40,7 +40,6 @@ class ExtensionProperties final static OUString getPropertyValue(css::beans::NamedValue const & v); public: - ~ExtensionProperties() {}; ExtensionProperties(OUString const & urlExtension, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, css::uno::Reference<css::uno::XComponentContext> const & xContext); diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 6b6d7a94eef9..48ae7154fddd 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -118,8 +118,6 @@ public: const OUString& installDir, const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv); - ~ExtensionDescription(); - const css::uno::Reference<css::xml::dom::XNode>& getRootElement() const { return m_xRoot; @@ -242,11 +240,6 @@ ExtensionDescription::ExtensionDescription( } } -ExtensionDescription::~ExtensionDescription() -{ -} - - FileDoesNotExistFilter::FileDoesNotExistFilter( const Reference< css::ucb::XCommandEnvironment >& xCmdEnv): m_bExist(true), m_xCommandEnv(xCmdEnv) diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 85b4ee684bcc..dfd556a53566 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -155,7 +155,6 @@ class RegisteredDb: public BackendDb public: RegisteredDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, OUString const & url); - virtual ~RegisteredDb() override {}; void addEntry(OUString const & url); diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx index 9998f3c07b32..09ae01c471ec 100644 --- a/include/comphelper/SettingsHelper.hxx +++ b/include/comphelper/SettingsHelper.hxx @@ -43,7 +43,6 @@ namespace comphelper ChainableHelperNoState ( ChainablePropertySetInfo *pInfo, SolarMutex* pMutex = nullptr) : ChainablePropertySet ( pInfo, pMutex ) {} - virtual ~ChainableHelperNoState () throw( ) override {} css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override { return HelperBaseNoState::queryInterface( aType ); } void SAL_CALL acquire( ) throw () override diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx index 1074d1e7138a..2143c7e2060a 100644 --- a/include/comphelper/accessiblecontexthelper.hxx +++ b/include/comphelper/accessiblecontexthelper.hxx @@ -274,11 +274,6 @@ namespace comphelper @precond <arg>_pContext</arg> != NULL */ inline OContextEntryGuard( OAccessibleContextHelper* _pContext ); - - /** destructs the guard. - <p>The context (it's mutex, respectively) is unlocked.</p> - */ - inline ~OContextEntryGuard(); }; @@ -289,11 +284,6 @@ namespace comphelper } - inline OContextEntryGuard::~OContextEntryGuard() - { - } - - //= OExternalLockGuard class OExternalLockGuard @@ -302,7 +292,6 @@ namespace comphelper { public: inline OExternalLockGuard( OAccessibleContextHelper* _pContext ); - inline ~OExternalLockGuard( ); }; @@ -318,11 +307,6 @@ namespace comphelper } - inline OExternalLockGuard::~OExternalLockGuard( ) - { - } - - } // namespace comphelper diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx index 079c40d8f7bb..ac6acfa758bd 100644 --- a/include/comphelper/componentbase.hxx +++ b/include/comphelper/componentbase.hxx @@ -121,10 +121,6 @@ namespace comphelper _rComponent.checkDisposed( ComponentBase::GuardAccess() ); } - ~ComponentMethodGuard() - { - } - inline void clear() { m_aMutexGuard.clear(); diff --git a/include/comphelper/componentguard.hxx b/include/comphelper/componentguard.hxx index cb6013900a32..072b2857dabd 100644 --- a/include/comphelper/componentguard.hxx +++ b/include/comphelper/componentguard.hxx @@ -42,10 +42,6 @@ namespace comphelper throw css::lang::DisposedException( OUString(), &i_component ); } - ~ComponentGuard() - { - } - void clear() { m_aGuard.clear(); } void reset() { m_aGuard.reset(); } diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx index 51974ac65e79..87e6717cbb84 100644 --- a/include/comphelper/sharedmutex.hxx +++ b/include/comphelper/sharedmutex.hxx @@ -36,9 +36,6 @@ namespace comphelper SharedMutex(); SharedMutex( const SharedMutex& ); SharedMutex& operator=( const SharedMutex& ); - ~SharedMutex() - { - } inline operator ::osl::Mutex& () { return *m_pMutexImpl; } |