summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-09 08:55:13 +0200
committerNoel Grandin <noel@peralex.com>2015-06-09 10:06:57 +0200
commit81b954718f0cdac6873927e869b3e41f863562e7 (patch)
tree3e12a2cb35b263ea4d4e49b61af2ca8b733c5c28 /include
parentaba3c3a35a0afde16e42a94ae8cb2b1f589135db (diff)
loplugin:unnecessaryvirtuals
Improve the plugin a little. Create a python script to process the output. Run it again. Change-Id: I05c21d8a21c8f4243af739c412fda0a521f9b5f0
Diffstat (limited to 'include')
-rw-r--r--include/svl/svdde.hxx37
-rw-r--r--include/svtools/editbrowsebox.hxx8
-rw-r--r--include/svx/fmgridcl.hxx2
-rw-r--r--include/svx/fmgridif.hxx4
-rw-r--r--include/svx/gridctrl.hxx22
-rw-r--r--include/test/beans/xpropertyset.hxx2
-rw-r--r--include/vcl/scheduler.hxx2
-rw-r--r--include/vcl/window.hxx4
8 files changed, 40 insertions, 41 deletions
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index 598aa3d7c384..a616268b5a75 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -89,8 +89,8 @@ public:
class SVL_DLLPUBLIC DdeTransaction
{
public:
- virtual void Data( const DdeData* );
- virtual void Done( bool bDataValid );
+ void Data( const DdeData* );
+ void Done( bool bDataValid );
protected:
DdeConnection& rDde;
DdeData aDdeData;
@@ -146,7 +146,7 @@ public:
void SetNotifyHdl( const Link<>& rLink ) { aNotify = rLink; }
const Link<>& GetNotifyHdl() const { return aNotify; }
- virtual void Notify();
+ void Notify();
};
@@ -288,18 +288,17 @@ class SVL_DLLPUBLIC DdeTopic
SVL_DLLPRIVATE void _Disconnect( sal_IntPtr );
public:
- virtual void Connect( sal_IntPtr );
- virtual void Disconnect( sal_IntPtr );
+ void Connect( sal_IntPtr );
+ void Disconnect( sal_IntPtr );
virtual DdeData* Get(SotClipboardFormatId);
- virtual bool Put( const DdeData* );
- virtual bool Execute( const OUString* );
+ virtual bool Put( const DdeData* );
+ virtual bool Execute( const OUString* );
// Eventually create a new item. return 0 -> Item creation failed
- virtual bool MakeItem( const OUString& rItem );
-
+ virtual bool MakeItem( const OUString& rItem );
// A Warm-/Hot-Link is created. Return true if successful
virtual bool StartAdviseLoop();
- virtual bool StopAdviseLoop();
+ bool StopAdviseLoop();
private:
friend class DdeInternal;
@@ -357,18 +356,18 @@ class SVL_DLLPUBLIC DdeService
friend class DdeInternal;
public:
- virtual bool IsBusy();
- virtual OUString GetHelp();
+ bool IsBusy();
+ OUString GetHelp();
// Eventually creating a new item. return 0 -> Topic creation failed
- virtual bool MakeTopic( const OUString& rItem );
+ bool MakeTopic( const OUString& rItem );
protected:
- virtual OUString Topics();
- virtual OUString Formats();
- virtual OUString SysItems();
- virtual OUString Status();
- virtual OUString SysTopicGet( const OUString& );
- virtual bool SysTopicExecute( const OUString* );
+ OUString Topics();
+ OUString Formats();
+ OUString SysItems();
+ OUString Status();
+ OUString SysTopicGet( const OUString& );
+ bool SysTopicExecute( const OUString* );
const DdeTopic* GetSysTopic() const { return pSysTopic; }
private:
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index d2dd6de07466..d0dec9fe7be5 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -540,7 +540,7 @@ namespace svt
// should be used instead of GetFieldRectPixel, 'cause this method here takes into account the borders
Rectangle GetCellRect(long nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const;
virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId);
- virtual sal_uInt32 GetAutoColumnWidth(sal_uInt16 nColId);
+ sal_uInt32 GetAutoColumnWidth(sal_uInt16 nColId);
virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const;
virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const = 0;
@@ -570,14 +570,14 @@ namespace svt
virtual CellController* GetController(long nRow, sal_uInt16 nCol);
virtual void InitController(CellControllerRef& rController, long nRow, sal_uInt16 nCol);
- virtual void ResizeController(CellControllerRef& rController, const Rectangle&);
- virtual void ReleaseController(CellControllerRef& pController, long nRow, sal_uInt16 nCol);
+ static void ResizeController(CellControllerRef& rController, const Rectangle&);
+ static void ReleaseController(CellControllerRef& pController, long nRow, sal_uInt16 nCol);
virtual void DoubleClick(const BrowserMouseEvent&) SAL_OVERRIDE;
void ActivateCell() { ActivateCell(GetCurRow(), GetCurColumnId()); }
// retrieve the image for the row status
- virtual Image GetImage(RowStatus) const;
+ Image GetImage(RowStatus) const;
// inserting columns
// if you don't set a width, this will be calculated automatically
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 7bb356852b28..55e12d0ad030 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -173,7 +173,7 @@ protected:
// Initialize columns
// a.) only by column description
- virtual void InitColumnsByModels(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& xColumns);
+ void InitColumnsByModels(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& xColumns);
// b.) during alivemode by database fields
virtual void InitColumnsByFields(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xFields) SAL_OVERRIDE;
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index d752b881e064..330a26b4345a 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -514,8 +514,8 @@ protected:
Instead it may use addColumnListeners and removeColumnListeners which are called in all
the cases.
*/
- virtual void addColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCol);
- virtual void removeColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCol);
+ void addColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCol);
+ void removeColumnListeners(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xCol);
void selectionChanged();
void columnChanged();
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 677e4c9e5595..a672738596ed 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -324,8 +324,8 @@ protected:
virtual bool IsModified() const SAL_OVERRIDE;
virtual sal_uInt16 AppendColumn(const OUString& rName, sal_uInt16 nWidth = 0, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = (sal_uInt16)-1) SAL_OVERRIDE;
- virtual void RemoveColumn(sal_uInt16 nId);
- virtual DbGridColumn* CreateColumn(sal_uInt16 nId) const;
+ void RemoveColumn(sal_uInt16 nId);
+ DbGridColumn* CreateColumn(sal_uInt16 nId) const;
virtual void ColumnMoved(sal_uInt16 nId) SAL_OVERRIDE;
virtual bool SaveRow() SAL_OVERRIDE;
virtual bool IsTabAllowed(bool bForward) const SAL_OVERRIDE;
@@ -347,12 +347,12 @@ protected:
*/
virtual void PostExecuteRowContextMenu(sal_uInt16 nRow, const PopupMenu& rMenu, sal_uInt16 nExecutionResult);
- virtual void DataSourcePropertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException);
+ void DataSourcePropertyChanged(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException);
- virtual void FieldValueChanged(sal_uInt16 _nId, const ::com::sun::star::beans::PropertyChangeEvent& _evt);
- virtual void FieldListenerDisposing(sal_uInt16 _nId);
+ void FieldValueChanged(sal_uInt16 _nId, const ::com::sun::star::beans::PropertyChangeEvent& _evt);
+ void FieldListenerDisposing(sal_uInt16 _nId);
- virtual void disposing(sal_uInt16 _nId, const ::com::sun::star::lang::EventObject& _rEvt);
+ void disposing(sal_uInt16 _nId, const ::com::sun::star::lang::EventObject& _rEvt);
// own overridables
/// called when the current row changed
@@ -396,7 +396,7 @@ public:
// the data source
// the options can restrict but not extend the update abilities
- virtual void setDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& rCursor,
+ void setDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& rCursor,
sal_uInt16 nOpts = OPT_INSERT | OPT_UPDATE | OPT_DELETE);
virtual void Dispatch(sal_uInt16 nId) SAL_OVERRIDE;
@@ -426,7 +426,7 @@ public:
bool IsDesignMode() const {return m_bDesignMode;}
bool IsOpen() const {return m_pSeekCursor != NULL;}
- virtual void SetFilterMode(bool bMode);
+ void SetFilterMode(bool bMode);
bool IsFilterMode() const {return m_bFilterMode;}
bool IsFilterRow(long nRow) const {return m_bFilterMode && nRow == 0;}
@@ -463,9 +463,9 @@ public:
// is the current line being updated
bool IsUpdating() const {return m_bUpdating;}
- virtual void RowRemoved( long nRow, long nNumRows = 1, bool bDoPaint = true );
- virtual void RowInserted( long nRow, long nNumRows = 1, bool bDoPaint = true, bool bKeepSelection = false );
- virtual void RowModified( long nRow, sal_uInt16 nColId = USHRT_MAX );
+ void RowRemoved( long nRow, long nNumRows = 1, bool bDoPaint = true );
+ void RowInserted( long nRow, long nNumRows = 1, bool bDoPaint = true, bool bKeepSelection = false );
+ void RowModified( long nRow, sal_uInt16 nColId = USHRT_MAX );
void resetCurrentRow();
diff --git a/include/test/beans/xpropertyset.hxx b/include/test/beans/xpropertyset.hxx
index 19f06356faab..e53cee26e5c5 100644
--- a/include/test/beans/xpropertyset.hxx
+++ b/include/test/beans/xpropertyset.hxx
@@ -32,7 +32,7 @@ public:
void testGetPropertyValue();
protected:
- virtual bool isPropertyValueChangeable(const OUString& rName);
+ bool isPropertyValueChangeable(const OUString& rName);
private:
void fillPropsToTest(const css::uno::Reference<css::beans::XPropertySetInfo>& xPropInfo);
diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 5ce31e2db795..dfa1483132b2 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -73,7 +73,7 @@ public:
virtual void Invoke() = 0;
virtual void Start();
- virtual void Stop();
+ void Stop();
bool IsActive() const { return mbActive; }
void SetInActive() { mbActive = false; }
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 0aa057d21828..a18debc6bbe7 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -837,7 +837,7 @@ protected:
OutputDevice::DrawGradientWallpaper(nX, nY, nWidth, nHeight, rWallpaper);
}
- virtual void DrawGradientWallpaper(vcl::RenderContext& rRenderContext, long nX, long nY,
+ void DrawGradientWallpaper(vcl::RenderContext& rRenderContext, long nX, long nY,
long nWidth, long nHeight, const Wallpaper& rWallpaper);
virtual void ApplySettings(vcl::RenderContext& rRenderContext);
@@ -863,7 +863,7 @@ public:
virtual void PrePaint(vcl::RenderContext& rRenderContext);
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
virtual void PostPaint(vcl::RenderContext& rRenderContext);
- virtual void Erase(vcl::RenderContext& rRenderContext);
+ void Erase(vcl::RenderContext& rRenderContext);
virtual void Erase() SAL_OVERRIDE
{