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 /sw/inc/authfld.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'sw/inc/authfld.hxx')
| -rw-r--r-- | sw/inc/authfld.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 845bcc3c032c..4240f9bd5048 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -72,16 +72,16 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType OUString m_sSortAlgorithm; protected: -virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE; +virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; public: SwAuthorityFieldType(SwDoc* pDoc); virtual ~SwAuthorityFieldType(); - virtual SwFieldType* Copy() const SAL_OVERRIDE; + virtual SwFieldType* Copy() const 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; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) override; inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; } SwDoc* GetDoc(){ return m_pDoc; } @@ -148,8 +148,8 @@ class SwAuthorityField : public SwField sal_IntPtr m_nHandle; mutable sal_IntPtr m_nTempSequencePos; - virtual OUString Expand() const SAL_OVERRIDE; - virtual SwField* Copy() const SAL_OVERRIDE; + virtual OUString Expand() const override; + virtual SwField* Copy() const override; public: /// For internal use only, in general continue using ExpandField() instead. @@ -164,15 +164,15 @@ public: OUString GetFieldText(ToxAuthorityField eField) const; - virtual void SetPar1(const OUString& rStr) SAL_OVERRIDE; - virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE; + virtual void SetPar1(const OUString& rStr) override; + virtual SwFieldType* ChgTyp( SwFieldType* ) 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; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const override; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) override; sal_IntPtr GetHandle() const { return m_nHandle; } - virtual OUString GetDescription() const SAL_OVERRIDE; + virtual OUString GetDescription() const override; }; inline OUString SwAuthEntry::GetAuthorField(ToxAuthorityField ePos) const |