From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- sd/source/ui/annotations/annotationmanagerimpl.hxx | 6 ++-- sd/source/ui/annotations/annotationtag.cxx | 14 ++++---- sd/source/ui/annotations/annotationtag.hxx | 28 ++++++++-------- sd/source/ui/annotations/annotationwindow.hxx | 38 +++++++++++----------- 4 files changed, 43 insertions(+), 43 deletions(-) (limited to 'sd/source/ui/annotations') diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 0563db46726f..d2c1d7530f55 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -55,11 +55,11 @@ public: void init(); // WeakComponentImplHelper - virtual void SAL_CALL disposing () SAL_OVERRIDE; + virtual void SAL_CALL disposing () override; // XEventListener - virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) override; void ExecuteAnnotation (SfxRequest& rRequest); void GetAnnotationState (SfxItemSet& rItemSet); diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 4d1e78860867..bcd3ad88b457 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -94,10 +94,10 @@ class AnnotationDragMove : public SdrDragMove { public: AnnotationDragMove(SdrDragView& rNewView, const rtl::Reference & xTag); - virtual bool BeginSdrDrag() SAL_OVERRIDE; - virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; - virtual void MoveSdrDrag(const Point& rNoSnapPnt) SAL_OVERRIDE; - virtual void CancelSdrDrag() SAL_OVERRIDE; + virtual bool BeginSdrDrag() override; + virtual bool EndSdrDrag(bool bCopy) override; + virtual void MoveSdrDrag(const Point& rNoSnapPnt) override; + virtual void CancelSdrDrag() override; private: rtl::Reference mxTag; @@ -156,9 +156,9 @@ class AnnotationHdl : public SmartHdl public: AnnotationHdl( const SmartTagReference& xTag, const Reference< XAnnotation >& xAnnotation, const Point& rPnt ); virtual ~AnnotationHdl(); - virtual void CreateB2dIAObject() SAL_OVERRIDE; - virtual bool IsFocusHdl() const SAL_OVERRIDE; - virtual bool isMarkable() const SAL_OVERRIDE; + virtual void CreateB2dIAObject() override; + virtual bool IsFocusHdl() const override; + virtual bool isMarkable() const override; private: Reference< XAnnotation > mxAnnotation; diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx index 024555b7b6c1..f627c1f5bdeb 100644 --- a/sd/source/ui/annotations/annotationtag.hxx +++ b/sd/source/ui/annotations/annotationtag.hxx @@ -38,23 +38,23 @@ public: virtual ~AnnotationTag(); /// @return true if the SmartTag handled the event. - virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent&, SmartHdl& ) override; /// @return true if the SmartTag consumes this event. - virtual bool KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual bool KeyInput( const KeyEvent& rKEvt ) override; /// @return true if the SmartTag consumes this event. - virtual bool RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual bool RequestHelp( const HelpEvent& rHEvt ) override; /// @return true if the SmartTag consumes this event. - virtual bool Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual bool Command( const CommandEvent& rCEvt ) override; // callbacks from sdr view - virtual sal_uLong GetMarkablePointCount() const SAL_OVERRIDE; - virtual sal_uLong GetMarkedPointCount() const SAL_OVERRIDE; - virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) SAL_OVERRIDE; - virtual void CheckPossibilities() SAL_OVERRIDE; - virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark) SAL_OVERRIDE; + virtual sal_uLong GetMarkablePointCount() const override; + virtual sal_uLong GetMarkedPointCount() const override; + virtual bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false) override; + virtual void CheckPossibilities() override; + virtual bool MarkPoints(const Rectangle* pRect, bool bUnmark) override; void Move( int nDX, int nDY ); bool OnMove( const KeyEvent& rKEvt ); @@ -67,11 +67,11 @@ public: void ClosePopup(); protected: - virtual void addCustomHandles( SdrHdlList& rHandlerList ) SAL_OVERRIDE; - virtual bool getContext( SdrViewContext& rContext ) SAL_OVERRIDE; - virtual void disposing() SAL_OVERRIDE; - virtual void select() SAL_OVERRIDE; - virtual void deselect() SAL_OVERRIDE; + virtual void addCustomHandles( SdrHdlList& rHandlerList ) override; + virtual bool getContext( SdrViewContext& rContext ) override; + virtual void disposing() override; + virtual void select() override; + virtual void deselect() override; DECL_LINK_TYPED( WindowEventHandler, VclWindowEvent&, void ); DECL_LINK_TYPED( ClosePopupHdl, void*, void ); diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 8e6eae1144e3..0dc405c348c7 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -53,25 +53,25 @@ private: VclPtr mpAnnotationWindow; protected: - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) override; + virtual void KeyInput( const KeyEvent& rKeyEvt ) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void LoseFocus() override; public: AnnotationTextWindow( AnnotationWindow* pParent, WinBits nBits ); virtual ~AnnotationTextWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; } - virtual OUString GetSurroundingText() const SAL_OVERRIDE; - virtual Selection GetSurroundingTextSelection() const SAL_OVERRIDE; + virtual OUString GetSurroundingText() const override; + virtual Selection GetSurroundingTextSelection() const override; - virtual void GetFocus() SAL_OVERRIDE; + virtual void GetFocus() override; }; class AnnotationWindow : public FloatingWindow @@ -95,14 +95,14 @@ class AnnotationWindow : public FloatingWindow basegfx::B2DPolygon maPopupTriangle; protected: - void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; + void SetSizePixel( const Size& rNewSize ) override; DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); public: AnnotationWindow( AnnotationManagerImpl& rManager, DrawDocShell* pDocShell, vcl::Window* pParent ); virtual ~AnnotationWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void StartEdit(); @@ -135,12 +135,12 @@ class AnnotationWindow : public FloatingWindow void ToggleInsMode(); - virtual void Deactivate() SAL_OVERRIDE; - virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) SAL_OVERRIDE; - virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; + virtual void Deactivate() override; + virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) override; + virtual void MouseMove( const MouseEvent& rMEvt ) override; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) override; + virtual void Command( const CommandEvent& rCEvt ) override; + virtual void GetFocus() override; void SetColor(); -- cgit