From 567ef6d5782cdb729b49005caf6005610ce03e22 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 27 Mar 2014 18:12:18 +0100 Subject: Second batch of adding SAL_OVERRIDE to overriding function declarations ...mostly done with a rewriting Clang plugin, with just some manual tweaking necessary to fix poor macro usage. Change-Id: Ie656f9d653fc716f72ac175925272696d509038f --- include/sfx2/controlwrapper.hxx | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'include/sfx2/controlwrapper.hxx') diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index acf0d6c35b0f..52eda07573fe 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -201,7 +201,7 @@ public: /** Enables, disables, shows, or hides the control. @descr Does nothing, if the corresponding parameter is TRISTATE_INDET. */ - virtual void ModifyControl( TriState eEnable, TriState eShow ); + virtual void ModifyControl( TriState eEnable, TriState eShow ) SAL_OVERRIDE; /** Derived classes return the value the control contains. */ virtual ValueT GetControlValue() const = 0; @@ -226,11 +226,11 @@ class SFX2_DLLPUBLIC DummyWindowWrapper: public: explicit DummyWindowWrapper( Window& rWindow ); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool ) SAL_OVERRIDE; - virtual void* GetControlValue() const; - virtual void SetControlValue( void* ); + virtual void* GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( void* ) SAL_OVERRIDE; }; @@ -242,11 +242,11 @@ class SFX2_DLLPUBLIC CheckBoxWrapper: public: explicit CheckBoxWrapper( CheckBox& rCheckBox ); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual bool GetControlValue() const; - virtual void SetControlValue( bool bValue ); + virtual bool GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( bool bValue ) SAL_OVERRIDE; }; @@ -263,11 +263,11 @@ public: virtual ~ColorListBoxWrapper(); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual Color GetControlValue() const; - virtual void SetControlValue( Color aColor ); + virtual Color GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( Color aColor ) SAL_OVERRIDE; }; @@ -444,12 +444,12 @@ public: void RegisterControlWrapper( ControlWrapperBase& rWrapper ); /** Enables, disables, shows, or hides the registered controls. */ - virtual void ModifyControl( TriState eEnable, TriState eShow ); + virtual void ModifyControl( TriState eEnable, TriState eShow ) SAL_OVERRIDE; /** Returns true if all registered controls are in "don't know" state. */ - virtual bool IsControlDontKnow() const; + virtual bool IsControlDontKnow() const SAL_OVERRIDE; /** Sets all registered controls to "don't know" state. */ - virtual void SetControlDontKnow( bool bSet ); + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; private: std::auto_ptr< MultiControlWrapperHelper_Impl > mxImpl; -- cgit