summaryrefslogtreecommitdiff
path: root/comphelper
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-01-23 14:04:56 +0200
committerCaolán McNamara <caolanm@redhat.com>2017-01-23 16:59:48 +0000
commita90a4810aeefbad270978ade194ced3b09d50449 (patch)
tree5545c4d42205a39a08ae085681ec8e04cb427cf5 /comphelper
parent6d9e4803806d1474039e25092a3c1ee268b0b9f8 (diff)
loplugin: unnecessary destructor: comphelper..desktop
Change-Id: I9df4cb6a4b1734dac6141d6b0ee7a09e3e05f92e Reviewed-on: https://gerrit.libreoffice.org/33453 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'comphelper')
-rw-r--r--comphelper/source/misc/componentmodule.cxx5
-rw-r--r--comphelper/source/misc/officerestartmanager.hxx3
-rw-r--r--comphelper/source/misc/syntaxhighlight.cxx5
-rw-r--r--comphelper/source/property/MasterPropertySet.cxx5
-rw-r--r--comphelper/source/property/propagg.cxx6
-rw-r--r--comphelper/source/property/propertysetinfo.cxx5
6 files changed, 0 insertions, 29 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())