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/inc/fmtornt.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/inc/fmtornt.hxx')
| -rw-r--r-- | sw/inc/fmtornt.hxx | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx index 88b6d580bca8..714938e9fbc7 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -42,18 +42,18 @@ public: inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; + const IntlWrapper* pIntl = 0 ) const override; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; - SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE; - SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE; + SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const override; + SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const override; sal_Int16 GetVertOrient() const { return m_eOrient; } sal_Int16 GetRelationOrient() const { return m_eRelation; } @@ -63,7 +63,7 @@ public: SwTwips GetPos() const { return m_nYPos; } void SetPos( SwTwips nNew ) { m_nYPos = nNew; } - void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; + void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem @@ -79,15 +79,15 @@ public: inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy ); /// "Pure virtual methods" of SfxPoolItem. - virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const override; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override; virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; + const IntlWrapper* pIntl = 0 ) const override; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override; sal_Int16 GetHoriOrient() const { return m_eOrient; } sal_Int16 GetRelationOrient() const { return m_eRelation; } @@ -100,7 +100,7 @@ public: bool IsPosToggle() const { return m_bPosToggle; } void SetPosToggle( bool bNew ) { m_bPosToggle = bNew; } - void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE; + void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; inline SwFormatVertOrient &SwFormatVertOrient::operator=( const SwFormatVertOrient &rCpy ) |