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 /sd/source/ui/inc/optsitem.hxx | |
parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sd/source/ui/inc/optsitem.hxx')
-rw-r--r-- | sd/source/ui/inc/optsitem.hxx | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index e0fe1a4330d4..c55ac3080461 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -43,14 +43,14 @@ private: const SdOptionsGeneric& mrParent; - virtual void ImplCommit() SAL_OVERRIDE; + virtual void ImplCommit() override; public: SdOptionsItem( const SdOptionsGeneric& rParent, const OUString& rSubTree ); virtual ~SdOptionsItem(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) override; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetProperties( const ::com::sun::star::uno::Sequence< OUString >& rNames ); @@ -113,9 +113,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; public: SdOptionsLayout( sal_uInt16 nConfigId, bool bUseConfig ); @@ -147,8 +147,8 @@ public: SdOptionsLayoutItem( sal_uInt16 nWhich); SdOptionsLayoutItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; void SetOptions( SdOptions* pOpts ) const; @@ -162,9 +162,9 @@ class SD_DLLPUBLIC SdOptionsContents : public SdOptionsGeneric private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; public: @@ -180,8 +180,8 @@ public: SdOptionsContentsItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; private: SdOptionsContents maOptionsContents; @@ -232,9 +232,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; public: @@ -323,8 +323,8 @@ public: SdOptionsMiscItem( sal_uInt16 nWhich); SdOptionsMiscItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; void SetOptions( SdOptions* pOpts ) const; @@ -351,9 +351,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; public: @@ -392,8 +392,8 @@ public: SdOptionsSnapItem( sal_uInt16 nWhich); SdOptionsSnapItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; void SetOptions( SdOptions* pOpts ) const; @@ -411,9 +411,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; public: @@ -430,9 +430,9 @@ class SdOptionsGrid : public SdOptionsGeneric, public SvxOptionsGrid { protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; public: @@ -502,9 +502,9 @@ private: protected: - virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const SAL_OVERRIDE; - virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) SAL_OVERRIDE; - virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const SAL_OVERRIDE; + virtual void GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const override; + virtual bool ReadData( const ::com::sun::star::uno::Any* pValues ) override; + virtual bool WriteData( ::com::sun::star::uno::Any* pValues ) const override; public: @@ -565,8 +565,8 @@ public: SdOptionsPrintItem( sal_uInt16 nWhich); SdOptionsPrintItem( sal_uInt16 nWhich, SdOptions* pOpts, ::sd::FrameView* pView = NULL ); - 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; void SetOptions( SdOptions* pOpts ) const; |