[Libreoffice-commits] core.git: comphelper/source configmgr/source connectivity/source cui/source dbaccess/source desktop/source include/comphelper
Noel Grandin
noel.grandin at collabora.co.uk
Mon Jan 23 17:01:09 UTC 2017
comphelper/source/misc/componentmodule.cxx | 5 ----
comphelper/source/misc/officerestartmanager.hxx | 3 --
comphelper/source/misc/syntaxhighlight.cxx | 5 ----
comphelper/source/property/MasterPropertySet.cxx | 5 ----
comphelper/source/property/propagg.cxx | 6 -----
comphelper/source/property/propertysetinfo.cxx | 5 ----
configmgr/source/nodemap.hxx | 3 --
connectivity/source/commontools/sqlerror.cxx | 6 -----
cui/source/inc/cuitabarea.hxx | 1
cui/source/inc/scriptdlg.hxx | 1
cui/source/options/optasian.cxx | 6 -----
cui/source/options/optlingu.cxx | 5 ----
cui/source/options/optsave.cxx | 5 ----
dbaccess/source/core/dataaccess/ModelImpl.hxx | 4 ---
dbaccess/source/core/dataaccess/databasedocument.hxx | 4 ---
dbaccess/source/ext/macromigration/migrationengine.cxx | 10 ---------
dbaccess/source/ui/app/AppController.cxx | 4 ---
dbaccess/source/ui/misc/moduledbu.cxx | 5 ----
desktop/source/app/officeipcthread.hxx | 1
desktop/source/deployment/manager/dp_properties.hxx | 1
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 7 ------
desktop/source/deployment/registry/inc/dp_backenddb.hxx | 1
include/comphelper/SettingsHelper.hxx | 1
include/comphelper/accessiblecontexthelper.hxx | 16 ---------------
include/comphelper/componentbase.hxx | 4 ---
include/comphelper/componentguard.hxx | 4 ---
include/comphelper/sharedmutex.hxx | 3 --
27 files changed, 1 insertion(+), 120 deletions(-)
New commits:
commit a90a4810aeefbad270978ade194ced3b09d50449
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Mon Jan 23 14:04:56 2017 +0200
loplugin: unnecessary destructor: comphelper..desktop
Change-Id: I9df4cb6a4b1734dac6141d6b0ee7a09e3e05f92e
Reviewed-on: https://gerrit.libreoffice.org/33453
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 074515e..3ff9e4a 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 a20e5cf..02a65ef 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 0b6f3a3..31e923f 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 f1c74d7..c6f1477 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 e8383c3..acc253b 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 9125d69..0673b6f 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 1fcfed8..0c6a9f0 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 f074257..c261aec 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 dd941f8..073a561 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 462285f..e0281c5 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 4e9dfbe..71e5078 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 cd32265..d1713c0 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 8ca666b..44f2a9e 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 9145277..2c95115 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 afdd5ff..1fd7d3c 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 60b8a59..0a25424 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 0ff17e8..9a8ae98 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 8f1bba1..5c612ca 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 2826aba..7c9372c 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 e1ebace..4bc3309 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 6b6d7a9..48ae715 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 85b4ee6..dfd556a 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 9998f3c..09ae01c 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 1074d1e..2143c7e 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 079c40d..ac6acfa 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 cb60139..072b285 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 51974ac..87e6717 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; }
More information about the Libreoffice-commits
mailing list