summaryrefslogtreecommitdiffstats
path: root/sd/inc/sdattr.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 /sd/inc/sdattr.hxx
parentHAVE_CXX11_OVERRIDE is required on all supported toolchains (diff)
downloadcore-b36963c0a6a09f70ca6d8d607dd3249a3496497d.tar.gz
core-b36963c0a6a09f70ca6d8d607dd3249a3496497d.zip
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sd/inc/sdattr.hxx')
-rw-r--r--sd/inc/sdattr.hxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/sd/inc/sdattr.hxx b/sd/inc/sdattr.hxx
index 570ef7d9bde8..2acf16b8889d 100644
--- a/sd/inc/sdattr.hxx
+++ b/sd/inc/sdattr.hxx
@@ -90,9 +90,9 @@ public:
DiaEffectItem( ::com::sun::star::presentation::FadeEffect eFade = com::sun::star::presentation::FadeEffect_NONE );
DiaEffectItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE;
- sal_uInt16 GetValueCount() const SAL_OVERRIDE { return FADE_EFFECT_COUNT; }
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override;
+ sal_uInt16 GetValueCount() const override { return FADE_EFFECT_COUNT; }
};
class DiaSpeedItem : public SfxEnumItem
@@ -102,9 +102,9 @@ public:
DiaSpeedItem( FadeSpeed = FADE_SPEED_MEDIUM );
DiaSpeedItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE;
- sal_uInt16 GetValueCount() const SAL_OVERRIDE { return FADE_SPEED_COUNT; }
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override;
+ sal_uInt16 GetValueCount() const override { return FADE_SPEED_COUNT; }
};
class DiaAutoItem : public SfxEnumItem
@@ -114,9 +114,9 @@ public:
DiaAutoItem( PresChange = PRESCHANGE_MANUAL );
DiaAutoItem( SvStream& rIn );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE;
- sal_uInt16 GetValueCount() const SAL_OVERRIDE { return PRESCHANGE_COUNT; }
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const override;
+ sal_uInt16 GetValueCount() const override { return PRESCHANGE_COUNT; }
};
class DiaTimeItem : public SfxUInt32Item
@@ -125,8 +125,8 @@ public:
TYPEINFO_OVERRIDE();
DiaTimeItem( sal_uInt32 nValue = 0L );
- virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
+ virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const override;
+ virtual bool operator==( const SfxPoolItem& ) const override;
};
#endif // INCLUDED_SD_INC_SDATTR_HXX