summaryrefslogtreecommitdiff
path: root/include/svx/rulritem.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 /include/svx/rulritem.hxx
parentb08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff)
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'include/svx/rulritem.hxx')
-rw-r--r--include/svx/rulritem.hxx50
1 files changed, 25 insertions, 25 deletions
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 42863867fd60..e308079805a2 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -31,16 +31,16 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
protected:
- virtual bool operator==( const SfxPoolItem& ) 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;
+ virtual bool operator==( const SfxPoolItem& ) 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;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+ OUString &rText, const IntlWrapper * = 0 ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
private:
const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &) = delete;
@@ -64,16 +64,16 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
protected:
- virtual bool operator==( const SfxPoolItem& ) 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;
+ virtual bool operator==( const SfxPoolItem& ) 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;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+ OUString &rText, const IntlWrapper * = 0 ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
private:
const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &) = delete;
@@ -96,16 +96,16 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem
long lWidth;
long lHeight;
protected:
- virtual bool operator==( const SfxPoolItem& ) 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;
+ virtual bool operator==( const SfxPoolItem& ) 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;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+ OUString &rText, const IntlWrapper * = 0 ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const override;
private:
const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &) = delete;
@@ -166,17 +166,17 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
bool bOrtho; // evenly spread columns
protected:
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
OUString &rText,
- const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+ const IntlWrapper * = 0 ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 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;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 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;
public:
TYPEINFO_OVERRIDE();
@@ -222,16 +222,16 @@ private:
bool bLimits; /* boundary limit control by the application */
protected:
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual bool operator==( const SfxPoolItem& ) const override;
virtual bool GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
- OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
+ OUString &rText, const IntlWrapper * = 0 ) const override;
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 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;
+ virtual SfxPoolItem* Clone( SfxItemPool *pPool = 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;
private:
const SvxObjectItem &operator=(const SvxObjectItem &) = delete;