summaryrefslogtreecommitdiff
path: root/sw/source/core/text
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 /sw/source/core/text
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/core/text')
-rw-r--r--sw/source/core/text/itrform2.cxx2
-rw-r--r--sw/source/core/text/pordrop.hxx8
-rw-r--r--sw/source/core/text/porexp.hxx32
-rw-r--r--sw/source/core/text/porfld.hxx42
-rw-r--r--sw/source/core/text/porfly.hxx10
-rw-r--r--sw/source/core/text/porftn.hxx24
-rw-r--r--sw/source/core/text/porglue.hxx8
-rw-r--r--sw/source/core/text/porhyph.hxx26
-rw-r--r--sw/source/core/text/porlay.hxx6
-rw-r--r--sw/source/core/text/porlin.hxx2
-rw-r--r--sw/source/core/text/pormulti.hxx14
-rw-r--r--sw/source/core/text/porref.hxx12
-rw-r--r--sw/source/core/text/porrst.hxx32
-rw-r--r--sw/source/core/text/portab.hxx10
-rw-r--r--sw/source/core/text/portox.hxx12
-rw-r--r--sw/source/core/text/portxt.hxx42
-rw-r--r--sw/source/core/text/txtcache.hxx4
-rw-r--r--sw/source/core/text/xmldump.cxx10
18 files changed, 148 insertions, 148 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 47ed32b0e3c1..83f50b91fdf8 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -814,7 +814,7 @@ class SwMetaPortion : public SwTextPortion
{
public:
inline SwMetaPortion() { SetWhichPor( POR_META ); }
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
// OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 568b03ff48d5..11598ab1d899 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -81,11 +81,11 @@ public:
const sal_uInt16 nDistance );
virtual ~SwDropPortion();
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
void PaintDrop( const SwTextPaintInfo &rInf ) const;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
- virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
+ virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override;
inline sal_uInt16 GetLines() const { return nLines; }
inline sal_uInt16 GetDistance() const { return nDistance; }
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index c9f9c7b24556..166c77c58422 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -26,14 +26,14 @@ class SwExpandPortion : public SwTextPortion
{
public:
inline SwExpandPortion() { SetWhichPor( POR_EXP ); }
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
+ virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
// 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
};
@@ -47,16 +47,16 @@ public:
: cChar( cCh ), bMulti( bMult )
{ cChar = cCh; SetLen(1); SetWhichPor( POR_BLANK ); }
- virtual SwLinePortion *Compress() SAL_OVERRIDE;
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
- virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() override;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
+ virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
static sal_uInt16 MayUnderflow( const SwTextFormatInfo &rInf, sal_Int32 nIdx,
bool bUnderflow );
// 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
};
@@ -66,10 +66,10 @@ class SwPostItsPortion : public SwExpandPortion
bool bScript;
public:
explicit SwPostItsPortion( bool bScrpt );
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
bool IsScript() const { return bScript; }
OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index 3f574987786f..56739b441c6d 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -65,14 +65,14 @@ public:
inline const SwFont *GetFont() const { return pFnt; }
inline OUString GetExp() const { return aExpand; }
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
// Empty fields are also allowed
- virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() override;
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
inline bool IsFollow() const { return bFollow; }
inline void SetFollow( bool bNew ) { bFollow = bNew; }
@@ -98,10 +98,10 @@ public:
virtual SwFieldPortion *Clone( const OUString &rExpand ) const;
// Extra GetTextSize because of pFnt
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
// 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
};
@@ -115,11 +115,11 @@ public:
inline SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = 0 )
: SwFieldPortion( rExpand, pFntL )
{ SetLen(1); SetWhichPor( POR_HIDDEN ); }
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
// Field cloner for SplitGlue
- virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ virtual SwFieldPortion *Clone( const OUString &rExpand ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
@@ -137,13 +137,13 @@ public:
const bool bCenter,
const sal_uInt16 nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
// Field cloner for SplitGlue
- virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
- virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual SwFieldPortion *Clone( const OUString &rExpand ) const override;
+ virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
OUTPUT_OPERATOR_OVERRIDE
};
@@ -179,8 +179,8 @@ public:
const sal_uInt16 nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
virtual ~SwGrfNumPortion();
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
void SetBase( long nLnAscent, long nLnDescent,
long nFlyAscent, long nFlyDescent );
@@ -219,9 +219,9 @@ class SwCombinedPortion : public SwFieldPortion
sal_uInt8 nProportion; // relative font height
public:
explicit SwCombinedPortion( const OUString &rExpand );
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
@@ -237,7 +237,7 @@ public:
{
}
// Field cloner for SplitGlue
- virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ virtual SwFieldPortion *Clone( const OUString &rExpand ) const override;
};
#endif
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 9b9aef0373bc..941388a86fc6 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -36,8 +36,8 @@ public:
: SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); }
inline sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; }
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
OUTPUT_OPERATOR_OVERRIDE
};
@@ -49,7 +49,7 @@ class SwFlyCntPortion : public SwLinePortion
bool bDraw : 1; // DrawContact?
bool bMax : 1; // Line adjustment and height == line height
sal_uInt8 nAlign : 3; // Line adjustment? No, above, middle, bottom
- virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override;
public:
// Use new datatype for parameter <nFlags>
@@ -81,8 +81,8 @@ public:
objectpositioning::AsCharFlags nFlags );
sal_Int32 GetFlyCrsrOfst( const sal_uInt16 nOfst, const Point &rPoint,
SwPosition *pPos, SwCrsrMoveState* pCMS ) const;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 2a532022c386..6051c26dbcb1 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -36,10 +36,10 @@ public:
sal_uInt16 nOrig = USHRT_MAX );
sal_uInt16& Orig() { return nOrigHeight; }
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
+ virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
// #i98418#
void SetPreferredScriptType( sal_uInt8 nPreferredScriptType );
@@ -63,19 +63,19 @@ class SwQuoVadisPortion : public SwFieldPortion
OUString aErgo;
public:
SwQuoVadisPortion( const OUString &rExp, const OUString& rStr );
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
void SetNumber( const OUString& rStr ) { aErgo = rStr; }
const OUString GetQuoText() const { return aExpand; }
const OUString &GetContText() const { return aErgo; }
// Field cloner for SplitGlue
- virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ virtual SwFieldPortion *Clone( const OUString &rExpand ) const override;
// 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
};
@@ -84,11 +84,11 @@ class SwErgoSumPortion : public SwFieldPortion
{
public:
SwErgoSumPortion( const OUString &rExp, const OUString& rStr );
- virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
// Field cloner for SplitGlue
- virtual SwFieldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ virtual SwFieldPortion *Clone( const OUString &rExpand ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index 182faab066b8..c43f0418d196 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -40,10 +40,10 @@ public:
inline void MoveAllGlue( SwGluePortion *pTarget );
inline void MoveHalfGlue( SwGluePortion *pTarget );
inline void AdjFixWidth();
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override;
+ virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 90af3bf74632..aecf4523e36c 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -28,11 +28,11 @@ public:
{
SetWhichPor( POR_HYPH );
}
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
// 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
};
@@ -47,10 +47,10 @@ public:
SetWhichPor( POR_HYPHSTR );
}
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
// 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
};
@@ -63,18 +63,18 @@ class SwSoftHyphPortion : public SwHyphPortion
public:
SwSoftHyphPortion();
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
- virtual SwLinePortion *Compress() SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
+ virtual SwLinePortion *Compress() override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
inline void SetExpand( const bool bNew ) { bExpand = bNew; }
bool IsExpand() const { return bExpand; }
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
// 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
};
@@ -83,7 +83,7 @@ class SwSoftHyphStrPortion : public SwHyphStrPortion
{
public:
explicit SwSoftHyphStrPortion( const OUString &rStr );
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 777f6f1d7e30..8e398446e748 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -101,8 +101,8 @@ private:
public:
// From SwLinePortion
- virtual SwLinePortion *Insert( SwLinePortion *pPortion ) SAL_OVERRIDE;
- virtual SwLinePortion *Append( SwLinePortion *pPortion ) SAL_OVERRIDE;
+ virtual SwLinePortion *Insert( SwLinePortion *pPortion ) override;
+ virtual SwLinePortion *Append( SwLinePortion *pPortion ) override;
inline SwLinePortion *GetFirstPortion() const;
// Flags
@@ -158,7 +158,7 @@ public:
{ return _GetHangingMargin(); }
// For special treatment for empty lines
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
// Stuff for justified alignment
inline bool IsSpaceAdd() { return pLLSpaceAdd != NULL; }
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 9d410f0802d1..e78d96e25e5c 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -34,7 +34,7 @@ class SwPortionHandler;
// The portions output operators are virtual methods of the portion.
#ifdef DBG_UTIL
#define OUTPUT_OPERATOR virtual SvStream & operator<<( SvStream & aOs ) const;
-#define OUTPUT_OPERATOR_OVERRIDE virtual SvStream & operator<<( SvStream & aOs ) const SAL_OVERRIDE;
+#define OUTPUT_OPERATOR_OVERRIDE virtual SvStream & operator<<( SvStream & aOs ) const override;
#else
#define OUTPUT_OPERATOR
#define OUTPUT_OPERATOR_OVERRIDE
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
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 8035d7f462c2..593acb05edc6 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -25,7 +25,7 @@ class SwRefPortion : public SwTextPortion
{
public:
inline SwRefPortion(){ SetWhichPor( POR_REF ); }
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
@@ -35,13 +35,13 @@ class SwIsoRefPortion : public SwRefPortion
public:
SwIsoRefPortion();
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual SwLinePortion *Compress() SAL_OVERRIDE;
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual SwLinePortion *Compress() override;
+ virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
// 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
};
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index 31f8ab0448bd..4e5dd7a339b2 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -30,7 +30,7 @@ class SwTmpEndPortion : public SwLinePortion
{
public:
explicit SwTmpEndPortion( const SwLinePortion &rPortion );
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
@@ -39,14 +39,14 @@ class SwBreakPortion : public SwLinePortion
public:
explicit SwBreakPortion( const SwLinePortion &rPortion );
// Returns 0 if we have no usable data
- virtual SwLinePortion *Compress() SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
- virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
+ virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override;
// 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
};
@@ -71,8 +71,8 @@ public:
// of rPortion. It is only used for kerning portions for grid mode
explicit SwKernPortion( const SwLinePortion &rPortion );
- virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
@@ -84,8 +84,8 @@ class SwArrowPortion : public SwLinePortion
public:
explicit SwArrowPortion( const SwLinePortion &rPortion );
explicit SwArrowPortion( const SwTextPaintInfo &rInf );
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual SwLinePortion *Compress() override;
inline bool IsLeft() const { return bLeft; }
inline const Point& GetPos() const { return aPos; }
OUTPUT_OPERATOR_OVERRIDE
@@ -112,8 +112,8 @@ public:
explicit SwHiddenTextPortion( sal_Int32 nLen )
{ SetWhichPor( POR_HIDDEN_TXT ); SetLen( nLen ); }
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
};
class SwControlCharPortion : public SwLinePortion
@@ -132,9 +132,9 @@ public:
SetWhichPor( POR_CONTROLCHAR ); SetLen( 1 );
}
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo& rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo& rInf ) const override;
};
#endif
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index fa635c1f0359..5261a96d6325 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -31,16 +31,16 @@ class SwTabPortion : public SwFixPortion
bool PreFormat( SwTextFormatInfo &rInf );
public:
SwTabPortion( const sal_uInt16 nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true );
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
bool PostFormat( SwTextFormatInfo &rInf );
inline bool IsFilled() const { return 0 != cFill; }
inline sal_uInt16 GetTabPos() const { return nTabPos; }
inline bool IsAutoTabStop() const { return bAutoTabStop; }
// 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
};
@@ -112,7 +112,7 @@ public:
const sal_Unicode cFillChar = '\0' )
: SwTabDecimalPortion( nTabPosVal, cTab, cFillChar )
{ SetLen( 0 ); }
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
};
#endif
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index 2d5811ed9bda..3d4937e65e27 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -26,7 +26,7 @@ class SwToxPortion : public SwTextPortion
{
public:
inline SwToxPortion(){ SetWhichPor( POR_TOX ); }
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
OUTPUT_OPERATOR_OVERRIDE
};
@@ -36,13 +36,13 @@ class SwIsoToxPortion : public SwToxPortion
public:
SwIsoToxPortion();
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual SwLinePortion *Compress() SAL_OVERRIDE;
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual SwLinePortion *Compress() override;
+ virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
// 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
};
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 644915f3cd3f..08710b07f513 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -35,13 +35,13 @@ class SwTextPortion : public SwLinePortion
public:
inline SwTextPortion(){ SetWhichPor( POR_TXT ); }
static SwTextPortion * CopyLinePortion(const SwLinePortion &rPortion);
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void FormatEOL( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const SAL_OVERRIDE;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
- virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
+ virtual sal_Int32 GetCrsrOfst( const sal_uInt16 nOfst ) const override;
+ virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
+ virtual long CalcSpacing( long nSpaceAdd, const SwTextSizeInfo &rInf ) const override;
// Counts the spaces for justified paragraph
sal_Int32 GetSpaceCnt( const SwTextSizeInfo &rInf, sal_Int32& rCnt ) const;
@@ -49,7 +49,7 @@ public:
bool CreateHyphen( SwTextFormatInfo &rInf, SwTextGuess &rGuess );
// 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
DECL_FIXEDMEMPOOL_NEWDEL(SwTextPortion)
@@ -60,11 +60,11 @@ class SwTextInputFieldPortion : public SwTextPortion
public:
SwTextInputFieldPortion();
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const SAL_OVERRIDE;
- virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const SAL_OVERRIDE;
- virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const override;
+ virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText ) const override;
+ virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const override;
private:
bool mbContainsInputFieldStart;
@@ -79,12 +79,12 @@ public:
explicit SwHolePortion( const SwTextPortion &rPor );
sal_uInt16 GetBlankWidth( ) const { return nBlankWidth; }
void SetBlankWidth( const sal_uInt16 nNew ) { nBlankWidth = nNew; }
- virtual SwLinePortion *Compress() SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
// 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
DECL_FIXEDMEMPOOL_NEWDEL(SwHolePortion)
@@ -95,8 +95,8 @@ class SwFieldMarkPortion : public SwTextPortion
public:
inline SwFieldMarkPortion() : SwTextPortion()
{ }
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
};
class SwFieldFormCheckboxPortion : public SwTextPortion
@@ -105,8 +105,8 @@ public:
SwFieldFormCheckboxPortion() : SwTextPortion()
{
}
- virtual void Paint( const SwTextPaintInfo &rInf ) const SAL_OVERRIDE;
- virtual bool Format( SwTextFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTextPaintInfo &rInf ) const override;
+ virtual bool Format( SwTextFormatInfo &rInf ) override;
};
#endif
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index c3bdd80391b3..0f1435b66a2b 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -46,14 +46,14 @@ class SwTextLineAccess : public SwCacheAccess
{
protected:
- virtual SwCacheObj *NewObj() SAL_OVERRIDE;
+ virtual SwCacheObj *NewObj() override;
public:
explicit SwTextLineAccess( const SwTextFrm *pOwner );
SwParaPortion *GetPara();
- virtual bool IsAvailable() const SAL_OVERRIDE;
+ virtual bool IsAvailable() const override;
};
#endif
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index fa985610241b..e3f90dd71579 100644
--- a/sw/source/core/text/xmldump.cxx
+++ b/sw/source/core/text/xmldump.cxx
@@ -118,7 +118,7 @@ class XmlPortionDumper:public SwPortionHandler
virtual void Text( sal_Int32 nLength,
sal_uInt16 nType,
sal_Int32 nHeight,
- sal_Int32 nWidth) SAL_OVERRIDE
+ sal_Int32 nWidth) override
{
ofs += nLength;
xmlTextWriterStartElement( writer, BAD_CAST( "Text" ) );
@@ -151,7 +151,7 @@ class XmlPortionDumper:public SwPortionHandler
sal_uInt16 nType,
sal_Int32 nHeight,
sal_Int32 nWidth,
- const SwFont* pFont ) SAL_OVERRIDE
+ const SwFont* pFont ) override
{
xmlTextWriterStartElement( writer, BAD_CAST( "Special" ) );
xmlTextWriterWriteFormatAttribute( writer,
@@ -179,7 +179,7 @@ class XmlPortionDumper:public SwPortionHandler
ofs += nLength;
}
- virtual void LineBreak( sal_Int32 nWidth ) SAL_OVERRIDE
+ virtual void LineBreak( sal_Int32 nWidth ) override
{
xmlTextWriterStartElement( writer, BAD_CAST( "LineBreak" ) );
if (nWidth > 0)
@@ -193,7 +193,7 @@ class XmlPortionDumper:public SwPortionHandler
* @param nLength
* number of 'model string' characters to be skipped
*/
- virtual void Skip( sal_Int32 nLength ) SAL_OVERRIDE
+ virtual void Skip( sal_Int32 nLength ) override
{
xmlTextWriterStartElement( writer, BAD_CAST( "Skip" ) );
xmlTextWriterWriteFormatAttribute( writer,
@@ -203,7 +203,7 @@ class XmlPortionDumper:public SwPortionHandler
ofs += nLength;
}
- virtual void Finish( ) SAL_OVERRIDE
+ virtual void Finish( ) override
{
xmlTextWriterStartElement( writer, BAD_CAST( "Finish" ) );
xmlTextWriterEndElement( writer );