summaryrefslogtreecommitdiff
path: root/sw/source/core/text
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /sw/source/core/text
parentc36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff)
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sw/source/core/text')
-rw-r--r--sw/source/core/text/itrform2.cxx2
-rw-r--r--sw/source/core/text/pordrop.hxx10
-rw-r--r--sw/source/core/text/porexp.hxx38
-rw-r--r--sw/source/core/text/porfld.hxx52
-rw-r--r--sw/source/core/text/porfly.hxx14
-rw-r--r--sw/source/core/text/porftn.hxx32
-rw-r--r--sw/source/core/text/porglue.hxx14
-rw-r--r--sw/source/core/text/porhyph.hxx34
-rw-r--r--sw/source/core/text/porlay.hxx10
-rw-r--r--sw/source/core/text/porlin.hxx2
-rw-r--r--sw/source/core/text/pormulti.hxx16
-rw-r--r--sw/source/core/text/porref.hxx16
-rw-r--r--sw/source/core/text/porrst.hxx40
-rw-r--r--sw/source/core/text/portab.hxx20
-rw-r--r--sw/source/core/text/portox.hxx16
-rw-r--r--sw/source/core/text/portxt.hxx46
-rw-r--r--sw/source/core/text/txtcache.hxx4
-rw-r--r--sw/source/core/text/xmldump.cxx10
18 files changed, 189 insertions, 187 deletions
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 63ea8f5a5135..1ba49c8e1466 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -855,7 +855,7 @@ class SwMetaPortion : public SwTxtPortion
{
public:
inline SwMetaPortion() { SetWhichPor( POR_META ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
// OUTPUT_OPERATOR
};
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index 120e2910d406..4568fa2349fc 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -90,11 +90,11 @@ public:
const KSHORT nDistance );
virtual ~SwDropPortion();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
void PaintDrop( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE;
inline MSHORT GetLines() const { return nLines; }
inline KSHORT GetDistance() const { return nDistance; }
@@ -111,7 +111,7 @@ public:
static void DeleteDropCapCache();
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 39422ec97f9b..23afa3675782 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -30,16 +30,16 @@ class SwExpandPortion : public SwTxtPortion
{
public:
inline SwExpandPortion() { SetWhichPor( POR_EXP ); }
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -58,18 +58,18 @@ public:
bool IsMulti() const { return bMulti; }
void SetMulti( bool bNew ) { bMulti = bNew; }
- virtual SwLinePortion *Compress();
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
MSHORT MayUnderflow( const SwTxtFormatInfo &rInf, sal_Int32 nIdx,
bool bUnderflow ) const;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -81,12 +81,12 @@ class SwPostItsPortion : public SwExpandPortion
bool bScript;
public:
SwPostItsPortion( bool bScrpt );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
bool IsScript() const { return bScript; }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index f6c13a54c88f..3107a1973364 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -69,14 +69,14 @@ public:
inline const SwFont *GetFont() const { return pFnt; }
inline OUString GetExp() const { return aExpand; }
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
// Empty fields are also allowed
- virtual SwLinePortion *Compress();
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
inline bool IsFollow() const { return bFollow; }
inline void SetFollow( bool bNew ) { bFollow = bNew; }
@@ -103,12 +103,12 @@ public:
virtual SwFldPortion *Clone( const OUString &rExpand ) const;
// Extra GetTxtSize because of pFnt
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -122,12 +122,12 @@ public:
inline SwHiddenPortion( const OUString &rExpand, SwFont *pFntL = 0 )
: SwFldPortion( rExpand, pFntL )
{ SetLen(1); SetWhichPor( POR_HIDDEN ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
// Field cloner for SplitGlue
- virtual SwFldPortion *Clone( const OUString &rExpand ) const;
- OUTPUT_OPERATOR
+ virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -148,15 +148,15 @@ public:
const bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// Field cloner for SplitGlue
- virtual SwFldPortion *Clone( const OUString &rExpand ) const;
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
+ virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -173,7 +173,7 @@ public:
const bool bCenter,
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -198,8 +198,8 @@ public:
const KSHORT nMinDst,
const bool bLabelAlignmentPosAndSpaceModeActive );
~SwGrfNumPortion();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
void SetBase( long nLnAscent, long nLnDescent,
long nFlyAscent, long nFlyDescent );
@@ -218,7 +218,7 @@ public:
inline SwTwips GetId() const { return nId; }
inline sal_Int16 GetOrient() const { return eOrient; }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -241,10 +241,10 @@ class SwCombinedPortion : public SwFldPortion
sal_uInt8 nProportion; // relative font height
public:
SwCombinedPortion( const OUString &rExpand );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 61967b0ae641..48532fa651f4 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -40,9 +40,9 @@ public:
: SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); }
inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -57,7 +57,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 KSHORT nOfst ) const;
+ virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE;
public:
// OD 29.07.2003 #110978# - use new datatype for parameter <nFlags>
@@ -89,9 +89,9 @@ public:
objectpositioning::AsCharFlags nFlags );
sal_Int32 GetFlyCrsrOfst( const KSHORT nOfst, const Point &rPoint,
SwPosition *pPos, SwCrsrMoveState* pCMS ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index 6d2bb5175945..161d3e1730f0 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -40,16 +40,16 @@ public:
KSHORT nOrig = KSHRT_MAX );
KSHORT& Orig() { return nOrigHeight; }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// #i98418#
void SetPreferredScriptType( sal_uInt8 nPreferredScriptType );
const SwTxtFtn* GetTxtFtn() const { return pFtn; };
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -63,7 +63,7 @@ public:
: SwNumberPortion( rExpand, pFntL, true, false, 0, false )
{ SetWhichPor( POR_FTNNUM ); }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -75,21 +75,21 @@ class SwQuoVadisPortion : public SwFldPortion
OUString aErgo;
public:
SwQuoVadisPortion( const OUString &rExp, const OUString& rStr );
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
void SetNumber( const OUString& rStr ) { aErgo = rStr; }
const OUString GetQuoTxt() const { return aExpand; }
const OUString &GetContTxt() const { return aErgo; }
// Field cloner for SplitGlue
- virtual SwFldPortion *Clone( const OUString &rExpand ) const;
+ virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -100,12 +100,12 @@ class SwErgoSumPortion : public SwFldPortion
{
public:
SwErgoSumPortion( const OUString &rExp, const OUString& rStr );
- virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// Field cloner for SplitGlue
- virtual SwFldPortion *Clone( const OUString &rExpand ) const;
- OUTPUT_OPERATOR
+ virtual SwFldPortion *Clone( const OUString &rExpand ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index 4da5ae294618..7c5edccbec6b 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -44,12 +44,12 @@ public:
inline void MoveAllGlue( SwGluePortion *pTarget );
inline void MoveHalfGlue( SwGluePortion *pTarget );
inline void AdjFixWidth();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -64,7 +64,7 @@ public:
SwFixPortion( const KSHORT nFixWidth, const KSHORT nFixPos );
inline void Fix( const KSHORT nNewFix ) { nFix = nNewFix; }
inline KSHORT Fix() const { return nFix; }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -76,7 +76,7 @@ class SwMarginPortion : public SwGluePortion
public:
SwMarginPortion( const KSHORT nFixWidth );
void AdjustRight( const SwLineLayout* pCurr );
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 55e541ff9036..400fd3cbbf18 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -32,13 +32,13 @@ public:
{
SetWhichPor( POR_HYPH );
}
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -55,12 +55,12 @@ public:
SetWhichPor( POR_HYPHSTR );
}
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -75,20 +75,20 @@ class SwSoftHyphPortion : public SwHyphPortion
public:
SwSoftHyphPortion();
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual SwLinePortion *Compress();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
inline void SetExpand( const bool bNew ) { bExpand = bNew; }
bool IsExpand() const { return bExpand; }
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -99,8 +99,8 @@ class SwSoftHyphStrPortion : public SwHyphStrPortion
{
public:
SwSoftHyphStrPortion( const OUString &rStr );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index 92c80d4c6d1c..ef1c3ed4445e 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -103,8 +103,8 @@ private:
public:
// From SwLinePortion
- virtual SwLinePortion *Insert( SwLinePortion *pPortion );
- virtual SwLinePortion *Append( SwLinePortion *pPortion );
+ virtual SwLinePortion *Insert( SwLinePortion *pPortion ) SAL_OVERRIDE;
+ virtual SwLinePortion *Append( SwLinePortion *pPortion ) SAL_OVERRIDE;
inline SwLinePortion *GetFirstPortion() const;
// Flags
@@ -165,7 +165,7 @@ public:
{ return _GetHangingMargin(); }
// For special treatment for empty lines
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
// Stuff for justified alignment
inline bool IsSpaceAdd() { return pLLSpaceAdd != NULL; }
@@ -229,7 +229,7 @@ public:
const SwLinePortion* _pDontConsiderPortion = NULL,
const bool _bNoFlyCntPorAndLinePor = false ) const;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
DECL_FIXEDMEMPOOL_NEWDEL(SwLineLayout)
};
@@ -341,7 +341,7 @@ public:
void dumpAsXml( xmlTextWriter* writer, SwTxtFrm* pTxtFrm );
#endif
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
DECL_FIXEDMEMPOOL_NEWDEL(SwParaPortion)
};
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index 616fa2d5144c..16561993e4d0 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -33,8 +33,10 @@ 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;
#else
#define OUTPUT_OPERATOR
+#define OUTPUT_OPERATOR_OVERRIDE
#endif
// Portion groups
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index ed0d28ddce15..8f11e91cc320 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -139,8 +139,8 @@ public:
inline bool OnTop() const { return bTop; }
void ActualizeTabulator();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const;
// Summarize the internal lines to calculate the (external) size
@@ -154,9 +154,9 @@ public:
{ return ( HasRotation() ? ( IsRevers() ? 2700 : 900 ) : 0 ); }
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
class SwDoubleLinePortion : public SwMultiPortion
@@ -190,8 +190,8 @@ public:
inline sal_Int32 GetBlank1() const { return nBlank1; }
inline sal_Int32 GetBlank2() const { return nBlank2; }
- virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
- virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const;
+ virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE;
};
class SwRubyPortion : public SwMultiPortion
@@ -234,9 +234,9 @@ public:
// Get number of blanks for justified alignment
sal_Int32 GetSpaceCnt( const SwTxtSizeInfo &rInf ) const;
// Calculates extra spacing based on number of blanks
- virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
+ virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Manipulate the spacing array at pCurr
- virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const;
+ virtual bool ChgSpaceAdd( SwLineLayout* pCurr, long nSpaceAdd ) const SAL_OVERRIDE;
};
// For cursor travelling in multiportions
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 553faee334b3..ccf7f7152760 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -29,8 +29,8 @@ class SwRefPortion : public SwTxtPortion
{
public:
inline SwRefPortion(){ SetWhichPor( POR_REF ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -43,15 +43,15 @@ class SwIsoRefPortion : public SwRefPortion
public:
SwIsoRefPortion();
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual SwLinePortion *Compress();
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index 17615690839f..82553082f6a3 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -34,8 +34,8 @@ class SwTmpEndPortion : public SwLinePortion
{
public:
SwTmpEndPortion( const SwLinePortion &rPortion );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -47,16 +47,16 @@ class SwBreakPortion : public SwLinePortion
public:
SwBreakPortion( const SwLinePortion &rPortion );
// Returns 0 if we have no usable data
- virtual SwLinePortion *Compress();
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const MSHORT nOfst ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -83,10 +83,10 @@ public:
// of rPortion. It is only used for kerning portions for grid mode
SwKernPortion( const SwLinePortion &rPortion );
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -100,11 +100,11 @@ class SwArrowPortion : public SwLinePortion
public:
SwArrowPortion( const SwLinePortion &rPortion );
SwArrowPortion( const SwTxtPaintInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual SwLinePortion *Compress();
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
inline bool IsLeft() const { return bLeft; }
inline const Point& GetPos() const { return aPos; }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -136,8 +136,8 @@ public:
inline SwHiddenTextPortion( sal_Int32 nLen )
{ SetWhichPor( POR_HIDDEN_TXT ); SetLen( nLen ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
};
/*************************************************************************
@@ -160,9 +160,9 @@ public:
SetWhichPor( POR_CONTROLCHAR ); SetLen( 1 );
}
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo& rInf ) const SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index a8cf38b05950..525bfbe07651 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -35,18 +35,18 @@ class SwTabPortion : public SwFixPortion
bool PreFormat( SwTxtFormatInfo &rInf );
public:
SwTabPortion( const KSHORT nTabPos, const sal_Unicode cFill = '\0', const bool bAutoTab = true );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
bool PostFormat( SwTxtFormatInfo &rInf );
inline bool IsFilled() const { return 0 != cFill; }
inline KSHORT 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;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -59,7 +59,7 @@ public:
inline SwTabLeftPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0', bool bAutoTab = true )
: SwTabPortion( nTabPosVal, cFillChar, bAutoTab )
{ SetWhichPor( POR_TABLEFT ); }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -72,7 +72,7 @@ public:
inline SwTabRightPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' )
: SwTabPortion( nTabPosVal, cFillChar )
{ SetWhichPor( POR_TABRIGHT ); }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -85,7 +85,7 @@ public:
inline SwTabCenterPortion( const KSHORT nTabPosVal, const sal_Unicode cFillChar='\0' )
: SwTabPortion( nTabPosVal, cFillChar )
{ SetWhichPor( POR_TABCENTER ); }
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -122,7 +122,7 @@ public:
return mnWidthOfPortionsUpTpDecimalPosition;
}
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -136,7 +136,7 @@ public:
const sal_Unicode cFillChar = '\0' )
: SwTabDecimalPortion( nTabPosVal, cTab, cFillChar )
{ SetLen( 0 ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index dc4db1a7068b..9d86686a5a07 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -30,8 +30,8 @@ class SwToxPortion : public SwTxtPortion
{
public:
inline SwToxPortion(){ SetWhichPor( POR_TOX ); }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- OUTPUT_OPERATOR
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ OUTPUT_OPERATOR_OVERRIDE
};
/*************************************************************************
@@ -44,15 +44,15 @@ class SwIsoToxPortion : public SwToxPortion
public:
SwIsoToxPortion();
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual SwLinePortion *Compress();
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
};
#endif
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 1ec658a9c9c2..2a9b275c3bcc 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -39,13 +39,13 @@ class SwTxtPortion : public SwLinePortion
public:
inline SwTxtPortion(){ SetWhichPor( POR_TXT ); }
SwTxtPortion( const SwLinePortion &rPortion );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void FormatEOL( SwTxtFormatInfo &rInf );
- virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void FormatEOL( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual sal_Int32 GetCrsrOfst( const KSHORT nOfst ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual long CalcSpacing( long nSpaceAdd, const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
// Counts the spaces for justified paragraph
sal_Int32 GetSpaceCnt( const SwTxtSizeInfo &rInf, sal_Int32& rCnt ) const;
@@ -53,9 +53,9 @@ public:
bool CreateHyphen( SwTxtFormatInfo &rInf, SwTxtGuess &rGuess );
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
DECL_FIXEDMEMPOOL_NEWDEL(SwTxtPortion)
};
@@ -64,11 +64,11 @@ class SwTxtInputFldPortion : public SwTxtPortion
public:
SwTxtInputFldPortion();
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const;
- virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const;
- virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual KSHORT GetViewWidth( const SwTxtSizeInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool GetExpTxt( const SwTxtSizeInfo &rInf, OUString &rTxt ) const SAL_OVERRIDE;
+ virtual SwPosSize GetTxtSize( const SwTxtSizeInfo &rInfo ) const SAL_OVERRIDE;
private:
bool mbContainsInputFieldStart;
@@ -87,14 +87,14 @@ public:
SwHolePortion( const SwTxtPortion &rPor );
inline KSHORT GetBlankWidth( ) const { return nBlankWidth; }
inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; }
- virtual SwLinePortion *Compress();
- virtual bool Format( SwTxtFormatInfo &rInf );
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
+ virtual SwLinePortion *Compress() SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
// Accessibility: pass information about this portion to the PortionHandler
- virtual void HandlePortion( SwPortionHandler& rPH ) const;
+ virtual void HandlePortion( SwPortionHandler& rPH ) const SAL_OVERRIDE;
- OUTPUT_OPERATOR
+ OUTPUT_OPERATOR_OVERRIDE
DECL_FIXEDMEMPOOL_NEWDEL(SwHolePortion)
};
@@ -103,8 +103,8 @@ class SwFieldMarkPortion : public SwTxtPortion
public:
inline SwFieldMarkPortion() : SwTxtPortion()
{ }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
};
class SwFieldFormPortion : public SwTxtPortion
@@ -112,8 +112,8 @@ class SwFieldFormPortion : public SwTxtPortion
public:
inline SwFieldFormPortion() : SwTxtPortion()
{ }
- virtual void Paint( const SwTxtPaintInfo &rInf ) const;
- virtual bool Format( SwTxtFormatInfo &rInf );
+ virtual void Paint( const SwTxtPaintInfo &rInf ) const SAL_OVERRIDE;
+ virtual bool Format( SwTxtFormatInfo &rInf ) SAL_OVERRIDE;
};
#endif
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index 021f5e040ac0..aca6c89025d6 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -46,7 +46,7 @@ class SwTxtLineAccess : public SwCacheAccess
{
protected:
- virtual SwCacheObj *NewObj();
+ virtual SwCacheObj *NewObj() SAL_OVERRIDE;
public:
SwTxtLineAccess( const SwTxtFrm *pOwner );
@@ -55,7 +55,7 @@ public:
inline SwTxtLine &GetTxtLine();
- virtual bool IsAvailable() const;
+ virtual bool IsAvailable() const SAL_OVERRIDE;
};
inline SwTxtLine &SwTxtLineAccess::GetTxtLine()
diff --git a/sw/source/core/text/xmldump.cxx b/sw/source/core/text/xmldump.cxx
index 7400d8de6ab7..54c066bf98f6 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_uInt16 nLength,
sal_uInt16 nType,
sal_Int32 nHeight,
- sal_Int32 nWidth)
+ sal_Int32 nWidth) SAL_OVERRIDE
{
ofs += nLength;
xmlTextWriterStartElement( writer, BAD_CAST( "Text" ) );
@@ -150,7 +150,7 @@ class XmlPortionDumper:public SwPortionHandler
const OUString & rText,
sal_uInt16 nType,
sal_Int32 nHeight,
- sal_Int32 nWidth )
+ sal_Int32 nWidth ) SAL_OVERRIDE
{
xmlTextWriterStartElement( writer, BAD_CAST( "Special" ) );
xmlTextWriterWriteFormatAttribute( writer,
@@ -175,7 +175,7 @@ class XmlPortionDumper:public SwPortionHandler
ofs += nLength;
}
- virtual void LineBreak( KSHORT nWidth )
+ virtual void LineBreak( KSHORT nWidth ) SAL_OVERRIDE
{
xmlTextWriterStartElement( writer, BAD_CAST( "LineBreak" ) );
if (nWidth > 0)
@@ -189,7 +189,7 @@ class XmlPortionDumper:public SwPortionHandler
* @param nLength
* number of 'model string' characters to be skipped
*/
- virtual void Skip( sal_uInt16 nLength )
+ virtual void Skip( sal_uInt16 nLength ) SAL_OVERRIDE
{
xmlTextWriterStartElement( writer, BAD_CAST( "Skip" ) );
xmlTextWriterWriteFormatAttribute( writer,
@@ -199,7 +199,7 @@ class XmlPortionDumper:public SwPortionHandler
ofs += nLength;
}
- virtual void Finish( )
+ virtual void Finish( ) SAL_OVERRIDE
{
xmlTextWriterStartElement( writer, BAD_CAST( "Finish" ) );
xmlTextWriterEndElement( writer );