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/text/pormulti.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/core/text/pormulti.hxx')
| -rw-r--r-- | sw/source/core/text/pormulti.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx index 8e323aa2a3a2..5ec7998c17ee 100644 --- a/sw/source/core/text/pormulti.hxx +++ b/sw/source/core/text/pormulti.hxx @@ -128,8 +128,8 @@ public: inline bool OnTop() const { return bTop; } void ActualizeTabulator(); - virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE; - virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual void Paint( const SwTextPaintInfo &rInf ) const override; + virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override; virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const; // Summarize the internal lines to calculate the (external) size @@ -141,7 +141,7 @@ public: inline sal_uInt8 GetDirection() const { return nDirection; } // Accessibility: pass information about this portion to the PortionHandler - virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE; + virtual void HandlePortion( SwPortionHandler& rPH ) const override; OUTPUT_OPERATOR_OVERRIDE }; @@ -175,8 +175,8 @@ public: inline sal_Int32 GetSmallerSpaceCnt() const { return ( nLineDiff < 0 ) ? nBlank1 : nBlank2; } - virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; - virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE; + virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override; + virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const override; }; class SwRubyPortion : public SwMultiPortion @@ -219,9 +219,9 @@ public: // Get number of blanks for justified alignment sal_Int32 GetSpaceCnt( const SwTextSizeInfo &rInf ) const; // Calculates extra spacing based on number of blanks - virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE; + virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override; // Manipulate the spacing array at pCurr - virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE; + virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const override; }; // For cursor travelling in multiportions |