[Libreoffice-commits] core.git: include/test include/toolkit include/tools include/unotools toolkit/source ucb/source unotools/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Jan 26 10:08:08 UTC 2017
include/test/testinteractionhandler.hxx | 3 ---
include/toolkit/controls/unocontrols.hxx | 1 -
include/tools/errinf.hxx | 2 --
include/tools/weakbase.h | 2 --
include/tools/weakbase.hxx | 5 -----
include/unotools/confignode.hxx | 3 ---
toolkit/source/awt/stylesettings.cxx | 4 ----
toolkit/source/awt/vclxwindow.cxx | 7 -------
toolkit/source/controls/unocontrolcontainer.cxx | 6 ------
ucb/source/ucp/cmis/cmis_datasupplier.hxx | 4 ----
ucb/source/ucp/ext/ucpext_datasupplier.cxx | 6 ------
ucb/source/ucp/webdav-neon/DAVException.hxx | 1 -
ucb/source/ucp/webdav-neon/LinkSequence.cxx | 1 -
ucb/source/ucp/webdav-neon/LockEntrySequence.cxx | 1 -
ucb/source/ucp/webdav-neon/LockSequence.cxx | 2 --
unotools/source/accessibility/accessiblerelationsethelper.cxx | 5 -----
unotools/source/accessibility/accessiblestatesethelper.cxx | 5 -----
unotools/source/config/historyoptions.cxx | 5 -----
18 files changed, 63 deletions(-)
New commits:
commit a49cbc58933c30d82bab458f2ed5af622bea4690
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jan 26 10:57:01 2017 +0200
loplugin: unnecessary destructor test..unotools
Change-Id: I1fd8a3f39b875d1920759f42e37f4c9d6785d62e
Reviewed-on: https://gerrit.libreoffice.org/33573
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/test/testinteractionhandler.hxx b/include/test/testinteractionhandler.hxx
index 3e8c810..a8f4acc 100644
--- a/include/test/testinteractionhandler.hxx
+++ b/include/test/testinteractionhandler.hxx
@@ -41,9 +41,6 @@ public:
, mbPasswordRequested(false)
{}
- virtual ~TestInteractionHandler() override
- {}
-
bool wasPasswordRequested()
{
return mbPasswordRequested;
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 4a8896b..84c6026 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -543,7 +543,6 @@ private:
public:
UnoCheckBoxControl();
- virtual ~UnoCheckBoxControl() override {}
OUString GetComponentServiceName() override;
void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& Toolkit, const css::uno::Reference< css::awt::XWindowPeer >& Parent ) throw(css::uno::RuntimeException, std::exception) override;
diff --git a/include/tools/errinf.hxx b/include/tools/errinf.hxx
index 8d79815..3a9af9a 100644
--- a/include/tools/errinf.hxx
+++ b/include/tools/errinf.hxx
@@ -91,8 +91,6 @@ public:
const OUString & rTheArg2, sal_uInt16 nMask):
DynamicErrorInfo(nUserID, nMask), aArg1(rTheArg1), aArg2(rTheArg2) {}
- virtual ~TwoStringErrorInfo() override {}
-
const OUString& GetArg1() const { return aArg1; }
const OUString& GetArg2() const { return aArg2; }
};
diff --git a/include/tools/weakbase.h b/include/tools/weakbase.h
index f8c7428..bacde04 100644
--- a/include/tools/weakbase.h
+++ b/include/tools/weakbase.h
@@ -84,8 +84,6 @@ public:
/** constructs a reference from another reference */
inline WeakReference( WeakReference< reference_type >&& rWeakRef );
- inline ~WeakReference();
-
/** returns true if the reference object is not null and still alive */
inline bool is() const;
diff --git a/include/tools/weakbase.hxx b/include/tools/weakbase.hxx
index 7b693cc..bee866c 100644
--- a/include/tools/weakbase.hxx
+++ b/include/tools/weakbase.hxx
@@ -55,11 +55,6 @@ inline WeakReference< reference_type >::WeakReference( WeakReference< reference_
}
template< class reference_type >
-inline WeakReference< reference_type >::~WeakReference()
-{
-}
-
-template< class reference_type >
inline bool WeakReference< reference_type >::is() const
{
return mpWeakConnection->mpReference != 0;
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index a59e304..217203f 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -79,9 +79,6 @@ namespace utl
OConfigurationNode& operator=(const OConfigurationNode& _rSource);
OConfigurationNode& operator=(OConfigurationNode&& _rSource);
- /// dtor
- virtual ~OConfigurationNode() override {}
-
/// returns the local name of the node
OUString getLocalName() const;
diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx
index 1ed728c..3310c04 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -87,10 +87,6 @@ namespace toolkit
throw DisposedException();
}
- ~StyleMethodGuard()
- {
- }
-
private:
SolarMutexGuard m_aGuard;
};
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 9d862e26..8b4da17 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -186,8 +186,6 @@ public:
inline VclContainerListenerMultiplexer& getContainerListeners() { return maContainerListeners; }
inline TopWindowListenerMultiplexer& getTopWindowListeners() { return maTopWindowListeners; }
- ~VCLXWindowImpl();
-
private:
DECL_LINK( OnProcessCallbacks, void*, void );
};
@@ -223,11 +221,6 @@ VCLXWindowImpl::VCLXWindowImpl( VCLXWindow& _rAntiImpl, bool _bWithDefaultProps
{
}
-VCLXWindowImpl::~VCLXWindowImpl()
-{
-}
-
-
void VCLXWindowImpl::disposing()
{
SolarMutexGuard aGuard;
diff --git a/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index e53da45..d752eb1 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.cxx
@@ -73,7 +73,6 @@ private:
public:
UnoControlHolderList();
- ~UnoControlHolderList();
/** adds a control with the given name to the list
@param _rxControl
@@ -165,11 +164,6 @@ UnoControlHolderList::UnoControlHolderList()
}
-UnoControlHolderList::~UnoControlHolderList()
-{
-}
-
-
UnoControlHolderList::ControlIdentifier UnoControlHolderList::addControl( const uno::Reference< awt::XControl >& _rxControl, const OUString* _pName )
{
return impl_addControl( _rxControl, _pName );
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
index de4903e..2e3dd1b 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
@@ -29,10 +29,6 @@ namespace cmis
explicit ResultListEntry( css::uno::Reference< css::ucb::XContent > const & xCnt ) : xContent( xCnt )
{
}
-
- ~ResultListEntry()
- {
- }
};
typedef std::vector< ResultListEntry* > ResultList;
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
index 66907ac..ca437c5 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx
@@ -83,15 +83,9 @@ namespace ucb { namespace ucp { namespace ext
,m_xContext( rxContext )
{
}
- ~DataSupplier_Impl();
};
- DataSupplier_Impl::~DataSupplier_Impl()
- {
- }
-
-
//= helper
namespace
diff --git a/ucb/source/ucp/webdav-neon/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx
index c6f50a2..3e1046c 100644
--- a/ucb/source/ucp/webdav-neon/DAVException.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVException.hxx
@@ -164,7 +164,6 @@ class DAVException : public std::exception
sal_uInt16 nStatusCode ) :
mExceptionCode( inExceptionCode ), mData( rData ),
mStatusCode( nStatusCode ) {};
- virtual ~DAVException() throw() override {};
const ExceptionCode & getError() const { return mExceptionCode; }
const OUString & getData() const { return mData; }
diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.cxx b/ucb/source/ucp/webdav-neon/LinkSequence.cxx
index 4fff368..392584e 100644
--- a/ucb/source/ucp/webdav-neon/LinkSequence.cxx
+++ b/ucb/source/ucp/webdav-neon/LinkSequence.cxx
@@ -45,7 +45,6 @@ struct LinkSequenceParseContext
LinkSequenceParseContext()
: pLink( nullptr ), hasSource( false ), hasDestination( false ) {}
- ~LinkSequenceParseContext() {}
};
#define STATE_TOP (1)
diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx
index 7d3a839..70b0c0c 100644
--- a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx
+++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx
@@ -44,7 +44,6 @@ struct LockEntrySequenceParseContext
LockEntrySequenceParseContext()
: pEntry( nullptr ), hasScope( false ), hasType( false ) {}
- ~LockEntrySequenceParseContext() { }
};
#define STATE_TOP (1)
diff --git a/ucb/source/ucp/webdav-neon/LockSequence.cxx b/ucb/source/ucp/webdav-neon/LockSequence.cxx
index 1598ed8..b75db5a 100644
--- a/ucb/source/ucp/webdav-neon/LockSequence.cxx
+++ b/ucb/source/ucp/webdav-neon/LockSequence.cxx
@@ -48,8 +48,6 @@ struct LockSequenceParseContext
LockSequenceParseContext()
: pLock( nullptr ), hasLockScope( false ), hasLockType( false ),
hasDepth( false ), hasHREF( false ), hasTimeout( false ) {}
-
- ~LockSequenceParseContext() {}
};
#define STATE_TOP (1)
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index fcd42ab..e25719c 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.cxx
@@ -31,7 +31,6 @@ class AccessibleRelationSetHelperImpl
public:
AccessibleRelationSetHelperImpl();
AccessibleRelationSetHelperImpl(const AccessibleRelationSetHelperImpl& rImpl);
- ~AccessibleRelationSetHelperImpl();
/// @throws uno::RuntimeException
sal_Int32 getRelationCount( )
@@ -64,10 +63,6 @@ AccessibleRelationSetHelperImpl::AccessibleRelationSetHelperImpl(const Accessibl
{
}
-AccessibleRelationSetHelperImpl::~AccessibleRelationSetHelperImpl()
-{
-}
-
sal_Int32 AccessibleRelationSetHelperImpl::getRelationCount( )
throw (uno::RuntimeException)
{
diff --git a/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index a6c1d9c..0b669c6 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.cxx
@@ -34,7 +34,6 @@ class AccessibleStateSetHelperImpl
public:
AccessibleStateSetHelperImpl();
AccessibleStateSetHelperImpl(const AccessibleStateSetHelperImpl& rImpl);
- ~AccessibleStateSetHelperImpl();
/// @throws uno::RuntimeException
bool IsEmpty () const
@@ -68,10 +67,6 @@ AccessibleStateSetHelperImpl::AccessibleStateSetHelperImpl(const AccessibleState
{
}
-AccessibleStateSetHelperImpl::~AccessibleStateSetHelperImpl()
-{
-}
-
inline bool AccessibleStateSetHelperImpl::IsEmpty () const
throw (uno::RuntimeException)
{
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 13810fb..759e7b4 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -67,7 +67,6 @@ class SvtHistoryOptions_Impl
{
public:
SvtHistoryOptions_Impl();
- ~SvtHistoryOptions_Impl();
/// Returns the maximum size of the internal lists, ie. the capacity not the size.
sal_uInt32 GetCapacity(EHistoryType eHistory);
@@ -122,10 +121,6 @@ SvtHistoryOptions_Impl::SvtHistoryOptions_Impl()
}
}
-SvtHistoryOptions_Impl::~SvtHistoryOptions_Impl()
-{
-}
-
sal_uInt32 SvtHistoryOptions_Impl::GetCapacity(EHistoryType eHistory)
{
uno::Reference<beans::XPropertySet> xListAccess(m_xCommonXCU, uno::UNO_QUERY);
More information about the Libreoffice-commits
mailing list