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/ctrl.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/vcl/ctrl.hxx')
| -rw-r--r-- | include/vcl/ctrl.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 7fe2411d6b21..3ede0ebb4271 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -97,7 +97,7 @@ protected: void ImplInitSettings( const bool _bFont, const bool _bForeground ); - virtual void ApplySettings(vcl::RenderContext& rRenderContext) SAL_OVERRIDE; + virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; public: SAL_DLLPRIVATE void ImplClearLayoutData() const; @@ -125,20 +125,20 @@ public: explicit Control( vcl::Window* pParent, WinBits nWinStyle = 0 ); explicit Control( vcl::Window* pParent, const ResId& ); virtual ~Control(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; + virtual void EnableRTL ( bool bEnable = true ) override; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; - virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() override; + virtual void LoseFocus() override; + virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual void StateChanged( StateChangedType nStateChange ) override; + virtual void Resize() override; // invalidates layout data - virtual void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void SetText( const OUString& rStr ) override; // gets the displayed text - virtual OUString GetDisplayText() const SAL_OVERRIDE; + virtual OUString GetDisplayText() const override; // returns the bounding box for the character at index nIndex (in control coordinates) Rectangle GetCharacterBounds( long nIndex ) const; // returns the character index for corresponding to rPoint (in control coordinates) @@ -171,7 +171,7 @@ public: void SetLayoutDataParent( const Control* pParent ) const; - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; /** sets a reference device used for rendering control text @see DrawControlText |