diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
| commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
| tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sw/inc/usrfld.hxx | |
| parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) | |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sw/inc/usrfld.hxx')
| -rw-r--r-- | sw/inc/usrfld.hxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index bc2a484fb51f..ef4c88d0dfbf 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -38,8 +38,8 @@ class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType public: SwUserFieldType( SwDoc* pDocPtr, const OUString& ); - virtual OUString GetName() const; - virtual SwFieldType* Copy() const; + virtual OUString GetName() const SAL_OVERRIDE; + virtual SwFieldType* Copy() const SAL_OVERRIDE; OUString Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng); @@ -59,11 +59,11 @@ public: bool IsDeleted() const { return bDeleted; } void SetDeleted( bool b ) { bDeleted = b; } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) SAL_OVERRIDE; protected: - virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ); + virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE; }; inline bool SwUserFieldType::IsValid() const @@ -91,28 +91,28 @@ class SW_DLLPUBLIC SwUserField : public SwValueField { sal_uInt16 nSubType; - virtual OUString Expand() const; - virtual SwField* Copy() const; + virtual OUString Expand() const SAL_OVERRIDE; + virtual SwField* Copy() const SAL_OVERRIDE; public: SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFmt = 0); - virtual sal_uInt16 GetSubType() const; - virtual void SetSubType(sal_uInt16 nSub); + virtual sal_uInt16 GetSubType() const SAL_OVERRIDE; + virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE; - virtual double GetValue() const; - virtual void SetValue( const double& rVal ); + virtual double GetValue() const SAL_OVERRIDE; + virtual void SetValue( const double& rVal ) SAL_OVERRIDE; - virtual OUString GetFieldName() const; + virtual OUString GetFieldName() const SAL_OVERRIDE; // Name cannot be changed. - virtual OUString GetPar1() const; + virtual OUString GetPar1() const SAL_OVERRIDE; // Content. - virtual OUString GetPar2() const; - virtual void SetPar2(const OUString& rStr); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); + virtual OUString GetPar2() const SAL_OVERRIDE; + virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) SAL_OVERRIDE; }; #endif // INCLUDED_SW_INC_USRFLD_HXX |