summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc/frmpage.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-10-12 16:04:04 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-10-12 17:52:29 +0200
commitb36963c0a6a09f70ca6d8d607dd3249a3496497d (patch)
tree33e06dc8d227957cb31355277fb5cf20b9918628 /sw/source/uibase/inc/frmpage.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/uibase/inc/frmpage.hxx')
-rw-r--r--sw/source/uibase/inc/frmpage.hxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index d83af39b4bae..b29b2b32ce3e 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -127,8 +127,8 @@ class SwFrmPage: public SfxTabPage
bool m_bIsMathOLE;
bool m_bIsMathBaselineAlignment;
- virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
- virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual void ActivatePage(const SfxItemSet& rSet) override;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) override;
DECL_LINK_TYPED(RangeModifyLoseFocusHdl, Control&, void);
DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void);
@@ -186,13 +186,13 @@ class SwFrmPage: public SfxTabPage
public:
SwFrmPage(vcl::Window *pParent, const SfxItemSet &rSet);
virtual ~SwFrmPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return aPageRg; }
- virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE;
- virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet *rSet) override;
+ virtual void Reset(const SfxItemSet *rSet) override;
void SetNewFrame(bool bNewFrame) { bNew = bNewFrame; }
void SetFormatUsed(bool bFormat);
@@ -226,9 +226,9 @@ class SwGrfExtPage: public SfxTabPage
DECL_LINK_TYPED(MirrorHdl, Button*, void);
DECL_LINK_TYPED(BrowseHdl, Button*, void);
- virtual void ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
+ virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual ~SwGrfExtPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
@@ -238,9 +238,9 @@ public:
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
- virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE;
- virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE;
- virtual sfxpg DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet *rSet) override;
+ virtual void Reset(const SfxItemSet *rSet) override;
+ virtual sfxpg DeactivatePage(SfxItemSet *pSet) override;
};
class SwFrmURLPage : public SfxTabPage
@@ -263,12 +263,12 @@ class SwFrmURLPage : public SfxTabPage
public:
SwFrmURLPage(vcl::Window *pParent, const SfxItemSet &rSet);
virtual ~SwFrmURLPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
- virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE;
- virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet *rSet) override;
+ virtual void Reset(const SfxItemSet *rSet) override;
};
class SwFrmAddPage : public SfxTabPage
@@ -312,13 +312,13 @@ class SwFrmAddPage : public SfxTabPage
public:
SwFrmAddPage(vcl::Window *pParent, const SfxItemSet &rSet);
virtual ~SwFrmAddPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return aAddPgRg; }
- virtual bool FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE;
- virtual void Reset(const SfxItemSet *rSet) SAL_OVERRIDE;
+ virtual bool FillItemSet(SfxItemSet *rSet) override;
+ virtual void Reset(const SfxItemSet *rSet) override;
void SetFormatUsed(bool bFormat);
void SetFrmType(const OUString &rType) { sDlgType = rType; }