diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 16:04:04 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-10-12 17:52:29 +0200 |
commit | b36963c0a6a09f70ca6d8d607dd3249a3496497d (patch) | |
tree | 33e06dc8d227957cb31355277fb5cf20b9918628 /include/vcl/dockwin.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/vcl/dockwin.hxx')
-rw-r--r-- | include/vcl/dockwin.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index b9b51e977082..cf44a66b1a36 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -294,7 +294,7 @@ public: DockingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>()); virtual ~DockingWindow(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; virtual void StartDocking(); virtual bool Docking( const Point& rPos, Rectangle& rRect ); @@ -304,10 +304,10 @@ public: virtual void Resizing( Size& rSize ); virtual bool Close(); - virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nType ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; void RollDown(); bool IsRollUp() const; @@ -334,19 +334,19 @@ public: virtual void setPosSizePixel( long nX, long nY, long nWidth, long nHeight, - PosSizeFlags nFlags = PosSizeFlags::All ) SAL_OVERRIDE; + PosSizeFlags nFlags = PosSizeFlags::All ) override; void SetPosSizePixel( const Point& rNewPos, - const Size& rNewSize ) SAL_OVERRIDE + const Size& rNewSize ) override { Window::SetPosSizePixel( rNewPos, rNewSize ); } - Point GetPosPixel() const SAL_OVERRIDE; - Size GetSizePixel() const SAL_OVERRIDE; - void SetOutputSizePixel( const Size& rNewSize ) SAL_OVERRIDE; + Point GetPosPixel() const override; + Size GetSizePixel() const override; + void SetOutputSizePixel( const Size& rNewSize ) override; Size GetOutputSizePixel() const; - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual OUString GetText() const SAL_OVERRIDE; - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; + virtual OUString GetText() const override; + virtual Size GetOptimalSize() const override; + virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) override; }; |