summaryrefslogtreecommitdiffstats
path: root/cui
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-01-20 12:38:10 +0200
committerNoel Grandin <noel@peralex.com>2015-01-26 08:42:28 +0200
commitb44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch)
tree9b4d5d99e5dad0971079b997a02a6d96536709ca /cui
parentconvert to use std random instead of boost (diff)
downloadcore-b44cbb26efe1d0b0950b1e1613e131b506dc3876.tar.gz
core-b44cbb26efe1d0b0950b1e1613e131b506dc3876.zip
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden. In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'cui')
-rw-r--r--cui/source/factory/dlgfact.hxx2
-rw-r--r--cui/source/inc/cuitabarea.hxx12
-rw-r--r--cui/source/inc/hltpbase.hxx4
-rw-r--r--cui/source/inc/iconcdlg.hxx6
-rw-r--r--cui/source/inc/macroass.hxx2
-rw-r--r--cui/source/inc/newtabledlg.hxx2
-rw-r--r--cui/source/inc/passwdomdlg.hxx6
-rw-r--r--cui/source/inc/sdrcelldlg.hxx2
8 files changed, 18 insertions, 18 deletions
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 081a7373c3d0..8c7420f858f4 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -511,7 +511,7 @@ class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory
public:
virtual VclAbstractDialog* CreateVclDialog( vcl::Window* pParent, sal_uInt32 nResId ) SAL_OVERRIDE;
virtual VclAbstractDialog* CreateSfxDialog( vcl::Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE;
- virtual SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId,
+ SfxAbstractDialog* CreateSfxDialog( sal_uInt32 nResId,
vcl::Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xViewFrame,
const SfxItemSet* pAttrSet=0 );
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 09ff336dac9f..8c9bfc0d6457 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -740,8 +740,8 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE;
- virtual XPropertyListRef GetPropertyList( XPropertyListType t );
- virtual void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef );
+ XPropertyListRef GetPropertyList( XPropertyListType t );
+ void SetPropertyList( XPropertyListType t, const XPropertyListRef &xRef );
void SetColorList( XColorListRef pColList );
XColorListRef GetColorList() { return pColorList; }
@@ -757,22 +757,22 @@ public:
virtual void FillUserData() SAL_OVERRIDE;
- virtual bool IsModified()
+ bool IsModified()
{
return *pnColorListState & CT_MODIFIED;
}
- virtual void SetModified(bool bIsModified)
+ void SetModified(bool bIsModified)
{
if (bIsModified)
*pnColorListState |= CT_MODIFIED;
else
*pnColorListState &= ~CT_MODIFIED;
}
- virtual void AddState(ChangeType nState)
+ void AddState(ChangeType nState)
{
*pnColorListState |= nState;
}
- virtual void Update(bool bLoaded);
+ void Update(bool bLoaded);
};
#endif // INCLUDED_CUI_SOURCE_INC_CUITABAREA_HXX
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index d2c229db98c7..8b645e84d619 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -90,12 +90,12 @@ protected:
SvxHlinkDlgMarkWnd* mpMarkWnd;
void InitStdControls ();
- virtual void FillStandardDlgFields ( const SvxHyperlinkItem* pHyperlinkItem );
+ void FillStandardDlgFields ( const SvxHyperlinkItem* pHyperlinkItem );
virtual void FillDlgFields(const OUString& rStrURL) = 0;
virtual void GetCurentItemData ( OUString& rStrURL, OUString& aStrName,
OUString& aStrIntName, OUString& aStrFrame,
SvxLinkInsertMode& eMode ) = 0;
- virtual OUString CreateUiNameFromURL( const OUString& aStrURL );
+ OUString CreateUiNameFromURL( const OUString& aStrURL );
void GetDataFromCommonFields( OUString& aStrName,
OUString& aStrIntName, OUString& aStrFrame,
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 531b0b6e7b03..c98fe8cd4e95 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -112,8 +112,8 @@ public :
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
void SetUserData(const OUString& rString) { aUserString = rString; }
OUString GetUserData() { return aUserString; }
- virtual void FillUserData();
- virtual bool IsReadOnly() const;
+ void FillUserData();
+ bool IsReadOnly() const;
virtual bool QueryClose();
void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
@@ -166,7 +166,7 @@ protected :
void HidePageImpl ( IconChoicePageData* pData );
virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
- virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId );
+ SfxItemSet* CreateInputItemSet( sal_uInt16 nId );
inline SfxItemSet* GetInputSetImpl() { return (SfxItemSet*)pSet; }
inline IconChoicePage* GetTabPage( sal_uInt16 nPageId )
{ return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); }
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index bdcd93c6f724..22c70eb36350 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -63,7 +63,7 @@ public:
const SvxMacroTableDtor& GetMacroTbl() const;
void SetMacroTbl( const SvxMacroTableDtor& rTbl );
- virtual void ScriptChanged();
+ void ScriptChanged();
virtual void PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE;
using TabPage::ActivatePage; // FIXME WTF is this nonsense?
virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE;
diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx
index 63ed48b9943b..91d13a0f963f 100644
--- a/cui/source/inc/newtabledlg.hxx
+++ b/cui/source/inc/newtabledlg.hxx
@@ -36,7 +36,7 @@ public:
SvxNewTableDialog( vcl::Window* pWindow );
virtual short Execute(void) SAL_OVERRIDE;
- virtual void Apply(void);
+ void Apply(void);
virtual sal_Int32 getRows() const SAL_OVERRIDE;
virtual sal_Int32 getColumns() const SAL_OVERRIDE;
diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx
index 179d99bca75a..5a81d8b9c06b 100644
--- a/cui/source/inc/passwdomdlg.hxx
+++ b/cui/source/inc/passwdomdlg.hxx
@@ -43,9 +43,9 @@ public:
virtual ~PasswordToOpenModifyDialog();
// AbstractPasswordToOpenModifyDialog
- virtual OUString GetPasswordToOpen() const;
- virtual OUString GetPasswordToModify() const;
- virtual bool IsRecommendToOpenReadonly() const;
+ OUString GetPasswordToOpen() const;
+ OUString GetPasswordToModify() const;
+ bool IsRecommendToOpenReadonly() const;
};
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index 66080975ca5d..1e7146aca101 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -39,7 +39,7 @@ private:
sal_uInt16 m_nBorderPageId;
protected:
- virtual void Apply();
+ void Apply();
public:
SvxFormatCellsDialog( vcl::Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel );