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 /sc/source/ui/inc/tpsort.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sc/source/ui/inc/tpsort.hxx')
-rw-r--r-- | sc/source/ui/inc/tpsort.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 8ce953db4c86..3f54ce4b1587 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -50,21 +50,21 @@ public: ScTabPageSortFields( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortFields(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; - virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) SAL_OVERRIDE; - virtual void SetSizePixel(const Size& rAllocation) SAL_OVERRIDE; - virtual void SetPosPixel(const Point& rAllocPos) SAL_OVERRIDE; + virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) override; + virtual void SetSizePixel(const Size& rAllocation) override; + virtual void SetPosPixel(const Point& rAllocPos) override; protected: - virtual void ActivatePage ( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage ( const SfxItemSet& rSet ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) override; private: OUString aStrUndefined; @@ -109,20 +109,20 @@ public: ScTabPageSortOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTabPageSortOptions(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; #undef SfxTabPage #define SfxTabPage ::SfxTabPage static VclPtr<SfxTabPage> Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); - virtual bool FillItemSet ( SfxItemSet* rArgSet ) SAL_OVERRIDE; - virtual void Reset ( const SfxItemSet* rArgSet ) SAL_OVERRIDE; + virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; + virtual void Reset ( const SfxItemSet* rArgSet ) override; protected: - virtual void ActivatePage ( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void ActivatePage ( const SfxItemSet& rSet ) override; using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual sfxpg DeactivatePage ( SfxItemSet* pSet = 0) override; private: |