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 /sw/source/uibase/inc/column.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/uibase/inc/column.hxx')
-rw-r--r-- | sw/source/uibase/inc/column.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index ce9c606dce1a..28298d8d8c7e 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -67,7 +67,7 @@ class SwColumnDlg : public SfxModalDialog public: SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh); virtual ~SwColumnDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; }; class ColumnValueSet : public ValueSet @@ -81,8 +81,8 @@ public: : ValueSet(pParent, WB_TABSTOP | WB_ITEMBORDER | WB_DOUBLEBORDER) { } - virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void UserDraw( const UserDrawEvent& rUDEvt ) override; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; }; // column dialog now as TabPage @@ -160,8 +160,8 @@ class SwColumnPage : public SfxTabPage using SfxTabPage::ActivatePage; using SfxTabPage::DeactivatePage; - 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; void connectPercentField(PercentField &rWrap, const OString &rName); @@ -172,13 +172,13 @@ class SwColumnPage : public SfxTabPage public: SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet); virtual ~SwColumnPage(); - 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 SetFrmMode(bool bMod); void SetPageWidth(long nPageWidth); |