diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
tree | a70f4957c454b443520cbf91250c41d9eea80017 /include/formula | |
parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) |
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
Diffstat (limited to 'include/formula')
-rw-r--r-- | include/formula/FormulaOpCodeMapperObj.hxx | 14 | ||||
-rw-r--r-- | include/formula/token.hxx | 94 | ||||
-rw-r--r-- | include/formula/vectortoken.hxx | 4 |
3 files changed, 56 insertions, 56 deletions
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index 84385b2548ef..f863697ab514 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -53,26 +53,26 @@ protected: private: // XFormulaOpCodeMapper // Attributes - virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaToken > SAL_CALL getMappings( const ::com::sun::star::uno::Sequence< OUString >& rNames, sal_Int32 nLanguage ) throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sheet::FormulaOpCodeMapEntry > SAL_CALL getAvailableMappings( sal_Int32 nLanguage, sal_Int32 nGroups ) throw ( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/formula/token.hxx b/include/formula/token.hxx index f65220b38144..d1654cce5f12 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -160,12 +160,12 @@ public: virtual bool TextEqual( const formula::FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const; - virtual bool isFunction() const + virtual bool isFunction() const SAL_OVERRIDE { return IsFunction(); } - virtual sal_uInt32 getArgumentCount() const + virtual sal_uInt32 getArgumentCount() const SAL_OVERRIDE { return GetParamCount(); } @@ -213,12 +213,12 @@ public: FormulaToken( r ), nByte( r.nByte ), bHasForceArray( r.bHasForceArray ) {} - virtual FormulaToken* Clone() const { return new FormulaByteToken(*this); } - virtual sal_uInt8 GetByte() const; - virtual void SetByte( sal_uInt8 n ); - virtual bool HasForceArray() const; - virtual void SetForceArray( bool b ); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaByteToken(*this); } + virtual sal_uInt8 GetByte() const SAL_OVERRIDE; + virtual void SetByte( sal_uInt8 n ) SAL_OVERRIDE; + virtual bool HasForceArray() const SAL_OVERRIDE; + virtual void SetForceArray( bool b ) SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken ) }; @@ -237,9 +237,9 @@ public: FormulaFAPToken( const FormulaFAPToken& r ) : FormulaByteToken( r ), pOrigToken( r.pOrigToken ) {} - virtual FormulaToken* Clone() const { return new FormulaFAPToken(*this); } - virtual FormulaToken* GetFAPOrigToken() const; - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaFAPToken(*this); } + virtual FormulaToken* GetFAPOrigToken() const SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; class FORMULA_DLLPUBLIC FormulaDoubleToken : public FormulaToken @@ -252,10 +252,10 @@ public: FormulaDoubleToken( const FormulaDoubleToken& r ) : FormulaToken( r ), fDouble( r.fDouble ) {} - virtual FormulaToken* Clone() const { return new FormulaDoubleToken(*this); } - virtual double GetDouble() const; - virtual double& GetDoubleAsReference(); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaDoubleToken(*this); } + virtual double GetDouble() const SAL_OVERRIDE; + virtual double& GetDoubleAsReference() SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken ) }; @@ -268,9 +268,9 @@ public: FormulaStringToken( const svl::SharedString& r ); FormulaStringToken( const FormulaStringToken& r ); - virtual FormulaToken* Clone() const; - virtual svl::SharedString GetString() const; - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE; + virtual svl::SharedString GetString() const SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken ) }; @@ -285,9 +285,9 @@ public: FormulaStringOpToken( OpCode e, const svl::SharedString& r ); FormulaStringOpToken( const FormulaStringOpToken& r ); - virtual FormulaToken* Clone() const; - virtual svl::SharedString GetString() const; - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE; + virtual svl::SharedString GetString() const SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken @@ -301,12 +301,12 @@ public: FormulaIndexToken( const FormulaIndexToken& r ) : FormulaToken( r ), nIndex( r.nIndex ), mbGlobal( r.mbGlobal ) {} - virtual FormulaToken* Clone() const { return new FormulaIndexToken(*this); } - virtual sal_uInt16 GetIndex() const; - virtual void SetIndex( sal_uInt16 n ); - virtual bool IsGlobal() const; - virtual void SetGlobal( bool b ); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaIndexToken(*this); } + virtual sal_uInt16 GetIndex() const SAL_OVERRIDE; + virtual void SetIndex( sal_uInt16 n ) SAL_OVERRIDE; + virtual bool IsGlobal() const SAL_OVERRIDE; + virtual void SetGlobal( bool b ) SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; @@ -326,11 +326,11 @@ public: FormulaToken( r ), aExternal( r.aExternal ), nByte( r.nByte ) {} - virtual FormulaToken* Clone() const { return new FormulaExternalToken(*this); } - virtual const OUString& GetExternal() const; - virtual sal_uInt8 GetByte() const; - virtual void SetByte( sal_uInt8 n ); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaExternalToken(*this); } + virtual const OUString& GetExternal() const SAL_OVERRIDE; + virtual sal_uInt8 GetByte() const SAL_OVERRIDE; + virtual void SetByte( sal_uInt8 n ) SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; @@ -342,10 +342,10 @@ public: FormulaMissingToken( const FormulaMissingToken& r ) : FormulaToken( r ) {} - virtual FormulaToken* Clone() const { return new FormulaMissingToken(*this); } - virtual double GetDouble() const; - virtual svl::SharedString GetString() const; - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaMissingToken(*this); } + virtual double GetDouble() const SAL_OVERRIDE; + virtual svl::SharedString GetString() const SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken @@ -366,9 +366,9 @@ public: memcpy( pJump, r.pJump, (r.pJump[0] + 1) * sizeof(short) ); } virtual ~FormulaJumpToken(); - virtual short* GetJump() const; - virtual bool operator==( const formula::FormulaToken& rToken ) const; - virtual FormulaToken* Clone() const { return new FormulaJumpToken(*this); } + virtual short* GetJump() const SAL_OVERRIDE; + virtual bool operator==( const formula::FormulaToken& rToken ) const SAL_OVERRIDE; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaJumpToken(*this); } }; @@ -380,8 +380,8 @@ public: FormulaToken( svSubroutine, ocCall ), mpArray( pArray) {} FormulaSubroutineToken( const FormulaSubroutineToken& r ); virtual ~FormulaSubroutineToken(); - virtual FormulaToken* Clone() const { return new FormulaSubroutineToken(*this); } - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaSubroutineToken(*this); } + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; private: const FormulaTokenArray* mpArray; @@ -396,8 +396,8 @@ public: FormulaUnknownToken( const FormulaUnknownToken& r ) : FormulaToken( r ) {} - virtual FormulaToken* Clone() const { return new FormulaUnknownToken(*this); } - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaUnknownToken(*this); } + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; @@ -410,10 +410,10 @@ public: FormulaErrorToken( const FormulaErrorToken& r ) : FormulaToken( r ), nError( r.nError) {} - virtual FormulaToken* Clone() const { return new FormulaErrorToken(*this); } - virtual sal_uInt16 GetError() const; - virtual void SetError( sal_uInt16 nErr ); - virtual bool operator==( const FormulaToken& rToken ) const; + virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaErrorToken(*this); } + virtual sal_uInt16 GetError() const SAL_OVERRIDE; + virtual void SetError( sal_uInt16 nErr ) SAL_OVERRIDE; + virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx index ca858aecec34..125dd405e310 100644 --- a/include/formula/vectortoken.hxx +++ b/include/formula/vectortoken.hxx @@ -58,7 +58,7 @@ class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken public: SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength ); - virtual FormulaToken* Clone() const; + virtual FormulaToken* Clone() const SAL_OVERRIDE; inline const VectorRefArray& GetArray() const { return maArray; } inline size_t GetArrayLength() const { return mnArrayLength; } @@ -86,7 +86,7 @@ public: const std::vector<VectorRefArray>& rArrays, size_t nReqLength, size_t nArrayLength, size_t nRefRowSize, bool bStartFixed, bool bEndFixed ); - virtual FormulaToken* Clone() const; + virtual FormulaToken* Clone() const SAL_OVERRIDE; inline const std::vector<VectorRefArray>& GetArrays() const { return maArrays; } inline size_t GetArrayLength() const { return mnArrayLength; } |