summaryrefslogtreecommitdiff
path: root/sw/source/ui/fldui
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/ui/fldui
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.hxx2
-rw-r--r--sw/source/ui/fldui/flddb.hxx10
-rw-r--r--sw/source/ui/fldui/flddinf.hxx10
-rw-r--r--sw/source/ui/fldui/flddok.hxx10
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx10
-rw-r--r--sw/source/ui/fldui/fldpage.hxx2
-rw-r--r--sw/source/ui/fldui/fldref.hxx10
-rw-r--r--sw/source/ui/fldui/fldvar.hxx12
8 files changed, 33 insertions, 33 deletions
diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx
index 42e5e568bed1..412b1e7a875f 100644
--- a/sw/source/ui/fldui/FldRefTreeListBox.hxx
+++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx
@@ -24,7 +24,7 @@
class SwFieldRefTreeListBox : public SvTreeListBox
{
protected:
- virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE;
+ virtual void RequestHelp( const HelpEvent& rHEvt ) override;
public:
SwFieldRefTreeListBox(vcl::Window* pParent, WinBits nStyle);
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index d6813766a735..5a5a8fc2b1e4 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -66,20 +66,20 @@ class SwFieldDBPage : public SwFieldPage
using SwFieldPage::SetWrtShell;
protected:
- virtual sal_uInt16 GetGroup() SAL_OVERRIDE;
+ virtual sal_uInt16 GetGroup() override;
public:
SwFieldDBPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwFieldDBPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
- 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;
- virtual void FillUserData() SAL_OVERRIDE;
+ virtual void FillUserData() override;
void ActivateMailMergeAddress();
void SetWrtShell(SwWrtShell& rSh);
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index dd89d2d6eaf7..c1fab4302503 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -56,20 +56,20 @@ class SwFieldDokInfPage : public SwFieldPage
sal_Int32 FillSelectionLB(sal_uInt16 nSubTypeId);
protected:
- virtual sal_uInt16 GetGroup() SAL_OVERRIDE;
+ virtual sal_uInt16 GetGroup() override;
public:
SwFieldDokInfPage(vcl::Window* pWindow, const SfxItemSet& rSet);
virtual ~SwFieldDokInfPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
- 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;
- virtual void FillUserData() SAL_OVERRIDE;
+ virtual void FillUserData() override;
};
#endif
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index bef27f832d80..d103b8f118f1 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -58,20 +58,20 @@ class SwFieldDokPage : public SwFieldPage
sal_Int32 FillFormatLB(sal_uInt16 nTypeId);
protected:
- virtual sal_uInt16 GetGroup() SAL_OVERRIDE;
+ virtual sal_uInt16 GetGroup() override;
public:
SwFieldDokPage(vcl::Window* pWindow, const SfxItemSet& rSet);
virtual ~SwFieldDokPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
- 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;
- virtual void FillUserData() SAL_OVERRIDE;
+ virtual void FillUserData() override;
};
#endif
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index bd5abd35e63a..96ce837c8f98 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -83,20 +83,20 @@ class SwFieldFuncPage : public SwFieldPage
static OUString TurnMacroString(const OUString &rMacro);
protected:
- virtual sal_uInt16 GetGroup() SAL_OVERRIDE;
+ virtual sal_uInt16 GetGroup() override;
public:
SwFieldFuncPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwFieldFuncPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
- 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;
- virtual void FillUserData() SAL_OVERRIDE;
+ virtual void FillUserData() override;
};
#endif
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 1cdb472b2d5b..5bf7ed29211e 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -85,7 +85,7 @@ public:
virtual ~SwFieldPage();
- virtual void ActivatePage() SAL_OVERRIDE;
+ virtual void ActivatePage() override;
inline SwFieldMgr& GetFieldMgr() { return m_aMgr; }
void SetWrtShell( SwWrtShell* m_pWrtShell );
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 3e63c48b8f25..d59d872758c7 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -73,20 +73,20 @@ class SwFieldRefPage : public SwFieldPage
void SaveSelectedTextNode();
protected:
- virtual sal_uInt16 GetGroup() SAL_OVERRIDE;
+ virtual sal_uInt16 GetGroup() override;
public:
SwFieldRefPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwFieldRefPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
- 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;
- virtual void FillUserData() SAL_OVERRIDE;
+ virtual void FillUserData() override;
};
#endif
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index d4b9ea176a84..435fef91c259 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -37,7 +37,7 @@ class SelectionListBox : public ListBox
{
bool bCallAddSelection;
- virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) override;
public:
SelectionListBox(vcl::Window* pParent, WinBits nStyle);
@@ -88,20 +88,20 @@ class SwFieldVarPage : public SwFieldPage
sal_Int32 FillFormatLB(sal_uInt16 nTypeId);
protected:
- virtual sal_uInt16 GetGroup() SAL_OVERRIDE;
+ virtual sal_uInt16 GetGroup() override;
public:
SwFieldVarPage(vcl::Window* pParent, const SfxItemSet& rSet);
virtual ~SwFieldVarPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
- 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;
- virtual void FillUserData() SAL_OVERRIDE;
+ virtual void FillUserData() override;
};
#endif
generated by cgit (git 2.34.1) at 2025-02-23 11:25:03 +0000