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/svx/rubydialog.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svx/rubydialog.hxx')
-rw-r--r-- | include/svx/rubydialog.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 61992decfb69..cb1485c8101c 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -43,18 +43,18 @@ class SvxRubyDialog; class RubyPreview : public vcl::Window { protected: - virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; + virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) override; VclPtr<SvxRubyDialog> m_pParentDlg; public: RubyPreview(vcl::Window *pParent); virtual ~RubyPreview(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void setRubyDialog(SvxRubyDialog* pParentDlg) { m_pParentDlg = pParentDlg; } - virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; }; class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow @@ -71,8 +71,8 @@ class RubyEdit : public Edit { Link<sal_Int32,bool> aScrollHdl; Link<sal_Int32,void> aJumpHdl; - virtual void GetFocus() SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void GetFocus() override; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; public: RubyEdit(vcl::Window* pParent, const ResId& rResId) : Edit(pParent, rResId) @@ -145,7 +145,7 @@ class SvxRubyDialog : public SfxModelessDialog void AssertOneEntry(); void Update(); - virtual bool Close() SAL_OVERRIDE; + virtual bool Close() override; long GetLastPos() const {return nLastPos;} void SetLastPos(long nSet) {nLastPos = nSet;} @@ -159,16 +159,16 @@ class SvxRubyDialog : public SfxModelessDialog void UpdateColors(); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; public: SvxRubyDialog(SfxBindings *pBindings, SfxChildWindow *pCW, vcl::Window* pParent); virtual ~SvxRubyDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; - virtual void Activate() SAL_OVERRIDE; - virtual void Deactivate() SAL_OVERRIDE; + virtual void Activate() override; + virtual void Deactivate() override; }; #endif // INCLUDED_SVX_RUBYDIALOG_HXX |