summaryrefslogtreecommitdiff
path: root/formula
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 /formula
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'formula')
-rw-r--r--formula/source/ui/dlg/ControlHelper.hxx12
-rw-r--r--formula/source/ui/dlg/FormulaHelper.cxx26
-rw-r--r--formula/source/ui/dlg/funcpage.hxx6
-rw-r--r--formula/source/ui/dlg/parawin.hxx2
-rw-r--r--formula/source/ui/dlg/structpg.hxx8
5 files changed, 27 insertions, 27 deletions
diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index 18af2e9e5396..7e875b6bfe7e 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -38,17 +38,17 @@ private:
protected:
- virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) override;
void SelectionChanged();
- virtual void Resize() SAL_OVERRIDE;
- virtual void GetFocus() SAL_OVERRIDE;
+ virtual void Resize() override;
+ virtual void GetFocus() override;
public:
EditBox( vcl::Window* pParent, WinBits nBits );
virtual ~EditBox();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
MultiLineEdit* GetEdit() {return pMEdit;}
@@ -65,13 +65,13 @@ class ArgEdit : public RefEdit
public:
ArgEdit( vcl::Window* pParent, WinBits nBits );
virtual ~ArgEdit();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
ScrollBar& rArgSlider, sal_uInt16 nArgCount );
protected:
- virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
+ virtual void KeyInput( const KeyEvent& rKEvt ) override;
private:
VclPtr<ArgEdit> pEdPrev;
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 7570ef6373bc..bde6ca837f0f 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -35,19 +35,19 @@ namespace formula
OEmptyFunctionDescription(){}
virtual ~OEmptyFunctionDescription(){}
- virtual OUString getFunctionName() const SAL_OVERRIDE { return OUString(); }
- virtual const IFunctionCategory* getCategory() const SAL_OVERRIDE { return NULL; }
- virtual OUString getDescription() const SAL_OVERRIDE { return OUString(); }
- virtual sal_Int32 getSuppressedArgumentCount() const SAL_OVERRIDE { return 0; }
- virtual OUString getFormula(const ::std::vector< OUString >& ) const SAL_OVERRIDE { return OUString(); }
- virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const SAL_OVERRIDE {}
- virtual void initArgumentInfo() const SAL_OVERRIDE {}
- virtual OUString getSignature() const SAL_OVERRIDE { return OUString(); }
- virtual OString getHelpId() const SAL_OVERRIDE { return ""; }
- virtual sal_uInt32 getParameterCount() const SAL_OVERRIDE { return 0; }
- virtual OUString getParameterName(sal_uInt32 ) const SAL_OVERRIDE { return OUString(); }
- virtual OUString getParameterDescription(sal_uInt32 ) const SAL_OVERRIDE { return OUString(); }
- virtual bool isParameterOptional(sal_uInt32 ) const SAL_OVERRIDE { return false; }
+ virtual OUString getFunctionName() const override { return OUString(); }
+ virtual const IFunctionCategory* getCategory() const override { return NULL; }
+ virtual OUString getDescription() const override { return OUString(); }
+ virtual sal_Int32 getSuppressedArgumentCount() const override { return 0; }
+ virtual OUString getFormula(const ::std::vector< OUString >& ) const override { return OUString(); }
+ virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const override {}
+ virtual void initArgumentInfo() const override {}
+ virtual OUString getSignature() const override { return OUString(); }
+ virtual OString getHelpId() const override { return ""; }
+ virtual sal_uInt32 getParameterCount() const override { return 0; }
+ virtual OUString getParameterName(sal_uInt32 ) const override { return OUString(); }
+ virtual OUString getParameterDescription(sal_uInt32 ) const override { return OUString(); }
+ virtual bool isParameterOptional(sal_uInt32 ) const override { return false; }
};
}
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 04ceb66a482c..05ab42c6d4b6 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -45,8 +45,8 @@ class FormulaListBox : public ListBox
{
protected:
- virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE;
- virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ virtual void KeyInput( const KeyEvent& rKEvt ) override;
+ virtual bool PreNotify( NotifyEvent& rNEvt ) override;
public:
FormulaListBox( vcl::Window* pParent, WinBits nBits );
@@ -85,7 +85,7 @@ public:
FuncPage( vcl::Window* pParent,const IFunctionManager* _pFunctionManager);
virtual ~FuncPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetCategory(sal_Int32 nCat);
void SetFunction(sal_Int32 nFunc);
diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx
index 894b7de2ec9c..4c6ec6e38bb2 100644
--- a/formula/source/ui/dlg/parawin.hxx
+++ b/formula/source/ui/dlg/parawin.hxx
@@ -124,7 +124,7 @@ protected:
public:
ParaWin(vcl::Window* pParent,IControlReferenceHandler* _pDlg);
virtual ~ParaWin();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void SetFunctionDesc(const IFunctionDescription* pFDesc);
void SetArgumentOffset(sal_uInt16 nOffset);
diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx
index 186908e5aa85..f150e8a38304 100644
--- a/formula/source/ui/dlg/structpg.hxx
+++ b/formula/source/ui/dlg/structpg.hxx
@@ -44,7 +44,7 @@ private:
bool bActiveFlag;
protected:
- virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
+ virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
public:
@@ -60,8 +60,8 @@ public:
void SetActiveFlag(bool bFlag=true);
bool GetActiveFlag() { return bActiveFlag;}
- void GetFocus() SAL_OVERRIDE;
- void LoseFocus() SAL_OVERRIDE;
+ void GetFocus() override;
+ void LoseFocus() override;
};
@@ -90,7 +90,7 @@ public:
StructPage( vcl::Window* pParent);
virtual ~StructPage();
- virtual void dispose() SAL_OVERRIDE;
+ virtual void dispose() override;
void ClearStruct();
SvTreeListEntry* InsertEntry(const OUString& rText, SvTreeListEntry* pParent,