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/core/txtnode | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/core/txtnode')
| -rw-r--r-- | sw/source/core/txtnode/SwGrammarContact.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/txtnode/fntcap.cxx | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/core/txtnode/SwGrammarContact.cxx b/sw/source/core/txtnode/SwGrammarContact.cxx index 1613c62567ab..262185a61af3 100644 --- a/sw/source/core/txtnode/SwGrammarContact.cxx +++ b/sw/source/core/txtnode/SwGrammarContact.cxx @@ -51,12 +51,12 @@ public: virtual ~SwGrammarContact() { aTimer.Stop(); delete mpProxyList; } // (pure) virtual functions of IGrammarContact - virtual void updateCursorPosition( const SwPosition& rNewPos ) SAL_OVERRIDE; - virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) SAL_OVERRIDE; - virtual void finishGrammarCheck( SwTextNode& rTextNode ) SAL_OVERRIDE; + virtual void updateCursorPosition( const SwPosition& rNewPos ) override; + virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) override; + virtual void finishGrammarCheck( SwTextNode& rTextNode ) override; protected: // virtual function of SwClient - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE; + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override; }; SwGrammarContact::SwGrammarContact() : mpProxyList(0), mbFinished( false ) diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index bc0fa90bd567..acc88ec5d69a 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -112,8 +112,8 @@ protected: public: explicit SwDoGetCapitalSize( SwDrawTextInfo &rInfo ) : SwDoCapitals ( rInfo ) { } virtual ~SwDoGetCapitalSize() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; - virtual void Do() SAL_OVERRIDE; + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override; + virtual void Do() override; const Size &GetSize() const { return aTextSize; } }; @@ -165,8 +165,8 @@ public: , m_nBreak( -1 ) { } virtual ~SwDoGetCapitalBreak() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; - virtual void Do() SAL_OVERRIDE; + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override; + virtual void Do() override; sal_Int32 getBreak() const { return m_nBreak; } }; @@ -240,8 +240,8 @@ public: SwDoCapitals( rInfo ), pUpperFnt(0), pLowerFnt(0) { } virtual ~SwDoDrawCapital() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; - virtual void Do() SAL_OVERRIDE; + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override; + virtual void Do() override; void DrawSpace( Point &rPos ); }; @@ -324,8 +324,8 @@ public: SwDoCapitals( rInfo ), pUpperFnt(0), pLowerFnt(0), nCrsr( 0 ), nOfst( nOfs ) { } virtual ~SwDoCapitalCrsrOfst() {} - virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) SAL_OVERRIDE; - virtual void Do() SAL_OVERRIDE; + virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ) override; + virtual void Do() override; inline sal_Int32 GetCrsr(){ return nCrsr; } }; @@ -392,7 +392,7 @@ class SwDoDrawStretchCapital : public SwDoDrawCapital const sal_uInt16 nCapWidth; const sal_uInt16 nOrgWidth; public: - virtual void Do() SAL_OVERRIDE; + virtual void Do() override; SwDoDrawStretchCapital( SwDrawTextInfo &rInfo, const sal_uInt16 nCapitalWidth ) : SwDoDrawCapital( rInfo ), |