From 70cc2b191b95fbc210bc1f0f6a7159f341894f0f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 26 Mar 2014 16:37:00 +0100 Subject: First batch of adding SAL_OVERRRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a --- rsc/inc/rscarray.hxx | 38 ++++++++++++------------ rsc/inc/rscclass.hxx | 40 ++++++++++++------------- rsc/inc/rscclobj.hxx | 4 +-- rsc/inc/rscconst.hxx | 26 ++++++++--------- rsc/inc/rsccont.hxx | 54 +++++++++++++++++----------------- rsc/inc/rscflag.hxx | 34 +++++++++++----------- rsc/inc/rscmgr.hxx | 26 ++++++++--------- rsc/inc/rscrange.hxx | 82 ++++++++++++++++++++++++++-------------------------- rsc/inc/rscstr.hxx | 26 ++++++++--------- rsc/inc/rsctree.hxx | 8 ++--- 10 files changed, 169 insertions(+), 169 deletions(-) (limited to 'rsc') diff --git a/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx index a3ec217ba73a..d769d21e743b 100644 --- a/rsc/inc/rscarray.hxx +++ b/rsc/inc/rscarray.hxx @@ -34,7 +34,7 @@ public: RSCINST aInst; RscInstNode( sal_uInt32 nId ); ~RscInstNode(); - virtual sal_uInt32 GetId() const; + virtual sal_uInt32 GetId() const SAL_OVERRIDE; RscInstNode * Left() const { return (RscInstNode *)pLeft ; }; RscInstNode * Right() const{ return (RscInstNode *)pRight ; }; RscInstNode * Search( sal_uInt32 nId ) const @@ -64,34 +64,34 @@ public: RscArray( Atom nId, sal_uInt32 nTypId, RscTop * pSuper, RscEnum * pTypeClass ); ~RscArray(); - virtual RSCCLASS_TYPE GetClassType() const; + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; void SetTypeClass( RscEnum * pClass ) { pTypeClass = pClass; } - virtual RscTop * GetTypeClass() const; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ); - void Destroy( const RSCINST & rInst ); + virtual RscTop * GetTypeClass() const SAL_OVERRIDE; + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE; + void Destroy( const RSCINST & rInst ) SAL_OVERRIDE; virtual ERRTYPE GetValueEle( const RSCINST & rInst, sal_Int32 lValue, RscTop * pCreateClass, - RSCINST * pGetInst ); + RSCINST * pGetInst ) SAL_OVERRIDE; virtual ERRTYPE GetArrayEle( const RSCINST & rInst, Atom nId, RscTop * pCreateClass, - RSCINST * pGetInst ); + RSCINST * pGetInst ) SAL_OVERRIDE; // Gibt die Groesse der Klasse in Bytes - sal_uInt32 Size(){ return nSize; } + sal_uInt32 Size() SAL_OVERRIDE { return nSize; } - bool IsConsistent( const RSCINST & rInst ); - virtual void SetToDefault( const RSCINST & rInst ); - bool IsDefault( const RSCINST & rInst ); - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + bool IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE; + virtual void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE; + bool IsDefault( const RSCINST & rInst ) SAL_OVERRIDE; + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, - const RscId & aId, const char * ); + const RscId & aId, const char * ) SAL_OVERRIDE; void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; class RscClassArray : public RscArray @@ -102,12 +102,12 @@ public: ~RscClassArray(); virtual void WriteSrcHeader( const RSCINST & rInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, - const RscId & aId, const char * ); + const RscId & aId, const char * ) SAL_OVERRIDE; void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; virtual ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, const RscId & aId, - sal_uInt32 nDeep, bool bExtra ); + sal_uInt32 nDeep, bool bExtra ) SAL_OVERRIDE; }; @@ -116,7 +116,7 @@ class RscLangArray : public RscArray public: RscLangArray( Atom nId, sal_uInt32 nTypId, RscTop * pSuper, RscEnum * pTypeClass ); - virtual RSCCLASS_TYPE GetClassType() const; + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; }; #endif //_RSCARRAY diff --git a/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx index f32ab9d1aaca..4822909c4130 100644 --- a/rsc/inc/rscclass.hxx +++ b/rsc/inc/rscclass.hxx @@ -59,39 +59,39 @@ public: RscClass( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl ); ~RscClass(); - virtual RSCCLASS_TYPE GetClassType() const; + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; - void Pre_dtor(); + void Pre_dtor() SAL_OVERRIDE; ERRTYPE SetVariable( Atom nVarName, RscTop * pClass, RSCINST * pDflt, RSCVAR nVarType, sal_uInt32 nMask, - Atom nDataBaseName ); - virtual void EnumVariables( void * pData, VarEnumCallbackProc ); + Atom nDataBaseName ) SAL_OVERRIDE; + virtual void EnumVariables( void * pData, VarEnumCallbackProc ) SAL_OVERRIDE; RSCINST GetVariable( const RSCINST & rInst, Atom nVarName, const RSCINST & rInitInst, bool nInitDflt = false, - RscTop * pCreateClass = NULL ); - RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName ); + RscTop * pCreateClass = NULL ) SAL_OVERRIDE; + RSCINST GetCopyVar( const RSCINST & rInst, Atom nVarName ) SAL_OVERRIDE; // Gibt die Groesse der Klasse in Bytes - sal_uInt32 Size(){ return nSize; } + sal_uInt32 Size() SAL_OVERRIDE { return nSize; } - bool IsConsistent( const RSCINST & rInst ); - void SetToDefault( const RSCINST & rInst ); - bool IsDefault( const RSCINST & rInst ); - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - void SetDefault( const RSCINST & rData, Atom nVarId ); + bool IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE; + void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE; + bool IsDefault( const RSCINST & rInst ) SAL_OVERRIDE; + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; + void SetDefault( const RSCINST & rData, Atom nVarId ) SAL_OVERRIDE; using RscTop::GetDefault; - RSCINST GetDefault( Atom nVarId ); + RSCINST GetDefault( Atom nVarId ) SAL_OVERRIDE; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ); - void Destroy( const RSCINST & rInst ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE; + void Destroy( const RSCINST & rInst ) SAL_OVERRIDE; void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteInstRc( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, sal_uInt32, bool bExtra ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; class RscSysDepend : public RscClass @@ -102,7 +102,7 @@ public: RscTypCont * pTC, sal_uInt32, bool bExtra, bool bFirst = false ); ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; class RscTupel : public RscClass @@ -110,9 +110,9 @@ class RscTupel : public RscClass public: RscTupel( Atom nId, sal_uInt32 nTypId, RscTop * pSuper ); RSCINST GetTupelVar( const RSCINST & rInst, sal_uInt32 nPos, - const RSCINST & rInitInst ); + const RSCINST & rInitInst ) SAL_OVERRIDE; void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; }; #endif //_RSCCLASS_HXX diff --git a/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx index 463f119778d4..24b2d8b3d385 100644 --- a/rsc/inc/rscclobj.hxx +++ b/rsc/inc/rscclobj.hxx @@ -37,7 +37,7 @@ public: ObjNode( const RscId & rId, CLASS_DATA pData, sal_uLong lKey ); ObjNode * DelObjNode( RscTop * pClass, sal_uLong lFileKey ); - sal_uInt32 GetId() const; + sal_uInt32 GetId() const SAL_OVERRIDE; RscId GetRscId(){ return( aRscId ); } sal_uLong GetFileKey(){ return lFileKey; }; ObjNode* Search( const RscId &rName ) const //< search the index in the b-tree @@ -69,7 +69,7 @@ public: ObjNode* pObjBiTree; // Zeiger auf Objektbaum RefNode( Atom nTyp ); - sal_uInt32 GetId() const; + sal_uInt32 GetId() const SAL_OVERRIDE; RefNode* Search( Atom typ ) const //< search the index in the b-tree { return( (RefNode *)IdNode::Search( typ ) ); diff --git a/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx index 1e48f27bfcce..fa773250ee3d 100644 --- a/rsc/inc/rscconst.hxx +++ b/rsc/inc/rscconst.hxx @@ -37,11 +37,11 @@ protected: public: RscConst( Atom nId, sal_uInt32 nTypId ); ~RscConst(); - virtual RSCCLASS_TYPE GetClassType() const; + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; sal_uInt32 GetEntryCount() const { return nEntries; } // Die erlaubten Werte werden gesetzt ERRTYPE SetConstant( Atom nVarName, sal_Int32 lValue ); - Atom GetConstant( sal_uInt32 nPos ); + Atom GetConstant( sal_uInt32 nPos ) SAL_OVERRIDE; bool GetConstValue( Atom nConstId, sal_Int32 * pVal ) const; bool GetValueConst( sal_Int32 nValue, Atom * pConstId ) const; sal_uInt32 GetConstPos( Atom nConstId ); @@ -57,29 +57,29 @@ class RscEnum : public RscConst sal_uInt32 nSize; public: RscEnum( Atom nId, sal_uInt32 nTypId ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ); - sal_uInt32 Size(){ return nSize; } + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE; + sal_uInt32 Size() SAL_OVERRIDE { return nSize; } - virtual void SetToDefault( const RSCINST & rInst ) + virtual void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE { ((RscEnumInst*)rInst.pData)->bDflt = true; } - bool IsDefault( const RSCINST & rInst ) + bool IsDefault( const RSCINST & rInst ) SAL_OVERRIDE { return( ((RscEnumInst*)rInst.pData)->bDflt ); }; // Als Default setzen - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - sal_Int32 nValue ); - ERRTYPE SetNumber( const RSCINST & rInst, sal_Int32 nValue ); - ERRTYPE GetConst( const RSCINST & rInst, Atom * ); - ERRTYPE GetNumber( const RSCINST & rInst, sal_Int32 * nValue ); + 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; void WriteSrc( const RSCINST &rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; class RscNameTable; diff --git a/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx index e23f1455b5d7..0c02d3af707a 100644 --- a/rsc/inc/rsccont.hxx +++ b/rsc/inc/rsccont.hxx @@ -59,49 +59,49 @@ public: RscTop * pSuper = NULL, bool bNoId = true ); ~RscBaseCont(); - virtual RSCCLASS_TYPE GetClassType() const; + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; void SetTypeClass( RscTop * pClass, RscTop * pClass1 = NULL ) { pTypeClass = pClass; pTypeClass1 = pClass1; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ); - void Destroy( const RSCINST & rInst ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE; + void Destroy( const RSCINST & rInst ) SAL_OVERRIDE; ERRTYPE GetElement( const RSCINST & rInst, const RscId & rEleName, RscTop * pCreateClass, const RSCINST & rCreateInst, - RSCINST * pGetInst ); + RSCINST * pGetInst ) SAL_OVERRIDE; RSCINST SearchEle( const RSCINST & rInst, const RscId & rEleName, - RscTop * pClass ); - sal_uInt32 GetCount( const RSCINST & rInst ); - RSCINST GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ); + RscTop * pClass ) SAL_OVERRIDE; + sal_uInt32 GetCount( const RSCINST & rInst ) SAL_OVERRIDE; + RSCINST GetPosEle( const RSCINST & rInst, sal_uInt32 nPos ) SAL_OVERRIDE; ERRTYPE MovePosEle( const RSCINST & rInst, sal_uInt32 nDestPos, - sal_uInt32 nSourcePos ); + sal_uInt32 nSourcePos ) SAL_OVERRIDE; virtual ERRTYPE SetPosRscId( const RSCINST & rInst, sal_uInt32 nPos, - const RscId & rRscId); - SUBINFO_STRUCT GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ); - ERRTYPE SetString( const RSCINST &, const char * pStr ); - ERRTYPE SetNumber( const RSCINST &, sal_Int32 lValue ); - ERRTYPE SetBool( const RSCINST & rInst, bool bValue ); + const RscId & rRscId) SAL_OVERRIDE; + SUBINFO_STRUCT GetInfoEle( const RSCINST & rInst, sal_uInt32 nPos ) SAL_OVERRIDE; + ERRTYPE SetString( const RSCINST &, const char * pStr ) SAL_OVERRIDE; + ERRTYPE SetNumber( const RSCINST &, sal_Int32 lValue ) SAL_OVERRIDE; + ERRTYPE SetBool( const RSCINST & rInst, bool bValue ) SAL_OVERRIDE; ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - sal_Int32 nValue ); - ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ); + sal_Int32 nValue ) SAL_OVERRIDE; + ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ) SAL_OVERRIDE; // Gibt die Groesse der Klasse in Bytes - sal_uInt32 Size(){ return nSize; } + sal_uInt32 Size() SAL_OVERRIDE { return nSize; } - bool IsConsistent( const RSCINST & rInst ); - void SetToDefault( const RSCINST & rInst ); - bool IsDefault( const RSCINST & rInst ); - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + bool IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE; + void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE; + bool IsDefault( const RSCINST & rInst ) SAL_OVERRIDE; + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; void Delete( const RSCINST & rInst, RscTop * pClass, - const RscId & rId ); - void DeletePos( const RSCINST & rInst, sal_uInt32 nPos ); + const RscId & rId ) SAL_OVERRIDE; + void DeletePos( const RSCINST & rInst, sal_uInt32 nPos ) SAL_OVERRIDE; void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32 , bool bExtra); + RscTypCont * pTC, sal_uInt32 , bool bExtra) SAL_OVERRIDE; }; class RscContWriteSrc : public RscBaseCont @@ -111,7 +111,7 @@ public: RscTop * pSuper = NULL, bool bNoId = true ); void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; }; class RscCont : public RscContWriteSrc @@ -121,7 +121,7 @@ public: RscTop * pSuper = NULL, bool bNoId = true ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; class RscContExtraData : public RscContWriteSrc @@ -131,7 +131,7 @@ public: RscTop * pSuper = NULL, bool bNoId = true ); ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; #endif //_RSCCONT_HXX diff --git a/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx index 12a1afb287ec..2d77fa2090a7 100644 --- a/rsc/inc/rscflag.hxx +++ b/rsc/inc/rscflag.hxx @@ -35,30 +35,30 @@ class RscFlag : public RscConst RSCINST CreateBasic( RSCINST * pInst ); public: RscFlag( Atom nId, sal_uInt32 nTypId ); - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE; RSCINST CreateClient( RSCINST * pInst, const RSCINST & rDflt, bool bOwnClass, Atom nConsId ); - sal_uInt32 Size(); + sal_uInt32 Size() SAL_OVERRIDE; - virtual void SetToDefault( const RSCINST & rInst ); - bool IsDefault( const RSCINST & rInst ); + virtual void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE; + bool IsDefault( const RSCINST & rInst ) SAL_OVERRIDE; bool IsDefault( const RSCINST & rInst, Atom nConstId ); // Ist das Flag gesetzt bool IsSet( const RSCINST & rInst, Atom nConstId ); // Als Default setzen - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef, Atom nConstId ); ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - sal_Int32 nValue ); - ERRTYPE SetNotConst( const RSCINST & rInst, Atom nConstId ); + sal_Int32 nValue ) SAL_OVERRIDE; + ERRTYPE SetNotConst( const RSCINST & rInst, Atom nConstId ) SAL_OVERRIDE; void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; /******************* R s c C l i e n t ***********************************/ @@ -69,21 +69,21 @@ class RscClient : public RscTop public: RscClient( Atom nId, sal_uInt32 nTypId, RscFlag * pClass, Atom nConstantId ); - virtual RSCCLASS_TYPE GetClassType() const; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ); - sal_uInt32 Size(){ return( pRefClass->Size() ); }; + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE; + sal_uInt32 Size() SAL_OVERRIDE { return( pRefClass->Size() ); }; // Eine Zuweisung an eine Variable - bool IsDefault( const RSCINST & rInst ){ + bool IsDefault( const RSCINST & rInst ) SAL_OVERRIDE { return( pRefClass->IsDefault( rInst, nConstId ) ); }; // Als Default setzen - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE { return pRefClass->IsValueDefault( rInst, pDef, nConstId ); } - ERRTYPE SetBool( const RSCINST & rInst, bool bValue ) + ERRTYPE SetBool( const RSCINST & rInst, bool bValue ) SAL_OVERRIDE { if( bValue ) return( pRefClass->SetConst( rInst, nConstId, sal_Int32(bValue) ) ); @@ -91,13 +91,13 @@ public: return( pRefClass-> SetNotConst( rInst, nConstId ) ); } - ERRTYPE GetBool( const RSCINST & rInst, bool * pB ) + ERRTYPE GetBool( const RSCINST & rInst, bool * pB ) SAL_OVERRIDE { *pB = pRefClass->IsSet( rInst, nConstId ); return( ERR_OK ); } void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; }; #endif // _RSCFLAG_HXX diff --git a/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx index 95301d28a7aa..57ff85a016af 100644 --- a/rsc/inc/rscmgr.hxx +++ b/rsc/inc/rscmgr.hxx @@ -39,27 +39,27 @@ class RscMgr : public RscClass public: RscMgr( Atom nId, sal_uInt32 nTypId, RscTop * pSuperCl ); - void SetToDefault( const RSCINST & rInst ); - bool IsDefault( const RSCINST & rInst ); - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); + void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE; + bool IsDefault( const RSCINST & rInst ) SAL_OVERRIDE; + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; - RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ); - void Destroy( const RSCINST & rInst ); - sal_uInt32 Size(); + RSCINST Create( RSCINST * pInst, const RSCINST & rDflt, bool ) SAL_OVERRIDE; + void Destroy( const RSCINST & rInst ) SAL_OVERRIDE; + sal_uInt32 Size() SAL_OVERRIDE; void WriteSrcHeader( const RSCINST & aInst, FILE * fOutput, RscTypCont * pTC, sal_uInt32 nTab, - const RscId & rId, const char * ); + const RscId & rId, const char * ) SAL_OVERRIDE; void WriteSrc( const RSCINST & rInst, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteRcHeader( const RSCINST & rInst, RscWriteRc & aMem, RscTypCont * pTC, const RscId & rId, - sal_uInt32, bool bExtra ); + sal_uInt32, bool bExtra ) SAL_OVERRIDE; ERRTYPE WriteRc( const RSCINST & rInst, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); - bool IsConsistent( const RSCINST & rInst ); - ERRTYPE GetRef( const RSCINST & rInst, RscId * ); - ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; + bool IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE; + ERRTYPE GetRef( const RSCINST & rInst, RscId * ) SAL_OVERRIDE; + ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ) SAL_OVERRIDE; }; #endif //_RSCMGR_HXX diff --git a/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx index 836d5a331342..91d88ff5efb8 100644 --- a/rsc/inc/rscrange.hxx +++ b/rsc/inc/rscrange.hxx @@ -37,29 +37,29 @@ protected: sal_uInt32 nSize; public: RscRange( Atom nId, sal_uInt32 nTypId ); - virtual RSCCLASS_TYPE GetClassType() const; - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ); + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE; // Der zulaessige Bereich wird gesetzt ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ); // Gibt die Groesse der Klasse in Bytes - sal_uInt32 Size(){ return nSize; } + sal_uInt32 Size() SAL_OVERRIDE { return nSize; } // Eine Zuweisung an eine Variable - virtual void SetToDefault( const RSCINST & rInst ) + virtual void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE { ((RscRangeInst*)rInst.pData)->bDflt = true; } - bool IsDefault( const RSCINST & rInst) + bool IsDefault( const RSCINST & rInst) SAL_OVERRIDE { return( ((RscRangeInst*)rInst.pData)->bDflt ); }; // Als Default setzen - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - ERRTYPE SetNumber( const RSCINST &, sal_Int32 ); - ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ); + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; + ERRTYPE SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE; + ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ) SAL_OVERRIDE; void WriteSrc( const RSCINST &, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; class RscLongRange : public RscTop @@ -75,29 +75,29 @@ protected: sal_uInt32 nSize; public: RscLongRange( Atom nId, sal_uInt32 nTypId ); - virtual RSCCLASS_TYPE GetClassType() const; - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ); + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE; // Der zulaessige Bereich wird gesetzt ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ); // Gibt die Groesse der Klasse in Bytes - sal_uInt32 Size(){ return nSize; } + sal_uInt32 Size() SAL_OVERRIDE { return nSize; } // Eine Zuweisung an eine Variable - virtual void SetToDefault( const RSCINST & rInst ) + virtual void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE { ((RscLongRangeInst*)rInst.pData)->bDflt = true; } - bool IsDefault( const RSCINST & rInst) + bool IsDefault( const RSCINST & rInst) SAL_OVERRIDE { return( ((RscLongRangeInst*)rInst.pData)->bDflt ); }; // Als Default setzen - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - ERRTYPE SetNumber( const RSCINST &, sal_Int32 ); - ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ); + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; + ERRTYPE SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE; + ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ) SAL_OVERRIDE; void WriteSrc( const RSCINST &, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; @@ -107,7 +107,7 @@ public: RscLongEnumRange( Atom nId, sal_uInt32 nTypId ); ERRTYPE SetConst( const RSCINST & rInst, Atom nValueId, - sal_Int32 nValue ); + sal_Int32 nValue ) SAL_OVERRIDE; }; class RscIdRange : public RscTop @@ -118,7 +118,7 @@ protected: sal_Int32 nMax; // Maximum des Bereiches public: RscIdRange( Atom nId, sal_uInt32 nTypId ); - virtual RSCCLASS_TYPE GetClassType() const; + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; // Der zulaessige Bereich wird gesetzt ERRTYPE SetRange( sal_Int32 nMinimum, sal_Int32 nMaximum ) { @@ -126,43 +126,43 @@ public: nMax = nMaximum; return ERR_OK; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ); - void Destroy( const RSCINST & rInst ); - sal_uInt32 Size(){ return nSize; } - virtual void SetToDefault( const RSCINST & rInst ) + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE; + void Destroy( const RSCINST & rInst ) SAL_OVERRIDE; + sal_uInt32 Size() SAL_OVERRIDE { return nSize; } + virtual void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE { ((RscId*)rInst.pData)->aExp.cUnused = true; } - bool IsDefault( const RSCINST & rInst) + bool IsDefault( const RSCINST & rInst) SAL_OVERRIDE { //cUnused wird fuer Defaultkennung verwendet return ((RscId*)rInst.pData)->aExp.cUnused; } // Als Default setzen - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - ERRTYPE SetNumber( const RSCINST &, sal_Int32 ); - ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ); - ERRTYPE SetRef( const RSCINST &, const RscId & rRscId ); - ERRTYPE GetRef( const RSCINST & rInst, RscId * ); + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; + ERRTYPE SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE; + ERRTYPE GetNumber( const RSCINST &, sal_Int32 * ) SAL_OVERRIDE; + ERRTYPE SetRef( const RSCINST &, const RscId & rRscId ) SAL_OVERRIDE; + ERRTYPE GetRef( const RSCINST & rInst, RscId * ) SAL_OVERRIDE; void WriteSrc( const RSCINST &, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); - bool IsConsistent( const RSCINST & rInst ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; + bool IsConsistent( const RSCINST & rInst ) SAL_OVERRIDE; }; class RscBool : public RscRange { public: RscBool( Atom nId, sal_uInt32 nTypId ); - virtual RSCCLASS_TYPE GetClassType() const; + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; // Der zulaessige Bereich wird gesetzt ERRTYPE SetRange( sal_Int32, sal_Int32 ){ return ERR_UNKNOWN_METHOD; } - ERRTYPE SetBool( const RSCINST & rInst, bool b ) + ERRTYPE SetBool( const RSCINST & rInst, bool b ) SAL_OVERRIDE { return SetNumber( rInst, (sal_Int32)b ); }; - ERRTYPE GetBool( const RSCINST & rInst, bool * pB) + ERRTYPE GetBool( const RSCINST & rInst, bool * pB) SAL_OVERRIDE { sal_Int32 l; GetNumber( rInst, &l ); @@ -170,7 +170,7 @@ public: return ERR_OK; }; void WriteSrc( const RSCINST &, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; }; class RscBreakRange : public RscRange @@ -179,8 +179,8 @@ class RscBreakRange : public RscRange public: RscBreakRange( Atom nId, sal_uInt32 nTypId ); void SetOutRange( sal_Int32 nNumber ) { nOutRange = nNumber; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ); - ERRTYPE SetNumber( const RSCINST &, sal_Int32 ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE; + ERRTYPE SetNumber( const RSCINST &, sal_Int32 ) SAL_OVERRIDE; }; #endif // _RSCRANGE_HXX diff --git a/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx index fffbe5c26783..e56e396c583a 100644 --- a/rsc/inc/rscstr.hxx +++ b/rsc/inc/rscstr.hxx @@ -36,31 +36,31 @@ class RscString : public RscTop sal_uInt32 nSize; public: RscString( Atom nId, sal_uInt32 nTypId ); - virtual RSCCLASS_TYPE GetClassType() const; + virtual RSCCLASS_TYPE GetClassType() const SAL_OVERRIDE; void SetRefClass( RscTop * pClass ) { pRefClass = pClass; } - RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ); + RSCINST Create( RSCINST * pInst, const RSCINST & rDfltInst, bool ) SAL_OVERRIDE; // Der zulaessige Bereich wird gesetzt - void Destroy( const RSCINST & rInst ); - sal_uInt32 Size(){ return nSize; } - void SetToDefault( const RSCINST & rInst ) + void Destroy( const RSCINST & rInst ) SAL_OVERRIDE; + sal_uInt32 Size() SAL_OVERRIDE { return nSize; } + void SetToDefault( const RSCINST & rInst ) SAL_OVERRIDE { ((RscStringInst*)rInst.pData)->bDflt = true; } - bool IsDefault( const RSCINST & rInst) + bool IsDefault( const RSCINST & rInst) SAL_OVERRIDE { return ((RscStringInst*)rInst.pData)->bDflt; } // Als Default setzen - bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ); - ERRTYPE SetString( const RSCINST &, const char * pStr ); - ERRTYPE GetString( const RSCINST &, char ** ppStr ); - ERRTYPE GetRef( const RSCINST & rInst, RscId * ); - ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ); + bool IsValueDefault( const RSCINST & rInst, CLASS_DATA pDef ) SAL_OVERRIDE; + ERRTYPE SetString( const RSCINST &, const char * pStr ) SAL_OVERRIDE; + ERRTYPE GetString( const RSCINST &, char ** ppStr ) SAL_OVERRIDE; + ERRTYPE GetRef( const RSCINST & rInst, RscId * ) SAL_OVERRIDE; + ERRTYPE SetRef( const RSCINST & rInst, const RscId & rRefId ) SAL_OVERRIDE; void WriteSrc( const RSCINST &, FILE * fOutput, - RscTypCont * pTC, sal_uInt32 nTab, const char * ); + RscTypCont * pTC, sal_uInt32 nTab, const char * ) SAL_OVERRIDE; ERRTYPE WriteRc( const RSCINST &, RscWriteRc & aMem, - RscTypCont * pTC, sal_uInt32, bool bExtra ); + RscTypCont * pTC, sal_uInt32, bool bExtra ) SAL_OVERRIDE; }; #endif // _RSCSTR_HXX diff --git a/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx index ee674d4b947b..9d4ec944bfa5 100644 --- a/rsc/inc/rsctree.hxx +++ b/rsc/inc/rsctree.hxx @@ -72,8 +72,8 @@ public: class IdNode : public NameNode { - virtual COMPARE Compare( const NameNode * ) const; - virtual COMPARE Compare( const void * ) const; + virtual COMPARE Compare( const NameNode * ) const SAL_OVERRIDE; + virtual COMPARE Compare( const void * ) const SAL_OVERRIDE; protected: using NameNode::Search; @@ -85,8 +85,8 @@ public: class StringNode : public NameNode { - virtual COMPARE Compare( const NameNode * ) const; - virtual COMPARE Compare( const void * ) const; + virtual COMPARE Compare( const NameNode * ) const SAL_OVERRIDE; + virtual COMPARE Compare( const void * ) const SAL_OVERRIDE; protected: using NameNode::Search; -- cgit