diff options
Diffstat (limited to 'include/svl')
34 files changed, 288 insertions, 288 deletions
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx index 7cd4e0bd8685..26e2a8b5b05c 100644 --- a/include/svl/aeitem.hxx +++ b/include/svl/aeitem.hxx @@ -47,14 +47,14 @@ public: void InsertValue( sal_uInt16 nValue, const OUString &rText ); void RemoveValue( sal_uInt16 nValue ); - sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const; - - virtual sal_uInt16 GetValueCount() const; - virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; - virtual bool IsEnabled( sal_uInt16 ) const; + sal_uInt16 GetPosByValue( sal_uInt16 nValue ) const SAL_OVERRIDE; + + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; + virtual sal_uInt16 GetValueByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE; + virtual bool IsEnabled( sal_uInt16 ) const SAL_OVERRIDE; void DisableValue( sal_uInt16 ); }; diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx index 31a97d909639..6d41420b295a 100644 --- a/include/svl/cenumitm.hxx +++ b/include/svl/cenumitm.hxx @@ -38,17 +38,17 @@ protected: public: TYPEINFO_OVERRIDE(); - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; - virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const; + virtual bool QueryValue(com::sun::star::uno::Any & rVal, sal_uInt8 = 0) const SAL_OVERRIDE; - virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 = 0); + virtual bool PutValue(const com::sun::star::uno::Any & rVal, sal_uInt8 = 0) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const = 0; diff --git a/include/svl/cintitem.hxx b/include/svl/cintitem.hxx index 77c3bde33d6d..b36571842aad 100644 --- a/include/svl/cintitem.hxx +++ b/include/svl/cintitem.hxx @@ -43,28 +43,28 @@ public: virtual ~CntByteItem() { DBG_DTOR(CntByteItem, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_uInt8 GetMin() const; @@ -105,28 +105,28 @@ public: virtual ~CntUInt16Item() { DBG_DTOR(CntUInt16Item, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_uInt16 GetMin() const; @@ -167,28 +167,28 @@ public: virtual ~CntInt32Item() { DBG_DTOR(CntInt32Item, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream &, sal_uInt16) const; + virtual SvStream & Store(SvStream &, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_Int32 GetMin() const; @@ -229,28 +229,28 @@ public: virtual ~CntUInt32Item() { DBG_DTOR(CntUInt32Item, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_uInt32 GetMin() const; diff --git a/include/svl/cntwall.hxx b/include/svl/cntwall.hxx index f9882b789303..4214c57228f7 100644 --- a/include/svl/cntwall.hxx +++ b/include/svl/cntwall.hxx @@ -43,17 +43,17 @@ public: CntWallpaperItem( const CntWallpaperItem& rCpy ); ~CntWallpaperItem(); - virtual sal_uInt16 GetVersion(sal_uInt16) const; + virtual sal_uInt16 GetVersion(sal_uInt16) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItemVersion ) const; - virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const SAL_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_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; void SetBitmapURL( const OUString& rURL ) { _aURL = rURL; } void SetColor( Color nColor ) { _nColor = nColor; } diff --git a/include/svl/ctypeitm.hxx b/include/svl/ctypeitm.hxx index fb68140f165e..b8315ab51994 100644 --- a/include/svl/ctypeitm.hxx +++ b/include/svl/ctypeitm.hxx @@ -38,30 +38,30 @@ public: CntContentTypeItem( const CntContentTypeItem& rOrig ); virtual SfxPoolItem* Create( SvStream& rStream, - sal_uInt16 nItemVersion ) const; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& rOrig ) const; + virtual bool operator==( const SfxPoolItem& rOrig ) const SAL_OVERRIDE; - virtual sal_uInt16 GetVersion(sal_uInt16) const; + virtual sal_uInt16 GetVersion(sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = NULL ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = NULL ) const SAL_OVERRIDE; void SetValue( const OUString& rNewVal ); using SfxPoolItem::Compare; - virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const; + virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, - const IntlWrapper* pIntlWrapper = 0 ) const; + const IntlWrapper* pIntlWrapper = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; INetContentType GetEnumValue() const; diff --git a/include/svl/custritm.hxx b/include/svl/custritm.hxx index 052381ea9e9a..da5fe7ceb420 100644 --- a/include/svl/custritm.hxx +++ b/include/svl/custritm.hxx @@ -47,26 +47,26 @@ public: virtual ~CntUnencodedStringItem() { DBG_DTOR(CntUnencodedStringItem, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual int Compare(SfxPoolItem const & rWith, - IntlWrapper const & rIntlWrapper) const; + IntlWrapper const & rIntlWrapper) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue(com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0) const; + sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; virtual bool PutValue(const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0); + sal_uInt8 nMemberId = 0) SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; const OUString & GetValue() const { return m_aValue; } diff --git a/include/svl/flagitem.hxx b/include/svl/flagitem.hxx index 7494c01f410b..4286608f4ebd 100644 --- a/include/svl/flagitem.hxx +++ b/include/svl/flagitem.hxx @@ -42,16 +42,16 @@ public: virtual sal_uInt8 GetFlagCount() const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString & rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; sal_uInt16 GetValue() const { return nVal; } void SetValue( sal_uInt16 nNewVal ) { DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" ); diff --git a/include/svl/globalnameitem.hxx b/include/svl/globalnameitem.hxx index 461cee61b8e8..764bf0e15b55 100644 --- a/include/svl/globalnameitem.hxx +++ b/include/svl/globalnameitem.hxx @@ -34,14 +34,14 @@ public: SfxGlobalNameItem( sal_uInt16 nWhich, const SvGlobalName& ); ~SfxGlobalNameItem(); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; SvGlobalName GetValue() const { return m_aName; } virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx index 13f253299378..0d70b9662cb5 100644 --- a/include/svl/grabbagitem.hxx +++ b/include/svl/grabbagitem.hxx @@ -32,11 +32,11 @@ public: const std::map<OUString, com::sun::star::uno::Any>& GetGrabBag() const; - virtual bool operator==(const SfxPoolItem&) const; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; + virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; - virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0); - virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const; + virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) SAL_OVERRIDE; + virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/ilstitem.hxx b/include/svl/ilstitem.hxx index fd351a3ec79c..1f581f363409 100644 --- a/include/svl/ilstitem.hxx +++ b/include/svl/ilstitem.hxx @@ -45,10 +45,10 @@ public: void GetList( ::std::vector < sal_Int32 >& rList ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool PutValue ( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; }; #endif // INCLUDED_SVL_ILSTITEM_HXX diff --git a/include/svl/imageitm.hxx b/include/svl/imageitm.hxx index 57d84b8ef1a4..3e9f916b0b89 100644 --- a/include/svl/imageitm.hxx +++ b/include/svl/imageitm.hxx @@ -33,10 +33,10 @@ public: SfxImageItem( const SfxImageItem& ); virtual ~SfxImageItem(); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + 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 = 0 ) SAL_OVERRIDE; void SetRotation( long nValue ); long GetRotation() const; diff --git a/include/svl/instrm.hxx b/include/svl/instrm.hxx index 06988a8bafcf..149b0f74059a 100644 --- a/include/svl/instrm.hxx +++ b/include/svl/instrm.hxx @@ -43,15 +43,15 @@ class SVL_DLLPUBLIC SvInputStream: public SvStream SVL_DLLPRIVATE bool open(); - SVL_DLLPRIVATE virtual sal_uLong GetData(void * pData, sal_uLong nSize); + SVL_DLLPRIVATE virtual sal_uLong GetData(void * pData, sal_uLong nSize) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual sal_uLong PutData(void const *, sal_uLong); + SVL_DLLPRIVATE virtual sal_uLong PutData(void const *, sal_uLong) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong nPos); + SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong nPos) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual void FlushData(); + SVL_DLLPRIVATE virtual void FlushData() SAL_OVERRIDE; - SVL_DLLPRIVATE virtual void SetSize(sal_uLong); + SVL_DLLPRIVATE virtual void SetSize(sal_uLong) SAL_OVERRIDE; public: SvInputStream( @@ -61,7 +61,7 @@ public: virtual ~SvInputStream(); - virtual sal_uInt16 IsA() const; + virtual sal_uInt16 IsA() const SAL_OVERRIDE; virtual void AddMark(sal_uLong nPos); diff --git a/include/svl/int64item.hxx b/include/svl/int64item.hxx index 2d6fd676417a..06876e63d7dc 100644 --- a/include/svl/int64item.hxx +++ b/include/svl/int64item.hxx @@ -24,26 +24,26 @@ public: virtual ~SfxInt64Item(); - virtual bool operator== ( const SfxPoolItem& rItem ) const; + virtual bool operator== ( const SfxPoolItem& rItem ) const SAL_OVERRIDE; - virtual int Compare( const SfxPoolItem& r ) const; - virtual int Compare( const SfxPoolItem& r, const IntlWrapper& rIntlWrapper ) const; + virtual int Compare( const SfxPoolItem& r ) const SAL_OVERRIDE; + virtual int Compare( const SfxPoolItem& r, const IntlWrapper& rIntlWrapper ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation, SfxMapUnit, SfxMapUnit, - OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const; + OUString& rText, const IntlWrapper* pIntlWrapper = NULL ) const SAL_OVERRIDE; virtual bool QueryValue( - com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + 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 = 0 ); + const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const; + virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool* pOther = NULL ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pOther = NULL ) const SAL_OVERRIDE; sal_Int64 GetValue() const; diff --git a/include/svl/intitem.hxx b/include/svl/intitem.hxx index 06b6fdd06aa9..0aa876042f75 100644 --- a/include/svl/intitem.hxx +++ b/include/svl/intitem.hxx @@ -32,9 +32,9 @@ public: explicit SfxByteItem(sal_uInt16 which = 0, sal_uInt8 nValue = 0): CntByteItem(which, nValue) {} - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE { return new SfxByteItem(*this); } }; @@ -60,28 +60,28 @@ public: virtual ~SfxInt16Item() { DBG_DTOR(SfxInt16Item, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_Int16 GetMin() const; @@ -112,10 +112,10 @@ public: SfxUInt16Item(sal_uInt16 which, SvStream & rStream): CntUInt16Item(which, rStream) {} - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE { return new SfxUInt16Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE { return new SfxUInt16Item(*this); } }; @@ -131,10 +131,10 @@ public: SfxInt32Item(sal_uInt16 which, SvStream & rStream): CntInt32Item(which, rStream) {} - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE { return new SfxInt32Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE { return new SfxInt32Item(*this); } }; @@ -151,10 +151,10 @@ public: SfxUInt32Item(sal_uInt16 which, SvStream & rStream): CntUInt32Item(which, rStream) {} - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE { return new SfxUInt32Item(Which(), rStream); } - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE { return new SfxUInt32Item(*this); } }; diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index d1071b1644db..37d2d12addb3 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -164,16 +164,16 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -188,15 +188,15 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties( ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 18298f2216a8..a05b33cdce11 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -170,8 +170,8 @@ public: SfxAllItemSet( const SfxItemSet & ); SfxAllItemSet( const SfxAllItemSet & ); - virtual SfxItemSet * Clone( sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0 ) const; - virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ); + virtual SfxItemSet * Clone( sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0 ) const SAL_OVERRIDE; + virtual const SfxPoolItem* Put( const SfxPoolItem&, sal_uInt16 nWhich ) SAL_OVERRIDE; using SfxItemSet::Put; }; diff --git a/include/svl/languageoptions.hxx b/include/svl/languageoptions.hxx index a05b978aade5..a804ad82594a 100644 --- a/include/svl/languageoptions.hxx +++ b/include/svl/languageoptions.hxx @@ -104,8 +104,8 @@ public: SvtSystemLanguageOptions(); ~SvtSystemLanguageOptions(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; LanguageType GetWin16SystemLanguage() const; diff --git a/include/svl/lckbitem.hxx b/include/svl/lckbitem.hxx index 1d6fa4caa98b..748deba0d986 100644 --- a/include/svl/lckbitem.hxx +++ b/include/svl/lckbitem.hxx @@ -35,17 +35,17 @@ public: SfxLockBytesItem( const SfxLockBytesItem& ); ~SfxLockBytesItem(); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; SvLockBytes* GetValue() const { return _xVal; } virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/macitem.hxx b/include/svl/macitem.hxx index 3cd42c4ccaa4..9b3d7eef812e 100644 --- a/include/svl/macitem.hxx +++ b/include/svl/macitem.hxx @@ -137,16 +137,16 @@ public: explicit inline SvxMacroItem ( const sal_uInt16 nId ); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; inline const SvxMacroTableDtor& GetMacroTable() const { return aMacroTable;} inline void SetMacroTable( const SvxMacroTableDtor& rTbl ) { aMacroTable = rTbl; } diff --git a/include/svl/metitem.hxx b/include/svl/metitem.hxx index 73ba594286b2..9bd5eb11a8ed 100644 --- a/include/svl/metitem.hxx +++ b/include/svl/metitem.hxx @@ -36,8 +36,8 @@ public: ~SfxMetricItem() { DBG_DTOR(SfxMetricItem, 0); } - virtual bool ScaleMetrics( long lMult, long lDiv ); - virtual bool HasMetrics() const; + virtual bool ScaleMetrics( long lMult, long lDiv ) SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; }; diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx index 6b3b5cc9c474..9a24568d4eb6 100644 --- a/include/svl/numuno.hxx +++ b/include/svl/numuno.hxx @@ -69,15 +69,15 @@ public: // XNumberFormatsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static const com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId(); static SvNumberFormatsSupplierObj* getImplementation( const com::sun::star::uno::Reference< diff --git a/include/svl/outstrm.hxx b/include/svl/outstrm.hxx index 450bde03f24c..8ab49a6d1da3 100644 --- a/include/svl/outstrm.hxx +++ b/include/svl/outstrm.hxx @@ -34,15 +34,15 @@ class SVL_DLLPUBLIC SvOutputStream: public SvStream com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > m_xStream; - SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong); + SVL_DLLPRIVATE virtual sal_uLong GetData(void *, sal_uLong) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual sal_uLong PutData(void const * pData, sal_uLong nSize); + SVL_DLLPRIVATE virtual sal_uLong PutData(void const * pData, sal_uLong nSize) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong); + SVL_DLLPRIVATE virtual sal_uLong SeekPos(sal_uLong) SAL_OVERRIDE; - SVL_DLLPRIVATE virtual void FlushData(); + SVL_DLLPRIVATE virtual void FlushData() SAL_OVERRIDE; - SVL_DLLPRIVATE virtual void SetSize(sal_uLong); + SVL_DLLPRIVATE virtual void SetSize(sal_uLong) SAL_OVERRIDE; public: SvOutputStream(com::sun::star::uno::Reference< @@ -51,7 +51,7 @@ public: virtual ~SvOutputStream(); - virtual sal_uInt16 IsA() const; + virtual sal_uInt16 IsA() const SAL_OVERRIDE; }; #endif // INCLUDED_SVL_OUTSTRM_HXX diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx index 03de6889afb0..5d74e506897d 100644 --- a/include/svl/poolitem.hxx +++ b/include/svl/poolitem.hxx @@ -338,16 +338,16 @@ public: SfxVoidItem( const SfxVoidItem& ); ~SfxVoidItem(); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; // von sich selbst eine Kopie erzeugen - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; void SetWhich(sal_uInt16 nWh) { m_nWhich = nWh; } }; @@ -366,18 +366,18 @@ public: SfxSetItem( const SfxSetItem&, SfxItemPool *pPool = 0 ); ~SfxSetItem(); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; // von sich selbst eine Kopie erzeugen - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const = 0; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const = 0; - virtual SvStream& Store(SvStream &, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE = 0; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE = 0; + virtual SvStream& Store(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE; const SfxItemSet& GetItemSet() const { return *pSet; } diff --git a/include/svl/ptitem.hxx b/include/svl/ptitem.hxx index 30f907cdb3a5..22ee52b36ea4 100644 --- a/include/svl/ptitem.hxx +++ b/include/svl/ptitem.hxx @@ -45,13 +45,13 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; const Point& GetValue() const { return aVal; } void SetValue( const Point& rNewVal ) { @@ -60,9 +60,9 @@ public: } virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/svl/rectitem.hxx b/include/svl/rectitem.hxx index ad4523341c66..9b41539ec987 100644 --- a/include/svl/rectitem.hxx +++ b/include/svl/rectitem.hxx @@ -46,12 +46,12 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; const Rectangle& GetValue() const { return aVal; } void SetValue( const Rectangle& rNewVal ) { @@ -59,9 +59,9 @@ public: aVal = rNewVal; } virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/svl/rngitem.hxx b/include/svl/rngitem.hxx index 7e4d2137df80..7f5b17c618c1 100644 --- a/include/svl/rngitem.hxx +++ b/include/svl/rngitem.hxx @@ -37,20 +37,20 @@ public: SfxRangeItem(); SfxRangeItem( sal_uInt16 nWID, sal_uInt16 nFrom, sal_uInt16 nTo ); SfxRangeItem( const SfxRangeItem& rItem ); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; inline sal_uInt16& From() { return nFrom; } inline sal_uInt16 From() const { return nFrom; } inline sal_uInt16& To() { return nTo; } inline sal_uInt16 To() const { return nTo; } inline bool HasRange() const { return nTo>nFrom; } - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; @@ -66,16 +66,16 @@ public: SfxUShortRangesItem( sal_uInt16 nWID, SvStream &rStream ); SfxUShortRangesItem( const SfxUShortRangesItem& rItem ); virtual ~SfxUShortRangesItem(); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; inline const sal_uInt16* GetRanges() const { return _pRanges; } - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/slstitm.hxx b/include/svl/slstitm.hxx index 67868d546fb5..c3d60f080ca3 100644 --- a/include/svl/slstitm.hxx +++ b/include/svl/slstitm.hxx @@ -53,20 +53,20 @@ public: void SetStringList( const com::sun::star::uno::Sequence< OUString >& rList ); void GetStringList( com::sun::star::uno::Sequence< OUString >& rList ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual bool PutValue ( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svl/srchitem.hxx b/include/svl/srchitem.hxx index 0eb0edd139db..3a681afc546c 100644 --- a/include/svl/srchitem.hxx +++ b/include/svl/srchitem.hxx @@ -81,18 +81,18 @@ public: SvxSearchItem( const SvxSearchItem& rItem ); virtual ~SvxSearchItem(); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual bool operator == ( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + 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 = 0 ) SAL_OVERRIDE; + virtual bool operator == ( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; // ConfigItem - virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ); - virtual void Commit(); + virtual void Notify( const com::sun::star::uno::Sequence< OUString > &rPropertyNames ) SAL_OVERRIDE; + virtual void Commit() SAL_OVERRIDE; sal_uInt16 GetCommand() const { return nCommand; } void SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; } diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx index 00e4765553ae..8e3f0614b145 100644 --- a/include/svl/stritem.hxx +++ b/include/svl/stritem.hxx @@ -36,11 +36,11 @@ public: SfxStringItem(sal_uInt16 nWhich, SvStream & rStream); - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; }; #endif // INCLUDED_SVL_STRITEM_HXX diff --git a/include/svl/strmadpt.hxx b/include/svl/strmadpt.hxx index 9d4797f8aa6f..7117a6e54e5a 100644 --- a/include/svl/strmadpt.hxx +++ b/include/svl/strmadpt.hxx @@ -43,25 +43,25 @@ public: rTheOutputStream): m_xOutputStream(rTheOutputStream), m_nPosition(0) {} - virtual ErrCode ReadAt(sal_uLong, void *, sal_uLong, sal_uLong *) const; + virtual ErrCode ReadAt(sal_uLong, void *, sal_uLong, sal_uLong *) const SAL_OVERRIDE; virtual ErrCode WriteAt(sal_uLong nPos, const void * pBuffer, sal_uLong nCount, - sal_uLong * pWritten); + sal_uLong * pWritten) SAL_OVERRIDE; - virtual ErrCode Flush() const; + virtual ErrCode Flush() const SAL_OVERRIDE; - virtual ErrCode SetSize(sal_uLong); + virtual ErrCode SetSize(sal_uLong) SAL_OVERRIDE; - virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const; + virtual ErrCode Stat(SvLockBytesStat * pStat, SvLockBytesStatFlag) const SAL_OVERRIDE; virtual ErrCode FillAppend(const void * pBuffer, sal_uLong nCount, - sal_uLong * pWritten); + sal_uLong * pWritten) SAL_OVERRIDE; - virtual sal_uLong Tell() const; + virtual sal_uLong Tell() const SAL_OVERRIDE; - virtual sal_uLong Seek(sal_uLong); + virtual sal_uLong Seek(sal_uLong) SAL_OVERRIDE; - virtual void Terminate(); + virtual void Terminate() SAL_OVERRIDE; }; @@ -78,48 +78,48 @@ public: virtual com::sun::star::uno::Any SAL_CALL queryInterface(const com::sun::star::uno::Type & rType) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL release() throw() SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData, sal_Int32 nBytesToRead) throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes(com::sun::star::uno::Sequence< sal_Int8 > & rData, sal_Int32 nMaxBytesToRead) throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available() throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput() throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL seek(sal_Int64 nLocation) throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getPosition() throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int64 SAL_CALL getLength() throw (com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_SVL_STRMADPT_HXX diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 026f0d05bc10..5d2174f431df 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -290,11 +290,11 @@ public: SfxStyleSheet( const OUString&, const SfxStyleSheetBasePool&, SfxStyleFamily, sal_uInt16 ); SfxStyleSheet( const SfxStyleSheet& ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; - virtual bool isUsedByModel() const; + virtual bool isUsedByModel() const SAL_OVERRIDE; - virtual bool SetParent( const OUString& ); + virtual bool SetParent( const OUString& ) SAL_OVERRIDE; protected: SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2 @@ -311,7 +311,7 @@ class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool { protected: using SfxStyleSheetBasePool::Create; - virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask); + virtual SfxStyleSheetBase* Create(const OUString&, SfxStyleFamily, sal_uInt16 mask) SAL_OVERRIDE; virtual SfxStyleSheetBase* Create(const SfxStyleSheet &); public: @@ -382,7 +382,7 @@ public: static SfxUnoStyleSheet* getUnoStyleSheet( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle ); // XUnoTunnel - virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: SfxUnoStyleSheet(); // not implemented diff --git a/include/svl/szitem.hxx b/include/svl/szitem.hxx index 1c50c00ec32d..dc8266bc06d3 100644 --- a/include/svl/szitem.hxx +++ b/include/svl/szitem.hxx @@ -45,17 +45,17 @@ public: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; const Size& GetValue() const { return aVal; } void SetValue( const Size& rNewVal ) { diff --git a/include/svl/undo.hxx b/include/svl/undo.hxx index 95538603a19c..0555ab4fd80d 100644 --- a/include/svl/undo.hxx +++ b/include/svl/undo.hxx @@ -167,18 +167,18 @@ class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra SfxListUndoAction( const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 Id, SfxUndoArray *pFather); - virtual void Undo(); - virtual void UndoWithContext( SfxUndoContext& i_context ); - virtual void Redo(); - virtual void RedoWithContext( SfxUndoContext& i_context ); - virtual void Repeat(SfxRepeatTarget&); - virtual bool CanRepeat(SfxRepeatTarget&) const; + virtual void Undo() SAL_OVERRIDE; + virtual void UndoWithContext( SfxUndoContext& i_context ) SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual void RedoWithContext( SfxUndoContext& i_context ) SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget&) SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget&) const SAL_OVERRIDE; - virtual bool Merge( SfxUndoAction *pNextAction ); + virtual bool Merge( SfxUndoAction *pNextAction ) SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual OUString GetRepeatComment(SfxRepeatTarget&) const; - virtual sal_uInt16 GetId() const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetRepeatComment(SfxRepeatTarget&) const SAL_OVERRIDE; + virtual sal_uInt16 GetId() const SAL_OVERRIDE; void SetComment(const OUString& rComment); @@ -347,36 +347,36 @@ public: virtual ~SfxUndoManager(); // IUndoManager overridables - virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ); - virtual size_t GetMaxUndoActionCount() const; - virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ); - virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const; - virtual sal_uInt16 GetUndoActionId() const; - virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; - virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const; - virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const; - virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; - virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const; - virtual bool Undo(); - virtual bool Redo(); - virtual void Clear(); - virtual void ClearRedo(); - virtual void Reset(); - virtual bool IsDoing() const; - virtual size_t GetRepeatActionCount() const; - virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const; - virtual bool Repeat( SfxRepeatTarget &rTarget ); - virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const; - virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0); - virtual size_t LeaveListAction(); - virtual size_t LeaveAndMergeListAction(); - virtual bool IsInListAction() const; - virtual size_t GetListActionDepth() const; - virtual void RemoveLastUndoAction(); - virtual void EnableUndo( bool bEnable ); - virtual bool IsUndoEnabled() const; - virtual void AddUndoListener( SfxUndoListener& i_listener ); - virtual void RemoveUndoListener( SfxUndoListener& i_listener ); + virtual void SetMaxUndoActionCount( size_t nMaxUndoActionCount ) SAL_OVERRIDE; + virtual size_t GetMaxUndoActionCount() const SAL_OVERRIDE; + virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) SAL_OVERRIDE; + virtual size_t GetUndoActionCount( bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual sal_uInt16 GetUndoActionId() const SAL_OVERRIDE; + virtual OUString GetUndoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual SfxUndoAction* GetUndoAction( size_t nNo=0 ) const SAL_OVERRIDE; + virtual size_t GetRedoActionCount( bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual OUString GetRedoActionComment( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual SfxUndoAction* GetRedoAction( size_t nNo=0, bool const i_currentLevel = CurrentLevel ) const SAL_OVERRIDE; + virtual bool Undo() SAL_OVERRIDE; + virtual bool Redo() SAL_OVERRIDE; + virtual void Clear() SAL_OVERRIDE; + virtual void ClearRedo() SAL_OVERRIDE; + virtual void Reset() SAL_OVERRIDE; + virtual bool IsDoing() const SAL_OVERRIDE; + virtual size_t GetRepeatActionCount() const SAL_OVERRIDE; + virtual OUString GetRepeatActionComment( SfxRepeatTarget &rTarget) const SAL_OVERRIDE; + virtual bool Repeat( SfxRepeatTarget &rTarget ) SAL_OVERRIDE; + virtual bool CanRepeat( SfxRepeatTarget &rTarget ) const SAL_OVERRIDE; + virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId=0) SAL_OVERRIDE; + virtual size_t LeaveListAction() SAL_OVERRIDE; + virtual size_t LeaveAndMergeListAction() SAL_OVERRIDE; + virtual bool IsInListAction() const SAL_OVERRIDE; + virtual size_t GetListActionDepth() const SAL_OVERRIDE; + virtual void RemoveLastUndoAction() SAL_OVERRIDE; + virtual void EnableUndo( bool bEnable ) SAL_OVERRIDE; + virtual bool IsUndoEnabled() const SAL_OVERRIDE; + virtual void AddUndoListener( SfxUndoListener& i_listener ) SAL_OVERRIDE; + virtual void RemoveUndoListener( SfxUndoListener& i_listener ) SAL_OVERRIDE; /** marks the current top-level element of the Undo stack, and returns a unique ID for it */ @@ -457,15 +457,15 @@ public: SfxLinkUndoAction(::svl::IUndoManager *pManager); ~SfxLinkUndoAction(); - virtual void Undo(); - virtual void Redo(); - virtual bool CanRepeat(SfxRepeatTarget& r) const; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; + virtual bool CanRepeat(SfxRepeatTarget& r) const SAL_OVERRIDE; - virtual void Repeat(SfxRepeatTarget&r); + virtual void Repeat(SfxRepeatTarget&r) SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual OUString GetRepeatComment(SfxRepeatTarget&r) const; - virtual sal_uInt16 GetId() const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetRepeatComment(SfxRepeatTarget&r) const SAL_OVERRIDE; + virtual sal_uInt16 GetId() const SAL_OVERRIDE; SfxUndoAction* GetAction() const { return pAction; } diff --git a/include/svl/visitem.hxx b/include/svl/visitem.hxx index 60bd4931790e..5fcc79fa247e 100644 --- a/include/svl/visitem.hxx +++ b/include/svl/visitem.hxx @@ -50,28 +50,28 @@ public: virtual ~SfxVisibilityItem() { DBG_DTOR(SfxVisibilityItem, 0); } - virtual bool operator ==(const SfxPoolItem & rItem) const; + virtual bool operator ==(const SfxPoolItem & rItem) const SAL_OVERRIDE; using SfxPoolItem::Compare; - virtual int Compare(const SfxPoolItem & rWith) const; + virtual int Compare(const SfxPoolItem & rWith) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation, SfxMapUnit, SfxMapUnit, OUString & rText, const IntlWrapper * = 0) - const; + const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const; + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SvStream & Store(SvStream & rStream, sal_uInt16) const; + virtual SvStream & Store(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE; - virtual SfxPoolItem * Clone(SfxItemPool * = 0) const; + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const; |