diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sw/source/core/text/porrst.hxx | |
parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (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/porrst.hxx')
-rw-r--r-- | sw/source/core/text/porrst.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
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 |