From b44cbb26efe1d0b0950b1e1613e131b506dc3876 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 20 Jan 2015 12:38:10 +0200 Subject: new loplugin: change virtual methods to non-virtual Where we can prove that the virtual method is never overriden. In the case of pure-virtual methods, we remove the method entirely. Sometimes this leads to entire methods and fields being eliminated. Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae --- sd/source/filter/eppt/epptooxml.hxx | 2 +- sd/source/ui/animations/motionpathtag.cxx | 22 -------------------- sd/source/ui/annotations/annotationtag.cxx | 19 ----------------- sd/source/ui/annotations/annotationwindow.hxx | 2 +- sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 4 ++-- sd/source/ui/inc/AccessibleOutlineView.hxx | 2 +- sd/source/ui/inc/AccessibleSlideSorterView.hxx | 2 +- sd/source/ui/inc/DrawController.hxx | 2 +- sd/source/ui/inc/DrawDocShell.hxx | 8 ++++---- sd/source/ui/inc/DrawViewShell.hxx | 14 ++++++------- sd/source/ui/inc/FrameView.hxx | 4 ++-- sd/source/ui/inc/OutlineView.hxx | 4 ++-- sd/source/ui/inc/OutlineViewShell.hxx | 8 ++++---- sd/source/ui/inc/SdUnoOutlineView.hxx | 2 +- sd/source/ui/inc/SlideSorter.hxx | 8 ++++---- sd/source/ui/inc/SlideSorterViewShell.hxx | 24 +++++++++++----------- sd/source/ui/inc/SpellDialogChildWindow.hxx | 2 +- sd/source/ui/inc/TextObjectBar.hxx | 2 +- sd/source/ui/inc/View.hxx | 10 ++++----- sd/source/ui/inc/ViewClipboard.hxx | 4 ++-- sd/source/ui/inc/ViewShell.hxx | 20 +++++++++--------- sd/source/ui/inc/ViewShellBase.hxx | 4 ++-- sd/source/ui/inc/Window.hxx | 4 ++-- sd/source/ui/inc/dlgctrls.hxx | 2 +- sd/source/ui/inc/fupoor.hxx | 2 +- sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 6 +++--- sd/source/ui/inc/tpaction.hxx | 2 +- sd/source/ui/inc/unomodel.hxx | 4 ++-- sd/source/ui/sidebar/AllMasterPagesSelector.hxx | 2 +- sd/source/ui/sidebar/LayoutMenu.hxx | 2 +- sd/source/ui/sidebar/MasterPagesSelector.hxx | 16 +++++++-------- sd/source/ui/sidebar/PanelBase.hxx | 2 +- sd/source/ui/slideshow/slideshowimpl.hxx | 14 ++++++------- sd/source/ui/slideshow/slideshowviewimpl.hxx | 2 +- sd/source/ui/slidesorter/controller/SlsCommand.hxx | 2 +- .../controller/SlsSelectionFunction.cxx | 4 ++-- .../inc/controller/SlideSorterController.hxx | 4 ++-- .../inc/controller/SlsTransferableData.hxx | 2 +- .../ui/slidesorter/inc/view/SlideSorterView.hxx | 2 +- sd/source/ui/unoidl/unoobj.hxx | 2 +- 40 files changed, 101 insertions(+), 142 deletions(-) (limited to 'sd/source') diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx index 28d9d3f8f9c7..fae879dbcbc7 100644 --- a/sd/source/filter/eppt/epptooxml.hxx +++ b/sd/source/filter/eppt/epptooxml.hxx @@ -74,7 +74,7 @@ public: virtual bool exportDocument() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // only needed for import, leave them empty, refactor later XmlFilterBase to export and import base? - virtual sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const { return 0; } + sal_Int32 getSchemeClr( sal_Int32 /* nColorSchemeToken */ ) const { return 0; } virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE { return NULL; } virtual const oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE { return NULL; } virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE { return oox::drawingml::table::TableStyleListPtr(); } diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 1b7014c43593..bd918c151acf 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -248,7 +248,6 @@ public: virtual ~SdPathHdl(); virtual void CreateB2dIAObject() SAL_OVERRIDE; virtual bool IsFocusHdl() const SAL_OVERRIDE; - virtual Pointer GetSdrDragPointer() const; virtual bool isMarkable() const SAL_OVERRIDE; private: @@ -315,27 +314,6 @@ bool SdPathHdl::isMarkable() const return false; } -Pointer SdPathHdl::GetSdrDragPointer() const -{ - PointerStyle eStyle = POINTER_NOTALLOWED; - if( mxTag.is() ) - { - if( mxTag->isSelected() ) - { - if( !mxTag->getView().IsFrameDragSingles() && mxTag->getView().IsInsObjPointMode() ) - eStyle = POINTER_CROSS; - else - eStyle = POINTER_MOVE; - } - else - { - eStyle = POINTER_ARROW; - - } - } - return Pointer( eStyle ); -} - MotionPathTag::MotionPathTag( CustomAnimationPane& rPane, ::sd::View& rView, const CustomAnimationEffectPtr& pEffect ) : SmartTag( rView ) , mrPane( rPane ) diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 36aefb829c6a..09480da57de6 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -158,7 +158,6 @@ public: virtual ~AnnotationHdl(); virtual void CreateB2dIAObject() SAL_OVERRIDE; virtual bool IsFocusHdl() const SAL_OVERRIDE; - virtual Pointer GetSdrDragPointer() const; virtual bool isMarkable() const SAL_OVERRIDE; private: @@ -249,24 +248,6 @@ bool AnnotationHdl::isMarkable() const return false; } -Pointer AnnotationHdl::GetSdrDragPointer() const -{ - PointerStyle eStyle = POINTER_NOTALLOWED; - if( mxTag.is() ) - { - if( mxTag->isSelected() ) - { - eStyle = POINTER_MOVE; - } - else - { - eStyle = POINTER_ARROW; - - } - } - return Pointer( eStyle ); -} - AnnotationTag::AnnotationTag( AnnotationManagerImpl& rManager, ::sd::View& rView, const Reference< XAnnotation >& xAnnotation, Color& rColor, int nIndex, const vcl::Font& rFont ) : SmartTag( rView ) , mrManager( rManager ) diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index b44525c493b2..c0e289d1ecfa 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -105,7 +105,7 @@ class AnnotationWindow : public FloatingWindow void StartEdit(); - virtual SvxLanguageItem GetLanguage(void); + SvxLanguageItem GetLanguage(void); void setAnnotation( const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& xAnnotation, bool bGrabFocus = false ); const ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation >& getAnnotation() const { return mxAnnotation; } diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index ef4c08b2c11b..16241381f83f 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -360,7 +360,7 @@ protected: If this is an empty reference then the currently active accessible OLE object (if there is one) is removed. */ - virtual void SetAccessibleOLEObject ( + void SetAccessibleOLEObject ( const ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible>& xOLEObject); //===== XAccessibleGetAccFromXShape ============================================ @@ -369,7 +369,7 @@ protected: throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: - virtual void SwitchViewActivated (void) { Activated(); } + void SwitchViewActivated (void) { Activated(); } virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index f18101e1bc73..196b4b87a6cc 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -109,7 +109,7 @@ public: protected: // overridden, as we hold the listeners ourselves - virtual void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); + void FireEvent (const ::com::sun::star::accessibility::AccessibleEventObject& aEvent); // overridden to detect focus changes virtual void Activated (void) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 5d20cd2b0d50..99affbe53d99 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -285,7 +285,7 @@ public: getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SwitchViewActivated (void); + void SwitchViewActivated (void); private: class Implementation; ::std::unique_ptr mpImpl; diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 5f1a5dc1bb70..68a20852d081 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -239,7 +239,7 @@ protected: */ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual void FillPropertyTable ( + void FillPropertyTable ( ::std::vector< ::com::sun::star::beans::Property>& rProperties); /** diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx index 47f6d16be761..7f7cfee5aa4f 100644 --- a/sd/source/ui/inc/DrawDocShell.hxx +++ b/sd/source/ui/inc/DrawDocShell.hxx @@ -227,10 +227,10 @@ protected: void Construct(bool bClipboard); virtual void InPlaceActivate( bool bActive ) SAL_OVERRIDE; public: - virtual void setDocAccTitle( const OUString& rTitle ); - virtual const OUString getDocAccTitle() const; - virtual void setDocReadOnly( bool bReadOnly); - virtual bool getDocReadOnly() const; + void setDocAccTitle( const OUString& rTitle ); + const OUString getDocAccTitle() const; + void setDocReadOnly( bool bReadOnly); + bool getDocReadOnly() const; private: void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage); }; diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 8a92f42828ce..56dbc5f4b76f 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -140,8 +140,8 @@ public: void ShowMousePosInfo(const Rectangle& rRect, ::sd::Window* pWin); - virtual void AddWindow(::sd::Window* pWin); - virtual void RemoveWindow(::sd::Window* pWin); + void AddWindow(::sd::Window* pWin); + void RemoveWindow(::sd::Window* pWin); virtual void ChangeEditMode (EditMode eMode, bool bIsLayerModeActive); @@ -161,8 +161,8 @@ public: virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; virtual void UIActivating( SfxInPlaceClient* ) SAL_OVERRIDE; virtual void UIDeactivated( SfxInPlaceClient* ) SAL_OVERRIDE; - virtual OUString GetSelectionText( bool bCompleteWords = false ); - virtual bool HasSelection( bool bText = true ) const; + OUString GetSelectionText( bool bCompleteWords = false ); + bool HasSelection( bool bText = true ) const; //If we are editing an PRESOBJ_OUTLINE return the Outliner and fill rSel //with the current selection @@ -325,7 +325,7 @@ public: returned value is independent of whether the layer modus is currently active and the tab control is visible. */ - virtual int GetTabLayerCount (void) const; + int GetTabLayerCount (void) const; /** Return the numerical id of the currently active layer as seen by the layer tab control. @@ -334,7 +334,7 @@ public: number of layers as returned by the GetTabLayerCount method (exclusive). */ - virtual int GetActiveTabLayerIndex (void) const; + int GetActiveTabLayerIndex (void) const; /** Set the active layer at the layer tab control and update the control accordingly to reflect the change on screen. @@ -344,7 +344,7 @@ public: GetTabLayerCount method (exclusive). Note that Invalid values are ignored. No excpetion is thrown in that case. */ - virtual void SetActiveTabLayerIndex (int nId); + void SetActiveTabLayerIndex (int nId); /** Return a pointer to the tab control for pages. */ diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx index b0a1c02d9de2..d24b0d80581e 100644 --- a/sd/source/ui/inc/FrameView.hxx +++ b/sd/source/ui/inc/FrameView.hxx @@ -166,8 +166,8 @@ public: void SetIsNavigatorShowingAllShapes (const bool bIsNavigatorShowingAllShapes); bool IsNavigatorShowingAllShapes (void) const { return mbIsNavigatorShowingAllShapes;} - virtual void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); - virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); + void WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); + void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); private: sal_uInt16 mnRefCount; diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 91b678fdcd2a..9d67d5c9c39c 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -92,8 +92,8 @@ public: /** selects the paragraph for the given page at the outliner view*/ void SetActualPage( SdPage* pActual ); - virtual void Paint (const Rectangle& rRect, ::sd::Window* pWin); - virtual void AdjustPosSizePixel( + void Paint (const Rectangle& rRect, ::sd::Window* pWin); + void AdjustPosSizePixel( const Point &rPos, const Size &rSize, ::sd::Window* pWindow); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 1a737b5c65e0..951c40f93c4f 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -77,8 +77,8 @@ public: virtual long VirtHScrollHdl(ScrollBar* pHScroll) SAL_OVERRIDE; virtual long VirtVScrollHdl(ScrollBar* pVHScroll) SAL_OVERRIDE; - virtual void AddWindow(::sd::Window* pWin); - virtual void RemoveWindow(::sd::Window* pWin); + void AddWindow(::sd::Window* pWin); + void RemoveWindow(::sd::Window* pWin); virtual void Activate( bool IsMDIActivate ) SAL_OVERRIDE; virtual void Deactivate( bool IsMDIActivate ) SAL_OVERRIDE; @@ -105,8 +105,8 @@ public: virtual void SetZoom(long nZoom) SAL_OVERRIDE; virtual void SetZoomRect(const Rectangle& rZoomRect) SAL_OVERRIDE; - virtual OUString GetSelectionText( bool bCompleteWords = false ); - virtual bool HasSelection( bool bText = true ) const; + OUString GetSelectionText( bool bCompleteWords = false ); + bool HasSelection( bool bText = true ) const; void Execute(SfxRequest& rReq); diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx index d72fb3e10652..25750a4c9cde 100644 --- a/sd/source/ui/inc/SdUnoOutlineView.hxx +++ b/sd/source/ui/inc/SdUnoOutlineView.hxx @@ -86,7 +86,7 @@ public: css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener - virtual void SAL_CALL + void SAL_CALL disposing (const ::com::sun::star::lang::EventObject& rEventObject) throw (::com::sun::star::uno::RuntimeException); diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 1af5619f968d..a9167b148763 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -194,25 +194,25 @@ protected: calls the CreateModel(), CreateView(), and CreateController() methods in this order. */ - virtual void CreateModelViewController (void); + void CreateModelViewController (void); /** Create the model for the view shell. When called from the default implementation of CreateModelViewController() then neither view nor controller do exist. Test their pointers when in doubt. */ - virtual model::SlideSorterModel* CreateModel (void); + model::SlideSorterModel* CreateModel (void); /** Create the view for the view shell. When called from the default implementation of CreateModelViewController() then the model but not the controller does exist. Test their pointers when in doubt. */ - virtual view::SlideSorterView* CreateView (void); + view::SlideSorterView* CreateView (void); /** Create the controller for the view shell. When called from the default implementation of CreateModelViewController() then both the view and the controller do exist. Test their pointers when in doubt. */ - virtual controller::SlideSorterController* CreateController (void); + controller::SlideSorterController* CreateController (void); private: bool mbIsValid; diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx index 4f6e7abd5054..ec1ab1aac49a 100644 --- a/sd/source/ui/inc/SlideSorterViewShell.hxx +++ b/sd/source/ui/inc/SlideSorterViewShell.hxx @@ -72,24 +72,24 @@ public: */ static SlideSorterViewShell* GetSlideSorter (ViewShellBase& rBase); - virtual void GetFocus (void); - virtual void LoseFocus (void); + void GetFocus (void); + void LoseFocus (void); virtual SdPage* GetActualPage (void) SAL_OVERRIDE; /// inherited from sd::ViewShell virtual SdPage* getCurrentPage() const SAL_OVERRIDE; void ExecCtrl (SfxRequest& rRequest); - virtual void GetCtrlState (SfxItemSet &rSet); - virtual void FuSupport (SfxRequest& rRequest); - virtual void FuTemporary (SfxRequest& rRequest); - virtual void GetStatusBarState (SfxItemSet& rSet); - virtual void FuPermanent (SfxRequest& rRequest); + void GetCtrlState (SfxItemSet &rSet); + void FuSupport (SfxRequest& rRequest); + void FuTemporary (SfxRequest& rRequest); + void GetStatusBarState (SfxItemSet& rSet); + void FuPermanent (SfxRequest& rRequest); void GetAttrState (SfxItemSet& rSet); void ExecStatusBar (SfxRequest& rRequest); virtual void Command (const CommandEvent& rEvent, ::sd::Window* pWindow) SAL_OVERRIDE; - virtual void GetMenuState (SfxItemSet &rSet); - virtual void GetClipboardState (SfxItemSet &rSet); + void GetMenuState (SfxItemSet &rSet); + void GetClipboardState (SfxItemSet &rSet); virtual void ReadFrameViewData (FrameView* pView) SAL_OVERRIDE; virtual void WriteFrameViewData (void) SAL_OVERRIDE; @@ -119,10 +119,10 @@ public: //===== Drag and Drop ===================================================== - virtual void StartDrag ( + void StartDrag ( const Point& rDragPt, ::vcl::Window* pWindow ); - virtual void DragFinished ( + void DragFinished ( sal_Int8 nDropAction); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, @@ -186,7 +186,7 @@ public: protected: - virtual SvBorder GetBorder (bool bOuterResize); + SvBorder GetBorder (bool bOuterResize); /** Override this method to handle a missing tool bar correctly. This is the case when the slide sorter is not the main view shell. diff --git a/sd/source/ui/inc/SpellDialogChildWindow.hxx b/sd/source/ui/inc/SpellDialogChildWindow.hxx index 313a2560b880..73e3ba0c07a2 100644 --- a/sd/source/ui/inc/SpellDialogChildWindow.hxx +++ b/sd/source/ui/inc/SpellDialogChildWindow.hxx @@ -44,7 +44,7 @@ public: /** This method makes the one from the base class public so that it can be called from the view shell when one is created. */ - virtual void InvalidateSpellDialog (void); + void InvalidateSpellDialog (void); SFX_DECL_CHILDWINDOW_WITHID(SpellDialogChildWindow); diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index 17388f18c3b6..8e2c9e527ff0 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -53,7 +53,7 @@ public: void GetCharState( SfxItemSet& rSet ); void Execute( SfxRequest &rReq ); - virtual void Command( const CommandEvent& rCEvt ); + void Command( const CommandEvent& rCEvt ); private: ViewShell* mpViewShell; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index e9630c7a2b21..9f8455622d12 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -98,13 +98,13 @@ public: virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); virtual void MarkListHasChanged() SAL_OVERRIDE; virtual void ModelHasChanged() SAL_OVERRIDE; - virtual void SelectAll(); - virtual void DoCut(vcl::Window* pWindow=NULL); - virtual void DoCopy(vcl::Window* pWindow=NULL); - virtual void DoPaste(vcl::Window* pWindow=NULL); + void SelectAll(); + void DoCut(vcl::Window* pWindow=NULL); + void DoCopy(vcl::Window* pWindow=NULL); + void DoPaste(vcl::Window* pWindow=NULL); virtual void DoConnect(SdrOle2Obj* pOleObj) SAL_OVERRIDE; virtual bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr = false); - virtual void StartDrag( const Point& rStartPos, vcl::Window* pWindow ); + void StartDrag( const Point& rStartPos, vcl::Window* pWindow ); virtual void DragFinished( sal_Int8 nDropAction ); virtual sal_Int8 AcceptDrop ( const AcceptDropEvent& rEvt, diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx index c61cbef0a637..86f3bbaaf7f6 100644 --- a/sd/source/ui/inc/ViewClipboard.hxx +++ b/sd/source/ui/inc/ViewClipboard.hxx @@ -40,7 +40,7 @@ public: /** Handle the drop of a drag-and-drop action where the transferable contains a set of pages. */ - virtual void HandlePageDrop (const SdTransferable& rTransferable); + void HandlePageDrop (const SdTransferable& rTransferable); protected: ::sd::View& mrView; @@ -54,7 +54,7 @@ protected: /** Assign the (first) master page of the given transferable to the (...) slide. */ - virtual void AssignMasterPage ( + void AssignMasterPage ( const SdTransferable& rTransferable, SdPage* pMasterPage); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 352b6f9b72e9..589fb3594d04 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -138,7 +138,7 @@ public: view shell is still a valid object and can safely call methods that rely on that. */ - virtual void Exit (void); + void Exit (void); void Cancel(); @@ -183,15 +183,15 @@ public: virtual void MouseButtonUp(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void MouseButtonDown(const MouseEvent& rMEvt, ::sd::Window* pWin); virtual void Command(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); - virtual bool Notify( NotifyEvent& rNEvt, ::sd::Window* pWin ); + bool RequestHelp( const HelpEvent& rEvt, ::sd::Window* pWin ); + bool Notify( NotifyEvent& rNEvt, ::sd::Window* pWin ); - virtual bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); + bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual void Draw(OutputDevice &rDev, const ::vcl::Region &rReg); + void Draw(OutputDevice &rDev, const ::vcl::Region &rReg); virtual void SetUIUnit(FieldUnit eUnit); - virtual void SetDefTabHRuler( sal_uInt16 nDefTab ); + void SetDefTabHRuler( sal_uInt16 nDefTab ); const SfxPoolItem* GetNumBulletItem(SfxItemSet& aNewAttr, sal_uInt16& nNumItemId); @@ -231,8 +231,8 @@ public: void SetFrameView (FrameView* pFrameView); virtual void ReadFrameViewData(FrameView* pView); virtual void WriteFrameViewData(); - virtual void WriteUserData(OUString& rString); - virtual void ReadUserData(const OUString& rString); + void WriteUserData(OUString& rString); + void ReadUserData(const OUString& rString); virtual bool ActivateObject(SdrOle2Obj* pObj, long nVerb); @@ -301,7 +301,7 @@ public: CreateAccessibleDocumentView (::sd::Window* pWindow); virtual void SwitchViewFireFocus( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > xAcc ); - virtual void SwitchActiveViewFireFocus( ); + void SwitchActiveViewFireFocus( ); // Move these two methods from DrawViewShell to enable slide show view void NotifyAccUpdate(); void fireSwitchCurrentPage(sal_Int32 pageIndex); @@ -389,7 +389,7 @@ public: /** Return the type of the shell. */ - virtual ShellType GetShellType (void) const; + ShellType GetShellType (void) const; /** This method is more or less an alias to Deactivate(). It is called before an object of this class is taken from the stack of view diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index af33977a8e33..12bef3f1232a 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -84,7 +84,7 @@ public: /** This method is part of the object construction. It HAS to be called after the constructor has created a new object. */ - virtual void LateInit (const OUString& rsDefaultView); + void LateInit (const OUString& rsDefaultView); ::boost::shared_ptr GetViewShellManager (void) const; @@ -114,7 +114,7 @@ public: slots. This is the companion of Execute() and handles the slots concerned with showing the pane docking windows. */ - virtual void GetState (SfxItemSet& rSet); + void GetState (SfxItemSet& rSet); /* override these from SfxViewShell */ virtual OUString GetSelectionText(bool) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx index 0a33a937b44b..e88fa1df1c8a 100644 --- a/sd/source/ui/inc/Window.hxx +++ b/sd/source/ui/inc/Window.hxx @@ -134,7 +134,7 @@ public: double GetScrlLineHeight(); double GetScrlPageWidth(); double GetScrlPageHeight(); - virtual void GrabFocus(); + void GrabFocus(); virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // DropTargetHelper @@ -189,7 +189,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; - virtual void SwitchView(); + void SwitchView(); OUString GetSurroundingText() const SAL_OVERRIDE; Selection GetSurroundingTextSelection() const SAL_OVERRIDE; diff --git a/sd/source/ui/inc/dlgctrls.hxx b/sd/source/ui/inc/dlgctrls.hxx index 093b550431b7..d46bf2cc64a2 100644 --- a/sd/source/ui/inc/dlgctrls.hxx +++ b/sd/source/ui/inc/dlgctrls.hxx @@ -37,7 +37,7 @@ class SD_DLLPUBLIC FadeEffectLB : public ListBox public: FadeEffectLB(vcl::Window* pParent, WinBits nStyle); virtual ~FadeEffectLB(); - virtual void Fill(); + void Fill(); /* void selectEffectFromPage( SdPage* pPage ); */ void applySelected( SdPage* pSlide ) const; diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx index 50261d972616..5c66103fb8c3 100644 --- a/sd/source/ui/inc/fupoor.hxx +++ b/sd/source/ui/inc/fupoor.hxx @@ -75,7 +75,7 @@ public: virtual bool Command(const CommandEvent& rCEvt); virtual bool RequestHelp(const HelpEvent& rHEvt); - virtual void Paint(const Rectangle&, ::sd::Window* ); + void Paint(const Rectangle&, ::sd::Window* ); virtual void ReceiveRequest(SfxRequest& rReq); virtual void Activate(); ///< activates the function diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index 522deeb59f67..93f5de4563f6 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -70,9 +70,9 @@ public: FrameView* pFrameView); virtual ~ToolPanelViewShell (void); - virtual void GetFocus (void); - virtual void LoseFocus (void); - virtual void KeyInput (const KeyEvent& rEvent); + void GetFocus (void); + void LoseFocus (void); + void KeyInput (const KeyEvent& rEvent); using sd::ViewShell::KeyInput; virtual SdPage* GetActualPage (void) SAL_OVERRIDE; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index bb5d33b0e57a..1ca849a83e3f 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -85,7 +85,7 @@ private: DECL_LINK( CheckFileHdl, void * ); void UpdateTree(); - virtual void OpenFileDialog(); + void OpenFileDialog(); ::com::sun::star::presentation::ClickAction GetActualClickAction(); void SetActualClickAction( ::com::sun::star::presentation::ClickAction eCA ); void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE ); diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index c7bf63bb8394..f62d2f7368ed 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -135,8 +135,8 @@ public: static rtl::Reference< SdXImpressDocument > GetModel( SdDrawDocument* pDoc ); // intern - virtual bool operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } - virtual bool operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } + bool operator==( const SdXImpressDocument& rModel ) const { return mpDoc == rModel.mpDoc; } + bool operator!=( const SdXImpressDocument& rModel ) const { return mpDoc != rModel.mpDoc; } ::sd::DrawDocShell* GetDocShell() const { return mpDocShell; } SdDrawDocument* GetDoc() const { return mpDoc; } diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx index 346411809ba7..ba120ea63ec3 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.hxx @@ -47,7 +47,7 @@ public: */ virtual void Fill (ItemList& rItemList) SAL_OVERRIDE; - virtual void GetState (SfxItemSet& rItemSet); + void GetState (SfxItemSet& rItemSet); protected: virtual void NotifyContainerChangeEvent (const MasterPageContainerChangeEvent& rEvent) SAL_OVERRIDE; diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index 16d1ea3f4909..7eb77fc38f46 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -74,7 +74,7 @@ public: const css::uno::Reference& rxSidebar); virtual ~LayoutMenu (void); - virtual void Dispose (void); + void Dispose (void); /** Return a numerical value representing the currently selected layout. diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx index d61fdcac9ca3..adec3911ed8a 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.hxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx @@ -79,12 +79,12 @@ public: SdPage* pMasterPage, sal_uInt16 nInsertionIndex); - virtual Size GetPreferredSize (void); - virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight); - virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth); - virtual bool IsResizable (void); - virtual vcl::Window* GetWindow (void); - virtual sal_Int32 GetMinimumWidth (void); + Size GetPreferredSize (void); + sal_Int32 GetPreferredWidth (sal_Int32 nHeight); + sal_Int32 GetPreferredHeight (sal_Int32 nWidth); + bool IsResizable (void); + vcl::Window* GetWindow (void); + sal_Int32 GetMinimumWidth (void); /** Update the selection of previews according to whatever influences them apart from mouse and keyboard. If, for @@ -142,7 +142,7 @@ protected: */ ::std::queue maPreviewUpdateQueue; - virtual SdPage* GetSelectedMasterPage (void); + SdPage* GetSelectedMasterPage (void); /** Assign the given master page to all slides of the document. @param pMasterPage @@ -168,7 +168,7 @@ protected: UserData* GetUserData (int nIndex) const; void SetUserData (int nIndex, UserData* pData); - virtual sal_Int32 GetIndexForToken (MasterPageContainer::Token aToken) const; + sal_Int32 GetIndexForToken (MasterPageContainer::Token aToken) const; typedef ::std::vector ItemList; void UpdateItemList (::std::unique_ptr && pList); void Clear (void); diff --git a/sd/source/ui/sidebar/PanelBase.hxx b/sd/source/ui/sidebar/PanelBase.hxx index 797308f83187..77800f8aa59f 100644 --- a/sd/source/ui/sidebar/PanelBase.hxx +++ b/sd/source/ui/sidebar/PanelBase.hxx @@ -57,7 +57,7 @@ public: // ISidebarReceiver virtual void SetSidebar (const css::uno::Reference& rxSidebar) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleObject ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent); diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b8673460d9e1..35a931a8c206 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -176,15 +176,15 @@ public: virtual void SAL_CALL setUsePen( sal_Bool _usepen ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getPenColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPenColor( ::sal_Int32 _pencolor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setUseEraser( bool _usepen ) throw (css::uno::RuntimeException); + void SAL_CALL setUseEraser( bool _usepen ) throw (css::uno::RuntimeException); virtual double SAL_CALL getPenWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPenWidth( double dStrokeWidth ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setEraseInk( sal_Int32 nEraseInkSize ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setPenMode( bool bSwitchPenMode) throw (css::uno::RuntimeException); - virtual void SAL_CALL setEraserMode( bool bSwitchEraserMode ) throw (css::uno::RuntimeException); - virtual void SAL_CALL setPointerMode( bool bSwitchPointerMode) throw (css::uno::RuntimeException); - virtual void SAL_CALL setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException); + void SAL_CALL setEraseAllInk( bool bEraseAllInk ) throw (css::uno::RuntimeException); + void SAL_CALL setEraseInk( sal_Int32 nEraseInkSize ) throw (css::uno::RuntimeException); + void SAL_CALL setPenMode( bool bSwitchPenMode) throw (css::uno::RuntimeException); + void SAL_CALL setEraserMode( bool bSwitchEraserMode ) throw (css::uno::RuntimeException); + void SAL_CALL setPointerMode( bool bSwitchPointerMode) throw (css::uno::RuntimeException); + void SAL_CALL setPointerPosition( const ::com::sun::star::geometry::RealPoint2D& pos ) throw (css::uno::RuntimeException); virtual sal_Bool SAL_CALL isRunning( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getSlideCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getSlideByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index f17f477e34a4..01d3fe77403c 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -187,7 +187,7 @@ public: /// Disposing our broadcaster virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL paint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL paint( const ::com::sun::star::awt::PaintEvent& e ) throw (::com::sun::star::uno::RuntimeException); // XSlideShowView methods virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > SAL_CALL getCanvas( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sd/source/ui/slidesorter/controller/SlsCommand.hxx b/sd/source/ui/slidesorter/controller/SlsCommand.hxx index 29238441c0d3..7f6017e1a966 100644 --- a/sd/source/ui/slidesorter/controller/SlsCommand.hxx +++ b/sd/source/ui/slidesorter/controller/SlsCommand.hxx @@ -29,7 +29,7 @@ class Command { public: virtual ~Command (void) {}; - virtual void operator() (void) = 0; + ; }; } } } // end of namespace sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index e8577b918a57..cc2c96894b99 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -263,8 +263,8 @@ private: sal_Int32 mnAnchorIndex; sal_Int32 mnSecondIndex; - virtual void UpdateModelPosition (const Point& rMouseModelPosition); - virtual void UpdateSelection (void); + void UpdateModelPosition (const Point& rMouseModelPosition); + void UpdateSelection (void); /** Update the rectangle selection so that the given position becomes the new second point of the selection rectangle. diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 7e42b84363c1..eb7f2916747b 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -70,7 +70,7 @@ public: /** Late initialization. Call this method once a new new object has been created. */ - virtual void Init (void); + void Init (void); virtual ~SlideSorterController (void); @@ -170,7 +170,7 @@ public: /** This factory method creates a selection function. */ - virtual rtl::Reference CreateSelectionFunction (SfxRequest& rRequest); + rtl::Reference CreateSelectionFunction (SfxRequest& rRequest); /** When the current function of the view shell is the slide sorter selection function then return a reference to it. Otherwise return diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 0075d3b9071b..2d379006dcac 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -69,7 +69,7 @@ public: const ::std::vector& rRepresentatives); virtual ~TransferableData (void); - virtual void DragFinished (sal_Int8 nDropAction); + void DragFinished (sal_Int8 nDropAction); const ::std::vector& GetRepresentatives (void) const { return maRepresentatives;} diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 0816c1822f7f..e9ac85896ea0 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -126,7 +126,7 @@ public: void HandleDrawModeChange (void); - virtual void Resize (void); + void Resize (void); virtual void CompleteRedraw ( OutputDevice* pDevice, const ::vcl::Region& rPaintArea, diff --git a/sd/source/ui/unoidl/unoobj.hxx b/sd/source/ui/unoidl/unoobj.hxx index 93c65a6eb113..4ac5fac514cb 100644 --- a/sd/source/ui/unoidl/unoobj.hxx +++ b/sd/source/ui/unoidl/unoobj.hxx @@ -81,7 +81,7 @@ public: virtual void objectChanged( SdrObject* pNewObj ) SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; virtual void SAL_CALL release() throw() SAL_OVERRIDE; -- cgit