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 /rsc/inc/rscconst.hxx | |
| parent | b08247a12b43fcd9f86ecd912fce7d69a3e66061 (diff) | |
Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code
Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274
Diffstat (limited to 'rsc/inc/rscconst.hxx')
| -rw-r--r-- | rsc/inc/rscconst.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx index 201d3f2037a5..df2b16ff56d5 100644 --- a/rsc/inc/rscconst.hxx +++ b/rsc/inc/rscconst.hxx @@ -37,7 +37,7 @@ protected: public: RscConst( Atom nId, sal_uInt32 nTypId ); virtual ~RscConst(); - virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; + virtual RSCCLASS_TYPE GetClassType() const override; // sets the allowed values ERRTYPE SetConstant( Atom nVarName, sal_Int32 lValue ); bool GetConstValue( Atom nConstId, sal_Int32 * pVal ) const; @@ -55,29 +55,29 @@ class RscEnum : public RscConst sal_uInt32 nSize; public: RscEnum( Atom nId, sal_uInt32 nTypId ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE; - sal_uInt32 Size() SAL_OVERRIDE { return nSize; } + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) override; + sal_uInt32 Size() override { return nSize; } - virtual void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE + virtual void SetToDefault( const RSCINST & rInst ) override { reinterpret_cast<RscEnumInst*>(rInst.pData)->bDflt = true; } - bool IsDefault( const RSCINST & rInst ) SAL_OVERRIDE + bool IsDefault( const RSCINST & rInst ) override { return reinterpret_cast<RscEnumInst*>(rInst.pData)->bDflt; }; // sets as default - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) override; ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - sal_Int32 nValue ) SAL_OVERRIDE; - ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 nValue ) SAL_OVERRIDE; - ERRTYPE GetConst( const RSCINST & rInst, Atom * ) SAL_OVERRIDE; - ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * nValue ) SAL_OVERRIDE; + sal_Int32 nValue ) override; + ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 nValue ) override; + ERRTYPE GetConst( const RSCINST & rInst, Atom * ) override; + ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * nValue ) override; void WriteSrc( const RSCINST &rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; + RscTypCont * pTC, sal_uInt32 nTab, const char * ) override; ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; + RscTypCont * pTC, sal_uInt32, bool bExtra ) override; }; class RscNameTable; |