summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-12 08:21:27 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-07-15 14:05:41 +0000
commit6e72f0251bb8767942edf74f612547c12ca0cdf1 (patch)
tree0785de1a2f8995d1d4ede7889541bda9b59f893f /cui
parent7da80de2c75e048a08ea6e923a9f433a638a9f12 (diff)
new loplugin unnecessary override
Change-Id: I88d3e33823d68745b98625050a8a274f9ef04bcb Reviewed-on: https://gerrit.libreoffice.org/27135 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/hltpbase.cxx22
-rw-r--r--cui/source/dialogs/passwdomdlg.cxx6
-rw-r--r--cui/source/inc/hltpbase.hxx7
-rw-r--r--cui/source/inc/iconcdlg.hxx6
-rw-r--r--cui/source/inc/passwdomdlg.hxx1
-rw-r--r--cui/source/inc/radiobtnbox.hxx1
-rw-r--r--cui/source/options/radiobtnbox.cxx5
7 files changed, 5 insertions, 43 deletions
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index a16aec2a535d..7e117bb43743 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -97,22 +97,10 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
return nRet;
}
-void SvxHyperURLBox::Select()
-{
- SvtURLBox::Select();
-}
void SvxHyperURLBox::Modify()
{
SvtURLBox::Modify();
}
-bool SvxHyperURLBox::Notify( NotifyEvent& rNEvt )
-{
- return SvtURLBox::Notify( rNEvt );
-}
-bool SvxHyperURLBox::PreNotify( NotifyEvent& rNEvt )
-{
- return SvtURLBox::PreNotify( rNEvt );
-}
//# Hyperlink-Dialog: Tabpages-Baseclass #
@@ -156,16 +144,6 @@ void SvxHyperlinkTabPageBase::dispose()
IconChoicePage::dispose();
}
-void SvxHyperlinkTabPageBase::ActivatePage()
-{
- TabPage::ActivatePage();
-}
-
-void SvxHyperlinkTabPageBase::DeactivatePage()
-{
- TabPage::DeactivatePage();
-}
-
bool SvxHyperlinkTabPageBase::QueryClose()
{
return !mbIsCloseDisabled;
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 1a9a932494ac..f869cd3f2fe6 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -153,12 +153,6 @@ PasswordToOpenModifyDialog::~PasswordToOpenModifyDialog()
disposeOnce();
}
-void PasswordToOpenModifyDialog::dispose()
-{
- SfxModalDialog::dispose();
-}
-
-
OUString PasswordToOpenModifyDialog::GetPasswordToOpen() const
{
const bool bPasswdOk =
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 942f97f4e9f2..9ccd26809688 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -53,10 +53,7 @@ protected:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override;
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override;
- virtual bool Notify( NotifyEvent& rNEvt ) override;
- virtual void Select() override;
virtual void Modify() override;
- virtual bool PreNotify( NotifyEvent& rNEvt ) override;
public:
SvxHyperURLBox( vcl::Window* pParent, INetProtocol eSmart = INetProtocol::File );
@@ -136,8 +133,8 @@ public:
Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); }
bool MoveToExtraWnd ( Point aNewPos, bool bDisConnectDlg = false );
- virtual void ActivatePage() override;
- virtual void DeactivatePage() override;
+ using TabPage::ActivatePage;
+ using TabPage::DeactivatePage;
virtual bool QueryClose() override;
protected:
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index b592f7f54042..4c2b1d5fbca7 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -62,9 +62,6 @@ struct IconChoicePageData
class IconChoicePage : public TabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
private:
const SfxItemSet* pSet;
OUString aUserString;
@@ -74,6 +71,9 @@ private:
void ImplInitSettings();
protected:
+ using TabPage::ActivatePage;
+ using TabPage::DeactivatePage;
+
IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet );
public:
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index 87363297f0fe..d35d9f3dc11f 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -39,7 +39,6 @@ public:
sal_uInt16 nMaxPasswdLen /* 0 -> no max len enforced */,
bool bIsPasswordToModify );
virtual ~PasswordToOpenModifyDialog();
- virtual void dispose() override;
// AbstractPasswordToOpenModifyDialog
OUString GetPasswordToOpen() const;
diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx
index e93dc7b0b2a8..b9af0af621a0 100644
--- a/cui/source/inc/radiobtnbox.hxx
+++ b/cui/source/inc/radiobtnbox.hxx
@@ -33,7 +33,6 @@ private:
Point m_aCurMousePoint;
protected:
- virtual void SetTabs() override;
virtual void MouseButtonUp( const MouseEvent& _rMEvt ) override;
virtual void KeyInput( const KeyEvent& rKEvt ) override;
diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx
index 02a5c043d92b..4e304a96a932 100644
--- a/cui/source/options/radiobtnbox.cxx
+++ b/cui/source/options/radiobtnbox.cxx
@@ -33,11 +33,6 @@ SvxRadioButtonListBox::SvxRadioButtonListBox(SvSimpleTableContainer& rParent, Wi
EnableCheckButton( new SvLBoxButtonData( this, true ) );
}
-void SvxRadioButtonListBox::SetTabs()
-{
- SvSimpleTable::SetTabs();
-}
-
void SvxRadioButtonListBox::MouseButtonUp( const MouseEvent& _rMEvt )
{
m_aCurMousePoint = _rMEvt.GetPosPixel();