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 /sc/source/ui/inc/condformatdlg.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sc/source/ui/inc/condformatdlg.hxx')
-rw-r--r-- | sc/source/ui/inc/condformatdlg.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index affbeff01f61..be0eaadd0f86 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -74,14 +74,14 @@ private: public: ScCondFormatList(vcl::Window* pParent, WinBits nStyle); virtual ~ScCondFormatList(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void init(ScDocument* pDoc, ScCondFormatDlg* pDialogParent, const ScConditionalFormat* pFormat, const ScRangeList& rRanges, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); - virtual Size GetOptimalSize() const SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const override; + virtual void Resize() override; ScConditionalFormat* GetConditionalFormat() const; void RecalcAll(); @@ -122,7 +122,7 @@ private: DECL_LINK( EdRangeModifyHdl, Edit* ); protected: - virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; + virtual void RefInputDone( bool bForced = false ) override; void OkPressed(); void CancelPressed(); @@ -132,18 +132,18 @@ public: const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType, bool bManaged); virtual ~ScCondFormatDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; SC_DLLPUBLIC ScConditionalFormat* GetConditionalFormat() const; static OUString GenerateXmlString(sal_uInt32 nIndex, sal_uInt8 nType, bool bManaged); static bool ParseXmlString(const OUString& sXMLString, sal_uInt32& nIndex, sal_uInt8& nType, bool& bManaged); - virtual void SetReference(const ScRange&, ScDocument*) SAL_OVERRIDE; - virtual bool IsRefInputMode() const SAL_OVERRIDE; - virtual void SetActive() SAL_OVERRIDE; - virtual bool IsTableLocked() const SAL_OVERRIDE; - virtual bool Close() SAL_OVERRIDE; + virtual void SetReference(const ScRange&, ScDocument*) override; + virtual bool IsRefInputMode() const override; + virtual void SetActive() override; + virtual bool IsTableLocked() const override; + virtual bool Close() override; void InvalidateRefData(); |