summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-17 11:16:07 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-11-17 12:26:32 +0000
commitd9e627039245dc42f003a7cf75642f619a621513 (patch)
treed10188cbdf0808f4c4c6663025e15bd4bac47284 /include
parentbe3d2309f0376914b0135046f95b0bb592cf5078 (diff)
loplugin:unnecessaryvirtual
update the plugin with lessons learned from the mergeclasses plugin and re-run it Change-Id: I9d622eb3d05fceaf8fa764c533c8fa5dfb4c7711 Reviewed-on: https://gerrit.libreoffice.org/20015 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/basic/sbxcore.hxx2
-rw-r--r--include/canvas/rendering/isurface.hxx2
-rw-r--r--include/sax/tools/documenthandleradapter.hxx8
-rw-r--r--include/sfx2/viewfrm.hxx6
-rw-r--r--include/svtools/ServerDetailsControls.hxx2
-rw-r--r--include/svx/svdotext.hxx2
-rw-r--r--include/svx/textchainflow.hxx6
-rw-r--r--include/vcl/split.hxx1
-rw-r--r--include/vcl/window.hxx1
-rw-r--r--include/xmloff/xmlnume.hxx2
10 files changed, 13 insertions, 19 deletions
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 260d04558535..4cc57fa27eff 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -54,8 +54,6 @@ protected:
SbxBase& operator=( const SbxBase& );
virtual ~SbxBase();
- virtual bool LoadPrivateData( SvStream&, sal_uInt16 );
- virtual bool StorePrivateData( SvStream& ) const;
virtual sal_uInt32 GetCreator() const { return 0; }
virtual sal_uInt16 GetVersion() const { return 0; }
virtual sal_uInt16 GetSbxId() const { return 0; }
diff --git a/include/canvas/rendering/isurface.hxx b/include/canvas/rendering/isurface.hxx
index 896a4396324f..3f266f94e7b1 100644
--- a/include/canvas/rendering/isurface.hxx
+++ b/include/canvas/rendering/isurface.hxx
@@ -68,8 +68,6 @@ namespace canvas
virtual bool update( const ::basegfx::B2IPoint& rDestPos,
const ::basegfx::B2IRange& rSourceRect,
IColorBuffer& rSource ) = 0;
-
- virtual ::basegfx::B2IVector getSize() = 0;
};
typedef std::shared_ptr< ISurface > ISurfaceSharedPtr;
diff --git a/include/sax/tools/documenthandleradapter.hxx b/include/sax/tools/documenthandleradapter.hxx
index 10b945f83a8a..b36a49705a09 100644
--- a/include/sax/tools/documenthandleradapter.hxx
+++ b/include/sax/tools/documenthandleradapter.hxx
@@ -88,12 +88,12 @@ namespace sax
;
protected:
- virtual void SAL_CALL
+ void SAL_CALL
setDelegate(const css::uno::Reference< css::xml::sax::XDocumentHandler >& delegate)
{
m_handler = delegate;
}
- virtual css::uno::Reference< css::xml::sax::XDocumentHandler > SAL_CALL
+ css::uno::Reference< css::xml::sax::XDocumentHandler > SAL_CALL
getDelegate()
{
return m_handler;
@@ -210,12 +210,12 @@ namespace sax
{
}
- virtual void SAL_CALL
+ void SAL_CALL
setDelegate(const css::uno::Reference< css::xml::sax::XExtendedDocumentHandler >& delegate)
{
m_handler = delegate;
}
- virtual css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > SAL_CALL
+ css::uno::Reference< css::xml::sax::XExtendedDocumentHandler > SAL_CALL
getDelegate()
{
return m_handler;
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index cbb06866d100..bc89068d85d5 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -143,9 +143,9 @@ public:
static void ActivateToolPanel( const css::uno::Reference< css::frame::XFrame >& i_rFrame, const OUString& i_rPanelURL );
// interne Handler
- SAL_DLLPRIVATE virtual bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
- SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const;
- SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh );
+ SAL_DLLPRIVATE bool SetBorderPixelImpl( const SfxViewShell *pSh, const SvBorder &rBorder );
+ SAL_DLLPRIVATE const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const;
+ SAL_DLLPRIVATE void InvalidateBorderImpl( const SfxViewShell *pSh );
virtual SfxObjectShell* GetObjectShell() override;
sal_uInt16 GetCurViewId() const;
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index b86a23d52ecb..8a2289e4f59c 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -57,7 +57,7 @@ class DetailsContainer
virtual void setUsername( const OUString& /*rUsername*/ ) { };
virtual void setPassword( const OUString& ) { };
- virtual void setActive( bool bActive = true );
+ void setActive( bool bActive = true );
protected:
void notifyChange( );
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 149963c4cdef..132b5b8416f3 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -558,7 +558,7 @@ public:
virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus );
/** called from the SdrObjEditView during text edit when a chain of boxes is to be updated */
- virtual void onChainingEvent();
+ void onChainingEvent();
diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx
index e2148548b98b..557aa9e847a8 100644
--- a/include/svx/textchainflow.hxx
+++ b/include/svx/textchainflow.hxx
@@ -40,10 +40,10 @@ public:
// Check for flow events in Outliner
virtual void CheckForFlowEvents(SdrOutliner *);
- virtual void ExecuteUnderflow(SdrOutliner *);
+ void ExecuteUnderflow(SdrOutliner *);
// Uses two outliners: one for the non-overflow text and one for overflowing (might be the same)
- virtual void ExecuteOverflow(SdrOutliner *, SdrOutliner *);
+ void ExecuteOverflow(SdrOutliner *, SdrOutliner *);
bool IsOverflow() const;
bool IsUnderflow() const;
@@ -65,7 +65,7 @@ protected:
TextChain *GetTextChain() const;
virtual void impLeaveOnlyNonOverflowingText(SdrOutliner *);
- virtual void impMoveChainedTextToNextLink(SdrOutliner *);
+ void impMoveChainedTextToNextLink(SdrOutliner *);
virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *);
diff --git a/include/vcl/split.hxx b/include/vcl/split.hxx
index ceeb007c62e1..a80304e3fdac 100644
--- a/include/vcl/split.hxx
+++ b/include/vcl/split.hxx
@@ -68,7 +68,6 @@ public:
void StartSplit();
void EndSplit();
void Split();
- virtual void Splitting( Point& rSplitPos );
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
virtual void Tracking( const TrackingEvent& rTEvt ) override;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 67a9aac2afe1..06914273c891 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -840,7 +840,6 @@ public:
virtual void KeyUp( const KeyEvent& rKEvt );
virtual void PrePaint(vcl::RenderContext& rRenderContext);
virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
- virtual void PostPaint(vcl::RenderContext& rRenderContext);
void Erase(vcl::RenderContext& rRenderContext);
virtual void Erase() override
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index 44124ed6c5ca..d522399b9a5e 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -57,7 +57,7 @@ class XMLOFF_DLLPUBLIC SvxXMLNumRuleExport
protected:
/// Override this to add attributes to the <list-style> element.
- SAL_DLLPRIVATE virtual void AddListStyleAttributes();
+ SAL_DLLPRIVATE void AddListStyleAttributes();
SAL_DLLPRIVATE bool exportStyle( const css::uno::Reference< css::style::XStyle >& rStyle );
SAL_DLLPRIVATE void exportOutline();