diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-09-20 07:27:20 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-09-20 08:37:20 +0200 |
| commit | cc2fe8c763b7050f07968f31bcdb7e45b8c7464d (patch) | |
| tree | 499b8644a21d45f1317cfb9fc891e2f6d683802b /include/sfx2 | |
| parent | 475ea37809b5bec369d02a5ab500fac46ab40f0a (diff) | |
Replace SAL_OVERRIDE with override in internal code
Change-Id: Ifa446647b11fd1f1b0dc6a991b752480545634db
Reviewed-on: https://gerrit.libreoffice.org/60788
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/controlwrapper.hxx | 24 | ||||
| -rw-r--r-- | include/sfx2/itemwrapper.hxx | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index bce078a487c3..1758d708c455 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -254,11 +254,11 @@ public: explicit MetricFieldWrapper( MetricField& rField, FieldUnit eUnit ) : SingleControlWrapper< MetricField, ValueT >( rField ), meUnit( eUnit ) {} - virtual bool IsControlDontKnow() const SAL_OVERRIDE; - virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; + virtual bool IsControlDontKnow() const override; + virtual void SetControlDontKnow( bool bSet ) override; - virtual ValueT GetControlValue() const SAL_OVERRIDE; - virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; + virtual ValueT GetControlValue() const override; + virtual void SetControlValue( ValueT nValue ) override; private: FieldUnit meUnit; @@ -288,13 +288,13 @@ public: explicit ListBoxWrapper( ListBox& rListBox, const MapEntryType* pMap ) : SingleControlWrapper< ListBox, ValueT >( rListBox ), MapperType( WRAPPER_LISTBOX_ENTRY_NOTFOUND, pMap ) {} - virtual bool IsControlDontKnow() const SAL_OVERRIDE + virtual bool IsControlDontKnow() const override { return this->GetControl().GetSelectedEntryCount() == 0; } - virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE + virtual void SetControlDontKnow( bool bSet ) override { if( bSet ) this->GetControl().SetNoSelection(); } - virtual ValueT GetControlValue() const SAL_OVERRIDE; - virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; + virtual ValueT GetControlValue() const override; + virtual void SetControlValue( ValueT nValue ) override; }; @@ -321,13 +321,13 @@ public: explicit ValueSetWrapper( ValueSet& rValueSet, const MapEntryType* pMap ) : SingleControlWrapper< ValueSet, ValueT >( rValueSet ), MapperType( WRAPPER_VALUESET_ITEM_NOTFOUND, pMap ) {} - virtual bool IsControlDontKnow() const SAL_OVERRIDE + virtual bool IsControlDontKnow() const override { return this->GetControl().IsNoSelection(); } - virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE + virtual void SetControlDontKnow( bool bSet ) override { if( bSet ) this->GetControl().SetNoSelection(); } - virtual ValueT GetControlValue() const SAL_OVERRIDE; - virtual void SetControlValue( ValueT nValue ) SAL_OVERRIDE; + virtual ValueT GetControlValue() const override; + virtual void SetControlValue( ValueT nValue ) override; }; diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx index 3f1bf7c5eb9f..7907da7ad6af 100644 --- a/include/sfx2/itemwrapper.hxx +++ b/include/sfx2/itemwrapper.hxx @@ -133,9 +133,9 @@ public: explicit ValueItemWrapper( sal_uInt16 nSlot ) : SingleItemWrapper< ItemT, ValueT >( nSlot ) {} - virtual ValueT GetItemValue( const ItemT& rItem ) const SAL_OVERRIDE + virtual ValueT GetItemValue( const ItemT& rItem ) const override { return static_cast< ValueT >( rItem.GetValue() ); } - virtual void SetItemValue( ItemT& rItem, ValueT aValue ) const SAL_OVERRIDE + virtual void SetItemValue( ItemT& rItem, ValueT aValue ) const override { rItem.SetValue( static_cast< InternalValueT >( aValue ) ); } }; |