summaryrefslogtreecommitdiff
path: root/sw/inc/paratr.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/inc/paratr.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/inc/paratr.hxx')
-rw-r--r--sw/inc/paratr.hxx34
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 67da97977320..b570e9cc7b7e 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -71,20 +71,20 @@ private:
SwFormatDrop & operator= (const SwFormatDrop &) = delete;
protected:
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
+ virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) override;
public:
/// "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;
inline sal_uInt8 GetLines() const { return nLines; }
inline sal_uInt8 &GetLines() { return nLines; }
@@ -102,7 +102,7 @@ public:
inline SwCharFormat *GetCharFormat() { return static_cast<SwCharFormat*>(GetRegisteredIn()); }
void SetCharFormat( SwCharFormat *pNew );
/// Get information from Client.
- virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool GetInfo( SfxPoolItem& ) const override;
/// Get and set Modify pointer.
inline const SwModify* GetDefinedIn() const { return pDefinedIn; }
@@ -121,12 +121,12 @@ public:
inline SwRegisterItem& operator=( const SwRegisterItem& rRegister );
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_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;
+ const IntlWrapper* pIntl = 0 ) const override;
};
inline SwRegisterItem::SwRegisterItem( const bool bRegister ) :
@@ -158,18 +158,18 @@ public:
{ SetValue( rCpy.GetValue() ); return *this; }
/// "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;
+ const IntlWrapper* pIntl = 0 ) const override;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const override;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
+ void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
class SwParaConnectBorderItem : public SfxBoolItem
@@ -183,12 +183,12 @@ public:
inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect );
/// "pure virtual methods" of SfxPoolItem
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_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;
+ const IntlWrapper* pIntl = 0 ) const override;
};
inline SwParaConnectBorderItem::SwParaConnectBorderItem( const bool bConnect ) :