summaryrefslogtreecommitdiff
path: root/sdext
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-12-05 09:00:09 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-12-05 09:00:09 +0100
commit4586cc8b62f93c1cb113218da4ebe332692fe314 (patch)
tree44c98a7c50ed42ee15c0694c2515d8822488d10f /sdext
parent196d1911368f7f3b459a1aac8f952311ec3732ba (diff)
loplugin:unnecessaryoverride (dtors) in sdext
Change-Id: I02dd087722aa7df299ca09ba55bb32d5402319fc
Diffstat (limited to 'sdext')
-rw-r--r--sdext/source/pdfimport/pdfparse/pdfparse.cxx2
-rw-r--r--sdext/source/pdfimport/test/tests.cxx2
-rw-r--r--sdext/source/presenter/PresenterAccessibility.cxx22
-rw-r--r--sdext/source/presenter/PresenterProtocolHandler.cxx13
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx5
-rw-r--r--sdext/source/presenter/PresenterToolBar.cxx10
-rw-r--r--sdext/source/presenter/PresenterViewFactory.cxx2
7 files changed, 2 insertions, 54 deletions
diff --git a/sdext/source/pdfimport/pdfparse/pdfparse.cxx b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
index 7b2b44c79407..8337930e5c20 100644
--- a/sdext/source/pdfimport/pdfparse/pdfparse.cxx
+++ b/sdext/source/pdfimport/pdfparse/pdfparse.cxx
@@ -49,7 +49,7 @@ class StringEmitContext : public EmitContext
OStringBuffer m_aBuf;
public:
StringEmitContext() : EmitContext(), m_aBuf(256) {}
- virtual ~StringEmitContext() override {}
+
virtual bool write( const void* pBuf, unsigned int nLen ) throw() override
{
m_aBuf.append( static_cast<const sal_Char*>(pBuf), nLen );
diff --git a/sdext/source/pdfimport/test/tests.cxx b/sdext/source/pdfimport/test/tests.cxx
index 091f6432bb35..1d03e1a4c7ca 100644
--- a/sdext/source/pdfimport/test/tests.cxx
+++ b/sdext/source/pdfimport/test/tests.cxx
@@ -82,8 +82,6 @@ namespace
m_bImageSeen(false)
{}
- virtual ~TestSink() override {}
-
void check()
{
CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE( "A4 page size (in 100th of points): Width", 79400, m_aPageSize.Width, 0.00000001);
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 48916ebf025a..8dcbb20377ea 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -72,8 +72,6 @@ public:
const OUString& rsName);
void LateInitialization();
- virtual ~AccessibleObject() override;
-
virtual void SetWindow (
const css::uno::Reference<css::awt::XWindow>& rxContentWindow,
const css::uno::Reference<css::awt::XWindow>& rxBorderWindow);
@@ -235,7 +233,6 @@ class AccessibleStateSet
{
public:
explicit AccessibleStateSet (const sal_Int32 nStateSet);
- virtual ~AccessibleStateSet() override;
static sal_uInt32 GetStateMask (const sal_Int16 nType);
@@ -271,7 +268,6 @@ class AccessibleRelationSet
{
public:
AccessibleRelationSet();
- virtual ~AccessibleRelationSet() override;
void AddRelation (
const sal_Int16 nRelationType,
@@ -314,8 +310,6 @@ public:
const SharedPresenterTextParagraph& rpParagraph,
const sal_Int32 nParagraphIndex);
- virtual ~AccessibleParagraph() override;
-
//----- XAccessibleContext ------------------------------------------------
virtual css::uno::Reference<css::accessibility::XAccessibleRelationSet> SAL_CALL
@@ -810,10 +804,6 @@ void PresenterAccessible::AccessibleObject::LateInitialization()
AccessibleFocusManager::Instance()->AddFocusableObject(this);
}
-PresenterAccessible::AccessibleObject::~AccessibleObject()
-{
-}
-
void PresenterAccessible::AccessibleObject::SetWindow (
const Reference<awt::XWindow>& rxContentWindow,
const Reference<awt::XWindow>& rxBorderWindow)
@@ -1353,10 +1343,6 @@ AccessibleStateSet::AccessibleStateSet (const sal_Int32 nStateSet)
{
}
-AccessibleStateSet::~AccessibleStateSet()
-{
-}
-
sal_uInt32 AccessibleStateSet::GetStateMask (const sal_Int16 nState)
{
if (nState<0 || nState>=sal_Int16(sizeof(sal_uInt32)*8))
@@ -1411,10 +1397,6 @@ AccessibleRelationSet::AccessibleRelationSet()
{
}
-AccessibleRelationSet::~AccessibleRelationSet()
-{
-}
-
void AccessibleRelationSet::AddRelation (
const sal_Int16 nRelationType,
const Reference<XInterface>& rxObject)
@@ -1481,10 +1463,6 @@ PresenterAccessible::AccessibleParagraph::AccessibleParagraph (
{
}
-PresenterAccessible::AccessibleParagraph::~AccessibleParagraph()
-{
-}
-
//----- XAccessibleContext ----------------------------------------------------
Reference<XAccessibleRelationSet> SAL_CALL
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index cb2d556ee368..b5b18813cea0 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -60,7 +60,6 @@ namespace {
public:
explicit GotoPreviousSlideCommand (
const rtl::Reference<PresenterController>& rpPresenterController);
- virtual ~GotoPreviousSlideCommand() override {}
virtual void Execute() override;
virtual bool IsEnabled() const override;
private:
@@ -72,7 +71,6 @@ namespace {
public:
explicit GotoNextSlideCommand (
const rtl::Reference<PresenterController>& rpPresenterController);
- virtual ~GotoNextSlideCommand() override {}
virtual void Execute() override;
// The next slide command is always enabled, even when the current slide
// is the last slide: from the last slide it goes to the pause slide,
@@ -87,7 +85,6 @@ namespace {
public:
explicit GotoNextEffectCommand (
const rtl::Reference<PresenterController>& rpPresenterController);
- virtual ~GotoNextEffectCommand() override {}
virtual void Execute() override;
private:
rtl::Reference<PresenterController> mpPresenterController;
@@ -98,7 +95,6 @@ namespace {
public:
explicit SwitchMonitorCommand (
const rtl::Reference<PresenterController>& rpPresenterController);
- virtual ~SwitchMonitorCommand() override {}
virtual void Execute() override;
private:
rtl::Reference<PresenterController> mpPresenterController;
@@ -109,7 +105,6 @@ namespace {
{
public:
explicit RestartTimerCommand(const rtl::Reference<PresenterController>& rpPresenterController);
- virtual ~RestartTimerCommand() override;
virtual void Execute() override;
private:
rtl::Reference<PresenterController> mpPresenterController;
@@ -121,7 +116,6 @@ namespace {
SetNotesViewCommand (
const bool bOn,
const rtl::Reference<PresenterController>& rpPresenterController);
- virtual ~SetNotesViewCommand() override {}
virtual void Execute() override;
virtual Any GetState() const override;
private:
@@ -135,7 +129,6 @@ namespace {
SetSlideSorterCommand (
const bool bOn,
const rtl::Reference<PresenterController>& rpPresenterController);
- virtual ~SetSlideSorterCommand() override {}
virtual void Execute() override;
virtual Any GetState() const override;
private:
@@ -149,7 +142,6 @@ namespace {
SetHelpViewCommand (
const bool bOn,
const rtl::Reference<PresenterController>& rpPresenterController);
- virtual ~SetHelpViewCommand() override {}
virtual void Execute() override;
virtual Any GetState() const override;
private:
@@ -163,7 +155,6 @@ namespace {
NotesFontSizeCommand(
const rtl::Reference<PresenterController>& rpPresenterController,
const sal_Int32 nSizeChange);
- virtual ~NotesFontSizeCommand() override {}
virtual void Execute() override;
virtual Any GetState() const override;
protected:
@@ -619,10 +610,6 @@ RestartTimerCommand::RestartTimerCommand (const rtl::Reference<PresenterControll
{
}
-RestartTimerCommand::~RestartTimerCommand()
-{
-}
-
void RestartTimerCommand::Execute()
{
if (IPresentationTime* pPresentationTime = mpPresenterController->GetPresentationTime())
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 26b4cfbc29c4..fdda9b6bcafc 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -66,7 +66,6 @@ namespace {
PresenterScreenListener (
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
const css::uno::Reference<css::frame::XModel2>& rxModel);
- virtual ~PresenterScreenListener() override;
PresenterScreenListener(const PresenterScreenListener&) = delete;
PresenterScreenListener& operator=(const PresenterScreenListener&) = delete;
@@ -190,10 +189,6 @@ void PresenterScreenListener::Initialize()
xDocBroadcaster->addEventListener(xDocListener);
}
-PresenterScreenListener::~PresenterScreenListener()
-{
-}
-
void SAL_CALL PresenterScreenListener::disposing()
{
Reference< document::XEventBroadcaster > xDocBroadcaster( mxModel, UNO_QUERY );
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 2be0bc3ca14c..fbd1694abcd9 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -133,7 +133,6 @@ namespace {
{
public:
explicit Element (const ::rtl::Reference<PresenterToolBar>& rpToolBar);
- virtual ~Element() override;
Element(const Element&) = delete;
Element& operator=(const Element&) = delete;
@@ -212,7 +211,6 @@ namespace {
static ::rtl::Reference<Element> Create (
const ::rtl::Reference<PresenterToolBar>& rpToolBar);
- virtual ~Button() override;
virtual void SAL_CALL disposing() override;
virtual void Paint (
@@ -1223,10 +1221,6 @@ Element::Element (
}
}
-Element::~Element()
-{
-}
-
void Element::SetModes (
const SharedElementMode& rpNormalMode,
const SharedElementMode& rpMouseOverMode,
@@ -1493,10 +1487,6 @@ Button::Button (
OSL_ASSERT(mpToolBar->GetPresenterController()->GetWindowManager().is());
}
-Button::~Button()
-{
-}
-
void Button::Initialize()
{
mpToolBar->GetPresenterController()->GetWindowManager()->AddLayoutListener(this);
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index cd33c6f00124..67654127f465 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -72,7 +72,7 @@ public:
: PresenterSlidePreview(rxContext, rxViewId, rxAnchorPane, rpPresenterController)
{
}
- virtual ~NextSlidePreview() override {}
+
virtual void SAL_CALL setCurrentPage (
const css::uno::Reference<css::drawing::XDrawPage>& rxSlide)
throw (css::uno::RuntimeException, std::exception) override