diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sw/source/ui/envelp/swuilabimp.hxx | |
parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sw/source/ui/envelp/swuilabimp.hxx')
-rw-r--r-- | sw/source/ui/envelp/swuilabimp.hxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 57b5959e9af5..c4e7d794da6c 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -65,11 +65,11 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; void FillItem(SwLabItem& rItem); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; SwLabDlg* GetParentSwLabDlg() {return (SwLabDlg*) GetParentDialog();} @@ -117,10 +117,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; class SwPrivateDataPage : public SfxTabPage @@ -155,10 +155,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; class SwBusinessDataPage : public SfxTabPage @@ -191,10 +191,10 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rSet); - virtual void ActivatePage(const SfxItemSet& rSet); - virtual int DeactivatePage(SfxItemSet* pSet = 0); - virtual bool FillItemSet(SfxItemSet& rSet); - virtual void Reset(const SfxItemSet& rSet); + virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE; + virtual int DeactivatePage(SfxItemSet* pSet = 0) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rSet) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rSet) SAL_OVERRIDE; }; #endif |