From d9e627039245dc42f003a7cf75642f619a621513 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 17 Nov 2015 11:16:07 +0200 Subject: 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 Reviewed-by: Noel Grandin --- vcl/source/window/menubarwindow.hxx | 8 ++++---- vcl/source/window/paint.cxx | 6 ------ vcl/source/window/split.cxx | 18 ------------------ 3 files changed, 4 insertions(+), 28 deletions(-) (limited to 'vcl/source/window') diff --git a/vcl/source/window/menubarwindow.hxx b/vcl/source/window/menubarwindow.hxx index 01979047fff7..f59ddeac772e 100644 --- a/vcl/source/window/menubarwindow.hxx +++ b/vcl/source/window/menubarwindow.hxx @@ -147,10 +147,10 @@ public: Rectangle GetMenuBarButtonRectPixel(sal_uInt16 nId); void RemoveMenuBarButton(sal_uInt16 nId); bool HandleMenuButtonEvent(sal_uInt16 i_nButtonId); - virtual void SetMBWHideAccel (bool val) { mbHideAccel = val; } - virtual bool GetMBWHideAccel (void) const { return mbHideAccel; } - virtual void SetMBWMenuKey (bool val) { mbMenuKey = val; } - virtual bool GetMBWMenuKey (void) const { return mbMenuKey; } + void SetMBWHideAccel(bool val) { mbHideAccel = val; } + bool GetMBWHideAccel() const { return mbHideAccel; } + void SetMBWMenuKey(bool val) { mbMenuKey = val; } + bool GetMBWMenuKey() const { return mbMenuKey; } }; #endif // INCLUDED_VCL_SOURCE_WINDOW_MENUBARWINDOW_HXX diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 6dd4da85a2ba..3a13be39fb58 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -607,8 +607,6 @@ void Window::ImplCallPaint(const vcl::Region* pRegion, sal_uInt16 nPaintFlags) aHelper.DoPaint(pRegion); else mpWindowImpl->mnPaintFlags = 0; - - PostPaint(*this); } void Window::ImplCallOverlapPaint() @@ -1028,10 +1026,6 @@ void Window::PrePaint(vcl::RenderContext& /*rRenderContext*/) { } -void Window::PostPaint(vcl::RenderContext& /*rRenderContext*/) -{ -} - void Window::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { CallEventListeners(VCLEVENT_WINDOW_PAINT, const_cast(&rRect)); diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx index de21f161c778..a39f30bc81e8 100644 --- a/vcl/source/window/split.cxx +++ b/vcl/source/window/split.cxx @@ -233,8 +233,6 @@ void Splitter::MouseButtonDown( const MouseEvent& rMEvt ) else aPos.Y() = mnLastSplitPos; ImplSplitMousePos( aPos ); - Splitting( aPos ); - ImplSplitMousePos( aPos ); long nTemp = mnSplitPos; if ( mbHorzSplit ) SetSplitPosPixel( aPos.X() ); @@ -283,8 +281,6 @@ void Splitter::Tracking( const TrackingEvent& rTEvt ) //Point aNewPos = mpRefWin->ScreenToOutputPixel( OutputToScreenPixel( rTEvt.GetMouseEvent().GetPosPixel() ) ); Point aNewPos = mpRefWin->NormalizedScreenToOutputPixel( OutputToNormalizedScreenPixel( rTEvt.GetMouseEvent().GetPosPixel() ) ); ImplSplitMousePos( aNewPos ); - Splitting( aNewPos ); - ImplSplitMousePos( aNewPos ); if ( mbHorzSplit ) { @@ -407,8 +403,6 @@ void Splitter::ImplKbdTracking( vcl::KeyCode aKeyCode ) break; } ImplSplitMousePos( aNewPos ); - Splitting( aNewPos ); - ImplSplitMousePos( aNewPos ); if ( mbHorzSplit ) { @@ -453,10 +447,6 @@ void Splitter::EndSplit() maEndSplitHdl.Call( this ); } -void Splitter::Splitting( Point& /* rSplitPos */ ) -{ -} - void Splitter::SetDragRectPixel( const Rectangle& rDragRect, vcl::Window* _pRefWin ) { maDragRect = rDragRect; @@ -484,8 +474,6 @@ void Splitter::StartDrag() // Start-Position ermitteln maDragPos = mpRefWin->GetPointerPosPixel(); ImplSplitMousePos( maDragPos ); - Splitting( maDragPos ); - ImplSplitMousePos( maDragPos ); if ( mbHorzSplit ) mnStartSplitPos = maDragPos.X(); else @@ -516,8 +504,6 @@ void Splitter::ImplStartKbdSplitting() else maDragPos = Point( aSize.Width()/2, ImplSplitterActive() ? aPos.Y() : mnSplitPos ); ImplSplitMousePos( maDragPos ); - Splitting( maDragPos ); - ImplSplitMousePos( maDragPos ); if ( mbHorzSplit ) mnStartSplitPos = maDragPos.X(); else @@ -539,8 +525,6 @@ void Splitter::ImplRestoreSplitter() aPos.Y() = mnLastSplitPos; } - ImplSplitMousePos( aPos ); - Splitting( aPos ); ImplSplitMousePos( aPos ); long nTemp = mnSplitPos; if ( mbHorzSplit ) @@ -632,8 +616,6 @@ void Splitter::KeyInput( const KeyEvent& rKEvt ) else aPos.Y() = 0; ImplSplitMousePos( aPos ); - Splitting( aPos ); - ImplSplitMousePos( aPos ); long nTemp = mnSplitPos; if ( mbHorzSplit ) SetSplitPosPixel( aPos.X() ); -- cgit v1.2.3