include/editeng/numitem.hxx | 2 +- include/sfx2/childwin.hxx | 1 - include/sfx2/navigat.hxx | 1 - include/sfx2/objsh.hxx | 2 +- include/svl/itempool.hxx | 2 +- include/svx/svdmrkv.hxx | 2 +- include/svx/svdobj.hxx | 2 +- include/svx/svdotext.hxx | 2 +- include/vcl/syswin.hxx | 2 -- sc/source/ui/inc/fupoor.hxx | 2 +- sfx2/source/appl/childwin.cxx | 4 ---- sfx2/source/dialog/navigat.cxx | 10 ---------- vcl/source/window/brdwin.cxx | 3 --- vcl/source/window/syswin.cxx | 8 -------- 14 files changed, 7 insertions(+), 36 deletions(-)
New commits: commit 880bcf9ed8c54f53d9fb631b9e064a468a9d02da Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Wed Nov 2 16:35:25 2016 +0200 loplugin:unnecessaryvirtual Change-Id: I572b83949c7e643536b7d62567760546509e4d9f Reviewed-on: https://gerrit.libreoffice.org/30514 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx index e687246..5466ae8 100644 --- a/include/editeng/numitem.hxx +++ b/include/editeng/numitem.hxx @@ -181,7 +181,7 @@ public: virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = nullptr, const sal_Int16* pOrient = nullptr); const SvxBrushItem* GetBrush() const {return pGraphicBrush;} void SetGraphic( const OUString& rName ); - virtual sal_Int16 GetVertOrient() const; + sal_Int16 GetVertOrient() const; void SetGraphicSize(const Size& rSet) {aGraphicSize = rSet;} const Size& GetGraphicSize() const {return aGraphicSize;} diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 8a77f2e..3068d00 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -137,7 +137,6 @@ public: FloatingWindow* GetFloatingWindow() const; - virtual void Resizing( Size& rSize ); static void RegisterChildWindowContext(SfxModule*, sal_uInt16, SfxChildWinContextFactory*); }; diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index 749adbf..8ba2193 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -46,7 +46,6 @@ public: WinBits nBits ); virtual void Resize() override; - virtual void Resizing( Size& rSize ) override; virtual bool Close() override; }; diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 20ec6e3..fe72c66 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -433,7 +433,7 @@ public: bool IsSecurityOptOpenReadOnly() const; void SetSecurityOptOpenReadOnly( bool bOpenReadOnly = true ); - virtual Size GetFirstPageSize(); + Size GetFirstPageSize(); bool DoClose(); virtual void PrepareReload(); std::shared_ptr<GDIMetaFile> GetPreviewMetaFile( bool bFullContent = false ) const; diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx index 624ef08..e15bf82 100644 --- a/include/svl/itempool.hxx +++ b/include/svl/itempool.hxx @@ -146,7 +146,7 @@ public: const OUString& GetName() const; virtual const SfxPoolItem& Put( const SfxPoolItem&, sal_uInt16 nWhich = 0 ); - virtual void Remove( const SfxPoolItem& ); + void Remove( const SfxPoolItem& ); const SfxPoolItem& GetDefaultItem( sal_uInt16 nWhich ) const; const SfxPoolItem* LoadItem( SvStream &rStream, diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index bb187a8..2213699 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -182,7 +182,7 @@ public: virtual void ClearPageView() override; virtual void HideSdrPage() override; - virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; // Returns sal_True if objects, points or glue points are selected by drawing a frame // (as long as the frame is drawn). diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 266f289..4855868 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -636,7 +636,7 @@ public: void ImpSetAnchorPos(const Point& rPnt); virtual void NbcSetAnchorPos(const Point& rPnt); virtual void SetAnchorPos(const Point& rPnt); - virtual const Point& GetAnchorPos() const; + const Point& GetAnchorPos() const; /// Snap is not done on the BoundRect but if possible on logic coordinates /// (i.e. without considering stroke width, ...) diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index ec316e9..ee5a393 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -490,7 +490,7 @@ public: virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) override; void NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObject, SdrText* pText ); virtual OutlinerParaObject* GetOutlinerParaObject() const override; - virtual OutlinerParaObject* GetEditOutlinerParaObject() const; + OutlinerParaObject* GetEditOutlinerParaObject() const; virtual void NbcReformatText() override; virtual void ReformatText() override; diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index dd6d9f0..2c1681e 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -199,8 +199,6 @@ public: virtual bool Close(); virtual void TitleButtonClick( TitleButton nButton ); - virtual void Pin(); - virtual void Roll(); virtual void Resizing( Size& rSize ); virtual void Resize() override; virtual Size GetOptimalSize() const override; diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index bbdfdb3..9d82989 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -83,7 +83,7 @@ public: // moved from inline to *.cxx virtual bool MouseButtonDown(const MouseEvent& rMEvt); // { return FALSE; } - virtual sal_uInt8 Command(const CommandEvent& rCEvt); + sal_uInt8 Command(const CommandEvent& rCEvt); virtual void Activate(); virtual void Deactivate(); diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index d3ea17c..a637818 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -537,10 +537,6 @@ FloatingWindow* SfxChildWindowContext::GetFloatingWindow() const } } -void SfxChildWindowContext::Resizing( Size& ) -{ -} - void SfxChildWindow::SetFactory_Impl( SfxChildWinFactory *pF ) { pImpl->pFact = pF; diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index bb1ccd6..c41717b 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -64,16 +64,6 @@ void SfxNavigator::Resize() pWrapper->GetContextWindow()->SetSizePixel( GetOutputSizePixel() ); } -void SfxNavigator::Resizing( Size &rSize ) -{ - SfxDockingWindow::Resizing( rSize ); - - SfxChildWindowContext *pCon = GetChildWindow_Impl()->GetContext_Impl(); - DBG_ASSERT( pCon, "No Context!" ); - if ( pCon ) - pCon->Resizing( rSize ); -} - bool SfxNavigator::Close() { DBG_ASSERT( GetChildWindow_Impl()->GetContext_Impl(), "No Context!" ); diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index ce63cfd..cb13b9f 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -908,7 +908,6 @@ bool ImplStdBorderWindowView::MouseButtonDown( const MouseEvent& rMEvt ) pClientWindow->RollDown(); else pClientWindow->RollUp(); - pClientWindow->Roll(); } } } @@ -981,7 +980,6 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) pClientWindow->RollDown(); else pClientWindow->RollUp(); - pClientWindow->Roll(); } } } @@ -1059,7 +1057,6 @@ bool ImplStdBorderWindowView::Tracking( const TrackingEvent& rTEvt ) { SystemWindow* pClientWindow = static_cast<SystemWindow*>(pBorderWindow->ImplGetClientWindow()); pClientWindow->SetPin( !pClientWindow->IsPinned() ); - pClientWindow->Pin(); } } } diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 5e1a372..f7732910 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -298,14 +298,6 @@ void SystemWindow::TitleButtonClick( TitleButton ) { } -void SystemWindow::Pin() -{ -} - -void SystemWindow::Roll() -{ -} - void SystemWindow::Resizing( Size& ) { } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits