summaryrefslogtreecommitdiff
path: root/sw/source/core/text/porhyph.hxx
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/porhyph.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/source/core/text/porhyph.hxx')
-rw-r--r--sw/source/core/text/porhyph.hxx26
1 files changed, 13 insertions, 13 deletions
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
};