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 /lotuswordpro/source/filter/lwptblformula.hxx | |
parent | HAVE_CXX11_OVERRIDE is required on all supported toolchains (diff) | |
download | core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'lotuswordpro/source/filter/lwptblformula.hxx')
-rw-r--r-- | lotuswordpro/source/filter/lwptblformula.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx index c19e55bdf221..22d2f6627b14 100644 --- a/lotuswordpro/source/filter/lwptblformula.hxx +++ b/lotuswordpro/source/filter/lwptblformula.hxx @@ -120,7 +120,7 @@ class LwpFormulaConst:public LwpFormulaArg { public: explicit LwpFormulaConst( double dVal); - virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE; + virtual OUString ToString(LwpTableLayout* pCellsMap) override; private: double m_dVal; }; @@ -129,7 +129,7 @@ class LwpFormulaText:public LwpFormulaArg { public: explicit LwpFormulaText( const OUString& aText); - virtual OUString ToString(LwpTableLayout* /*pCellsMap*/) SAL_OVERRIDE {return m_aText;} + virtual OUString ToString(LwpTableLayout* /*pCellsMap*/) override {return m_aText;} private: OUString m_aText; }; @@ -142,7 +142,7 @@ public: sal_Int16 GetCol(){return m_aCol;} sal_Int16 GetRow(){return m_aRow;} - virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE; + virtual OUString ToString(LwpTableLayout* pCellsMap) override; private: sal_Int16 m_aCol; sal_Int16 m_aRow; @@ -153,7 +153,7 @@ class LwpFormulaCellRangeAddr:public LwpFormulaArg public: LwpFormulaCellRangeAddr(sal_Int16 aStartCol, sal_Int16 aStartRow, sal_Int16 aEndCol, sal_Int16 aEndRow); - virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE; + virtual OUString ToString(LwpTableLayout* pCellsMap) override; private: sal_Int16 m_aStartCol; sal_Int16 m_aStartRow; @@ -169,8 +169,8 @@ public: void AddArg(LwpFormulaArg* pArg); - virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE; - OUString ToArgString(LwpTableLayout* pCellsMap) SAL_OVERRIDE; + virtual OUString ToString(LwpTableLayout* pCellsMap) override; + OUString ToArgString(LwpTableLayout* pCellsMap) override; protected: std::vector<LwpFormulaArg*> m_aArgs; @@ -181,14 +181,14 @@ class LwpFormulaOp : public LwpFormulaFunc { public: explicit LwpFormulaOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;} - virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE; + virtual OUString ToString(LwpTableLayout* pCellsMap) override; }; class LwpFormulaUnaryOp : public LwpFormulaFunc { public: explicit LwpFormulaUnaryOp(sal_uInt16 nTokenType):LwpFormulaFunc(nTokenType){;} - virtual OUString ToString(LwpTableLayout* pCellsMap) SAL_OVERRIDE; + virtual OUString ToString(LwpTableLayout* pCellsMap) override; }; class LwpFormulaInfo : public LwpCellList @@ -196,9 +196,9 @@ class LwpFormulaInfo : public LwpCellList public: LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm); OUString Convert(LwpTableLayout* pCellsMap); - void Convert(XFCell * pCell, LwpTableLayout* pCellsMap) SAL_OVERRIDE; + void Convert(XFCell * pCell, LwpTableLayout* pCellsMap) override; protected: - void Read() SAL_OVERRIDE; + void Read() override; bool ReadCellID(); bool ReadText(); bool ReadCellRange(); |