From 7618302b9c15580c1e00af042c586837f6f0bb0f Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 5 Oct 2016 12:06:47 +0200 Subject: loplugin:unnecessaryoverride in sd/starmath Change-Id: I5a9d776af761fcaed7a6961e151feb38fc6353ed --- sd/inc/stlsheet.hxx | 1 - sd/source/core/stlsheet.cxx | 5 ----- sd/source/ui/dlg/PhotoAlbumDialog.cxx | 5 ----- sd/source/ui/dlg/PhotoAlbumDialog.hxx | 2 -- sd/source/ui/dlg/animobjs.cxx | 5 ----- sd/source/ui/docshell/docshel2.cxx | 5 ----- sd/source/ui/func/fuconstr.cxx | 5 ----- sd/source/ui/func/fusel.cxx | 5 ----- sd/source/ui/inc/ClientView.hxx | 2 -- sd/source/ui/inc/DrawDocShell.hxx | 1 - sd/source/ui/inc/DrawViewShell.hxx | 2 -- sd/source/ui/inc/Ruler.hxx | 1 - sd/source/ui/inc/View.hxx | 7 ------- sd/source/ui/inc/animobjs.hxx | 1 - sd/source/ui/inc/drawview.hxx | 1 - sd/source/ui/inc/fuconstr.hxx | 2 -- sd/source/ui/inc/fusel.hxx | 1 - sd/source/ui/slideshow/showwin.cxx | 11 ----------- sd/source/ui/slideshow/showwindow.hxx | 2 -- sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 3 --- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 5 ----- sd/source/ui/view/clview.cxx | 5 ----- sd/source/ui/view/drawview.cxx | 10 ---------- sd/source/ui/view/drviews1.cxx | 9 --------- sd/source/ui/view/sdruler.cxx | 5 ----- sd/source/ui/view/sdview.cxx | 6 ------ sd/source/ui/view/sdview2.cxx | 11 ----------- 27 files changed, 118 deletions(-) (limited to 'sd') diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index 6b919e5229c8..a57f3fe9c187 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -62,7 +62,6 @@ public: virtual bool HasFollowSupport() const override; virtual bool HasParentSupport() const override; virtual bool HasClearParentSupport() const override; - virtual bool SetName(const OUString& rNewName, bool bReindexNow = true) override; virtual void SetHelpId( const OUString& r, sal_uLong nId ) override; void AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems = true); diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index a6652f7025a3..9e34cbd399fa 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -611,11 +611,6 @@ bool SdStyleSheet::HasClearParentSupport() const return true; } -bool SdStyleSheet::SetName(const OUString& rName, bool bReindexNow) -{ - return SfxStyleSheet::SetName(rName, bReindexNow); -} - void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId ) { SfxStyleSheet::SetHelpId( r, nId ); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 94a8632397b5..ee8784320fd4 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -807,11 +807,6 @@ Reference< graphic::XGraphic> SdPhotoAlbumDialog::createXGraphicFromUrl(const OU return xGraphic; } -short SdPhotoAlbumDialog::Execute() -{ - return ModalDialog::Execute(); -} - void SdPhotoAlbumDialog::EnableDisableButtons() { pRemoveBtn->Enable(pImagesLst->GetSelectEntryCount() > 0); diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index 19f8e95868ac..122380c0140c 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -48,8 +48,6 @@ public: virtual ~SdPhotoAlbumDialog() override; virtual void dispose() override; - virtual short Execute() override; - private: static OUString sDirUrl; VclPtr pCancelBtn; diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index b40f032492c8..1bf21f267c91 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -699,11 +699,6 @@ bool AnimationWindow::Close() } } -void AnimationWindow::FillInfo( SfxChildWinInfo& rInfo ) const -{ - SfxDockingWindow::FillInfo( rInfo ) ; -} - void AnimationWindow::AddObj (::sd::View& rView ) { // finish text entry mode to ensure that bitmap is identical with object diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index 058851baea1c..de01f21bced5 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -179,11 +179,6 @@ FrameView* DrawDocShell::GetFrameView() return pFrameView; } -Size DrawDocShell::GetFirstPageSize() -{ - return SfxObjectShell::GetFirstPageSize(); -} - /** * Creates a bitmap of an arbitrary page */ diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 7b48cef8c76c..770355a79f9b 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -56,11 +56,6 @@ FuConstruct::FuConstruct ( { } -void FuConstruct::DoExecute( SfxRequest& rReq ) -{ - FuDraw::DoExecute( rReq ); -} - bool FuConstruct::MouseButtonDown(const MouseEvent& rMEvt) { bool bReturn = FuDraw::MouseButtonDown(rMEvt); diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index 007cb9614cc8..57491f6f994f 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -1140,11 +1140,6 @@ void FuSelection::Activate() FuDraw::Activate(); } -void FuSelection::Deactivate() -{ - FuDraw::Deactivate(); -} - void FuSelection::SelectionHasChanged() { bSelectionChanged = true; diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 4756b1f4cf10..fd7430ac18b0 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -38,8 +38,6 @@ public: OutputDevice* pOutDev); virtual ~ClientView() override; - virtual void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr) override; - /* if the view should not do a Invalidate() on the windows, you have to override the following two methods and do something different */ virtual void InvalidateOneWin(vcl::Window& rWin) override; diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index fef687086961..64cf882c0fdd 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -98,7 +98,6 @@ public: virtual Printer* GetDocumentPrinter() override; virtual void OnDocumentPrinterChanged(Printer* pNewPrinter) override; virtual SfxStyleSheetBasePool* GetStyleSheetPool() override; - virtual Size GetFirstPageSize() override; virtual void FillClass(SvGlobalName* pClassName, SotClipboardFormatId* pFormat, OUString* pAppName, OUString* pFullTypeName, OUString* pShortTypeName, sal_Int32 nFileFormat, bool bTemplate = false ) const override; virtual void SetModified( bool = true ) override; virtual VclPtr CreateDocumentInfoDialog( const SfxItemSet &rSet ) override; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 784c211588ff..2d5f6b9b173a 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -128,8 +128,6 @@ public: void InsertURLButton(const OUString& rURL, const OUString& rText, const OUString& rTarget, const Point* pPos); - virtual void SetUIUnit(FieldUnit eUnit) override; - void SelectionHasChanged(); void ModelHasChanged(); virtual void Activate(bool bIsMDIActivate) override; diff --git a/sd/source/ui/inc/Ruler.hxx b/sd/source/ui/inc/Ruler.hxx index a83eeb9618e6..65bbc660b455 100644 --- a/sd/source/ui/inc/Ruler.hxx +++ b/sd/source/ui/inc/Ruler.hxx @@ -55,7 +55,6 @@ protected: bool bHorz; virtual void MouseButtonDown(const MouseEvent& rMEvt) override; - virtual void MouseButtonUp(const MouseEvent& rMEvt) override; virtual void Command(const CommandEvent& rCEvt) override; virtual void ExtraDown() override; }; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 015548d44c92..126432fc3d48 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -88,7 +88,6 @@ public: virtual void GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); virtual void MarkListHasChanged() override; - virtual void ModelHasChanged() override; void SelectAll(); void DoCut(vcl::Window* pWindow=nullptr); void DoCopy(vcl::Window* pWindow=nullptr); @@ -178,12 +177,6 @@ public: virtual void onAccessibilityOptionsChanged() override; - virtual SdrModel* GetMarkedObjModel() const override; - virtual bool Paste( - const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions) override; - - using SdrExchangeView::Paste; - /** returns true if we have an undo manager and there is an open list undo action */ bool isRecordingUndo() const; diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index c74a2a19ac4f..039e5bfc83ae 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -95,7 +95,6 @@ public: protected: virtual bool Close() override; virtual void Resize() override; - virtual void FillInfo( SfxChildWinInfo& ) const override; private: VclPtr m_pCtlDisplay; diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index 6543b1c017fe..06d7f1760b00 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -50,7 +50,6 @@ public: void BlockPageOrderChangedHint(bool bBlock); bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false) override; - virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const override; virtual void MakeVisible(const Rectangle& rRect, vcl::Window& rWin) override; virtual void HideSdrPage() override; // SdrPageView* pPV); diff --git a/sd/source/ui/inc/fuconstr.hxx b/sd/source/ui/inc/fuconstr.hxx index 5e30eb1e3f9f..6fe721937465 100644 --- a/sd/source/ui/inc/fuconstr.hxx +++ b/sd/source/ui/inc/fuconstr.hxx @@ -33,8 +33,6 @@ class FuConstruct { public: - virtual void DoExecute( SfxRequest& rReq ) override; - // Mouse- & Key-Events virtual bool KeyInput(const KeyEvent& rKEvt) override; virtual bool MouseMove(const MouseEvent& rMEvt) override; diff --git a/sd/source/ui/inc/fusel.hxx b/sd/source/ui/inc/fusel.hxx index 62d5e1b9a10f..3ad084b475e8 100644 --- a/sd/source/ui/inc/fusel.hxx +++ b/sd/source/ui/inc/fusel.hxx @@ -44,7 +44,6 @@ public: virtual bool MouseButtonDown(const MouseEvent& rMEvt) override; virtual void Activate() override; - virtual void Deactivate() override; virtual void SelectionHasChanged() override; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 11d2ae362039..6c52336aa896 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -280,12 +280,6 @@ void ShowWindow::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& } } -void ShowWindow::GetFocus() -{ - // base class - Window::GetFocus(); -} - void ShowWindow::LoseFocus() { Window::LoseFocus(); @@ -294,11 +288,6 @@ void ShowWindow::LoseFocus() TerminateShow(); } -void ShowWindow::Move() -{ - ::sd::Window::Move(); -} - void ShowWindow::SetEndMode() { if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() ) diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index 229332e6a3c6..247900892e35 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -68,8 +68,6 @@ public: void RestartShow( sal_Int32 nPageIndexToRestart ); - virtual void Move() override; - virtual void GetFocus() override; virtual void LoseFocus() override; virtual void KeyInput(const KeyEvent& rKEvt) override; diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 4a5bcc3330c9..87c5e8a62399 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -208,9 +208,6 @@ public: virtual void DragFinished (sal_Int8 nDropAction) override; -protected: - virtual void Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) override; - private: SlideSorter& mrSlideSorter; model::SlideSorterModel& mrModel; diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 786f5dd4b81f..f7cbdcf762c6 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -744,11 +744,6 @@ void SlideSorterView::DragFinished (sal_Int8 nDropAction) View::DragFinished(nDropAction); } -void SlideSorterView::Notify (SfxBroadcaster& rBroadcaster, const SfxHint& rHint) -{ - ::sd::View::Notify(rBroadcaster, rHint); -} - void SlideSorterView::UpdatePageUnderMouse () { VclPtr pVScrollBar (mrSlideSorter.GetVerticalScrollBar()); diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index fc2ec9e614aa..986481ad860c 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -64,11 +64,6 @@ void ClientView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) CompleteRedraw(&rWin, vcl::Region(rRect)); } -void ClientView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector ) -{ - DrawView::CompleteRedraw(pOutDev, rReg, pRedirector); -} - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 81a0e0f39e46..c170ee5e97df 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -499,16 +499,6 @@ void DrawView::PresPaint(const vcl::Region& rRegion) } } -/** - * Decides if an object could get marked (eg. unreleased animation objects - * in slide show). - */ - -bool DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const -{ - return FmFormView::IsObjMarkable(pObj, pPV); -} - /** * Make passed region visible (scrolling if necessary) */ diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx index 56897272a816..dfe0bdf3db0c 100644 --- a/sd/source/ui/view/drviews1.cxx +++ b/sd/source/ui/view/drviews1.cxx @@ -600,15 +600,6 @@ void DrawViewShell::UpdateVRuler() mpVerticalRuler->ForceUpdate(); } -/** - * Set metric - */ - -void DrawViewShell::SetUIUnit(FieldUnit eUnit) -{ - ViewShell::SetUIUnit(eUnit); -} - /** * Refresh TabControl on splitter change */ diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 7769f9211d97..39d2c5b385d7 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -119,11 +119,6 @@ void Ruler::MouseButtonDown(const MouseEvent& rMEvt) SvxRuler::MouseButtonDown(rMEvt); } -void Ruler::MouseButtonUp(const MouseEvent& rMEvt) -{ - SvxRuler::MouseButtonUp(rMEvt); -} - void Ruler::SetNullOffset(const Point& rOffset) { long nOffset; diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index b98f8009db0d..1170a17a8899 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -608,12 +608,6 @@ void View::SelectAll() } } -void View::ModelHasChanged() -{ - // First, notify SdrView - FmFormView::ModelHasChanged(); -} - bool View::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr) { // forward to SdrView diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index b5670998f0b4..574e456a12ef 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -933,17 +933,6 @@ void ImplProcessObjectList(SdrObject* pObj, SdrObjectVector& rVector ) } } -SdrModel* View::GetMarkedObjModel() const -{ - return FmFormView::GetMarkedObjModel(); -} - -bool View::Paste( - const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, SdrInsertFlags nOptions) -{ - return FmFormView::Paste(rMod, rPos, pLst, nOptions); -} - } // end of namespace sd /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit