From b36963c0a6a09f70ca6d8d607dd3249a3496497d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 12 Oct 2015 16:04:04 +0200 Subject: Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274 --- include/formula/FormulaOpCodeMapperObj.hxx | 14 ++--- include/formula/formula.hxx | 8 +-- include/formula/funcutl.hxx | 22 +++---- include/formula/token.hxx | 98 +++++++++++++++--------------- include/formula/vectortoken.hxx | 4 +- 5 files changed, 73 insertions(+), 73 deletions(-) (limited to 'include/formula') diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index d04112ed0246..f813bf413451 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -49,26 +49,26 @@ protected: private: // XFormulaOpCodeMapper // Attributes - 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; + virtual ::sal_Int32 SAL_CALL getOpCodeExternal() throw (::com::sun::star::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getOpCodeUnknown() throw (::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) 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) SAL_OVERRIDE; + ::com::sun::star::uno::RuntimeException, std::exception) override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + throw(::com::sun::star::uno::RuntimeException, std::exception) override; }; diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 8a58c5b2f925..3dee5709a7ef 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -57,14 +57,14 @@ public: ,IFunctionManager* _pFunctionMgr ,IControlReferenceHandler* _pDlg = NULL ); virtual ~FormulaModalDialog(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: ::std::unique_ptr m_pImpl; protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); @@ -97,7 +97,7 @@ public: , IFunctionManager* _pFunctionMgr , IControlReferenceHandler* _pDlg = NULL ); virtual ~FormulaDlg(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; private: ::std::unique_ptr m_pImpl; @@ -107,7 +107,7 @@ protected: protected: - virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) override; ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 2bde241f412d..f0ea363d3d15 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -39,16 +39,16 @@ private: DECL_LINK_TYPED( UpdateHdl, Idle*, void ); protected: - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; public: RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent, vcl::Window* pShrinkModeLabel, const ResId& rResId ); RefEdit( vcl::Window* _pParent, vcl::Window* pShrinkModeLabel, WinBits nStyle = WB_BORDER ); virtual ~RefEdit(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetRefString( const OUString& rStr ); @@ -60,8 +60,8 @@ public: using Edit::SetText; - void SetText( const OUString& rStr ) SAL_OVERRIDE; - virtual void Modify() SAL_OVERRIDE; + void SetText( const OUString& rStr ) override; + virtual void Modify() override; void StartUpdateData(); @@ -85,15 +85,15 @@ private: VclPtr pRefEdit; // zugeordnetes Edit-Control protected: - virtual void Click() SAL_OVERRIDE; - virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus() SAL_OVERRIDE; + virtual void Click() override; + virtual void KeyInput( const KeyEvent& rKEvt ) override; + virtual void GetFocus() override; + virtual void LoseFocus() override; public: RefButton(vcl::Window* _pParent, WinBits nStyle = 0); virtual ~RefButton(); - virtual void dispose() SAL_OVERRIDE; + virtual void dispose() override; void SetReferences( IControlReferenceHandler* pDlg, RefEdit* pEdit ); void SetStartImage(); void SetEndImage(); diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 7bf22618f3fd..23d978757771 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -178,12 +178,12 @@ public: virtual bool TextEqual( const formula::FormulaToken& rToken ) const; virtual bool operator==( const FormulaToken& rToken ) const; - virtual bool isFunction() const SAL_OVERRIDE + virtual bool isFunction() const override { return IsFunction(); } - virtual sal_uInt32 getArgumentCount() const SAL_OVERRIDE + virtual sal_uInt32 getArgumentCount() const override { return GetParamCount(); } @@ -226,12 +226,12 @@ public: FormulaToken( r ), nByte( r.nByte ), bHasForceArray( r.bHasForceArray ) {} - 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; + virtual FormulaToken* Clone() const override { return new FormulaByteToken(*this); } + virtual sal_uInt8 GetByte() const override; + virtual void SetByte( sal_uInt8 n ) override; + virtual bool HasForceArray() const override; + virtual void SetForceArray( bool b ) override; + virtual bool operator==( const FormulaToken& rToken ) const override; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaByteToken ) }; @@ -250,9 +250,9 @@ public: FormulaFAPToken( const FormulaFAPToken& r ) : FormulaByteToken( r ), pOrigToken( r.pOrigToken ) {} - 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; + virtual FormulaToken* Clone() const override { return new FormulaFAPToken(*this); } + virtual FormulaToken* GetFAPOrigToken() const override; + virtual bool operator==( const FormulaToken& rToken ) const override; }; class FORMULA_DLLPUBLIC FormulaDoubleToken : public FormulaToken @@ -265,10 +265,10 @@ public: FormulaDoubleToken( const FormulaDoubleToken& r ) : FormulaToken( r ), fDouble( r.fDouble ) {} - 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; + virtual FormulaToken* Clone() const override { return new FormulaDoubleToken(*this); } + virtual double GetDouble() const override; + virtual double& GetDoubleAsReference() override; + virtual bool operator==( const FormulaToken& rToken ) const override; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaDoubleToken ) }; @@ -281,9 +281,9 @@ public: FormulaStringToken( const svl::SharedString& r ); FormulaStringToken( const FormulaStringToken& r ); - virtual FormulaToken* Clone() const SAL_OVERRIDE; - virtual svl::SharedString GetString() const SAL_OVERRIDE; - virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; + virtual FormulaToken* Clone() const override; + virtual svl::SharedString GetString() const override; + virtual bool operator==( const FormulaToken& rToken ) const override; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken ) }; @@ -298,9 +298,9 @@ public: FormulaStringOpToken( OpCode e, const svl::SharedString& r ); FormulaStringOpToken( const FormulaStringOpToken& r ); - virtual FormulaToken* Clone() const SAL_OVERRIDE; - virtual svl::SharedString GetString() const SAL_OVERRIDE; - virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; + virtual FormulaToken* Clone() const override; + virtual svl::SharedString GetString() const override; + virtual bool operator==( const FormulaToken& rToken ) const override; }; class FORMULA_DLLPUBLIC FormulaIndexToken : public FormulaToken @@ -314,12 +314,12 @@ public: FormulaIndexToken( const FormulaIndexToken& r ) : FormulaToken( r ), nIndex( r.nIndex ), mbGlobal( r.mbGlobal ) {} - 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; + virtual FormulaToken* Clone() const override { return new FormulaIndexToken(*this); } + virtual sal_uInt16 GetIndex() const override; + virtual void SetIndex( sal_uInt16 n ) override; + virtual bool IsGlobal() const override; + virtual void SetGlobal( bool b ) override; + virtual bool operator==( const FormulaToken& rToken ) const override; }; @@ -339,11 +339,11 @@ public: FormulaToken( r ), aExternal( r.aExternal ), nByte( r.nByte ) {} - 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; + virtual FormulaToken* Clone() const override { return new FormulaExternalToken(*this); } + virtual const OUString& GetExternal() const override; + virtual sal_uInt8 GetByte() const override; + virtual void SetByte( sal_uInt8 n ) override; + virtual bool operator==( const FormulaToken& rToken ) const override; }; @@ -355,10 +355,10 @@ public: FormulaMissingToken( const FormulaMissingToken& r ) : FormulaToken( r ) {} - 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; + virtual FormulaToken* Clone() const override { return new FormulaMissingToken(*this); } + virtual double GetDouble() const override; + virtual svl::SharedString GetString() const override; + virtual bool operator==( const FormulaToken& rToken ) const override; }; class FORMULA_DLLPUBLIC FormulaJumpToken : public FormulaToken @@ -382,11 +382,11 @@ public: memcpy( pJump, r.pJump, (r.pJump[0] + 1) * sizeof(short) ); } virtual ~FormulaJumpToken(); - 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); } - virtual bool HasForceArray() const SAL_OVERRIDE; - virtual void SetForceArray( bool b ) SAL_OVERRIDE; + virtual short* GetJump() const override; + virtual bool operator==( const formula::FormulaToken& rToken ) const override; + virtual FormulaToken* Clone() const override { return new FormulaJumpToken(*this); } + virtual bool HasForceArray() const override; + virtual void SetForceArray( bool b ) override; }; @@ -398,8 +398,8 @@ public: FormulaToken( svSubroutine, ocCall ), mpArray( pArray) {} FormulaSubroutineToken( const FormulaSubroutineToken& r ); virtual ~FormulaSubroutineToken(); - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaSubroutineToken(*this); } - virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; + virtual FormulaToken* Clone() const override { return new FormulaSubroutineToken(*this); } + virtual bool operator==( const FormulaToken& rToken ) const override; private: const FormulaTokenArray* mpArray; @@ -414,8 +414,8 @@ public: FormulaUnknownToken( const FormulaUnknownToken& r ) : FormulaToken( r ) {} - virtual FormulaToken* Clone() const SAL_OVERRIDE { return new FormulaUnknownToken(*this); } - virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; + virtual FormulaToken* Clone() const override { return new FormulaUnknownToken(*this); } + virtual bool operator==( const FormulaToken& rToken ) const override; }; @@ -428,10 +428,10 @@ public: FormulaErrorToken( const FormulaErrorToken& r ) : FormulaToken( r ), nError( r.nError) {} - 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; + virtual FormulaToken* Clone() const override { return new FormulaErrorToken(*this); } + virtual sal_uInt16 GetError() const override; + virtual void SetError( sal_uInt16 nErr ) override; + virtual bool operator==( const FormulaToken& rToken ) const override; }; diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx index c8babc5c4238..56b61d3ef78f 100644 --- a/include/formula/vectortoken.hxx +++ b/include/formula/vectortoken.hxx @@ -63,7 +63,7 @@ class FORMULA_DLLPUBLIC SingleVectorRefToken : public FormulaToken public: SingleVectorRefToken( const VectorRefArray& rArray, size_t nReqLength, size_t nArrayLength ); - virtual FormulaToken* Clone() const SAL_OVERRIDE; + virtual FormulaToken* Clone() const override; const VectorRefArray& GetArray() const; size_t GetArrayLength() const; @@ -91,7 +91,7 @@ public: const std::vector& rArrays, size_t nReqLength, size_t nArrayLength, size_t nRefRowSize, bool bStartFixed, bool bEndFixed ); - virtual FormulaToken* Clone() const SAL_OVERRIDE; + virtual FormulaToken* Clone() const override; const std::vector& GetArrays() const; size_t GetArrayLength() const; -- cgit v1.2.3