summaryrefslogtreecommitdiffstats
path: root/forms/source/component/ComboBox.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-27 18:12:18 +0100
commit567ef6d5782cdb729b49005caf6005610ce03e22 (patch)
tree7e3be1da41382e555d9091914ef7e064852a4fd4 /forms/source/component/ComboBox.hxx
parentIntroduce INetContentType::scan (diff)
downloadcore-567ef6d5782cdb729b49005caf6005610ce03e22.tar.gz
core-567ef6d5782cdb729b49005caf6005610ce03e22.zip
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
Diffstat (limited to 'forms/source/component/ComboBox.hxx')
-rw-r--r--forms/source/component/ComboBox.hxx50
1 files changed, 25 insertions, 25 deletions
diff --git a/forms/source/component/ComboBox.hxx b/forms/source/component/ComboBox.hxx
index 04a6d37bf114..1afc0b4777f3 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -71,49 +71,49 @@ class OComboBoxModel
protected:
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes();
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type> _getTypes() SAL_OVERRIDE;
public:
DECLARE_DEFAULT_LEAF_XTOR( OComboBoxModel );
- virtual void SAL_CALL disposing();
+ virtual void SAL_CALL disposing() SAL_OVERRIDE;
// OPropertySetHelper
- virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const;
+ virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
- throw (::com::sun::star::uno::Exception, std::exception);
+ throw (::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL convertFastPropertyValue(
::com::sun::star::uno::Any& _rConvertedValue, ::com::sun::star::uno::Any& _rOldValue, sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue )
- throw (::com::sun::star::lang::IllegalArgumentException);
+ throw (::com::sun::star::lang::IllegalArgumentException) SAL_OVERRIDE;
// XLoadListener
- virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL reloaded( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XServiceInfo
IMPLEMENTATION_NAME(OComboBoxModel);
- virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// UNO
DECLARE_UNO3_AGG_DEFAULTS(OComboBoxModel, OBoundControlModel);
- virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XPersistObject
- virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual OUString SAL_CALL getServiceName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL
- write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
+ write(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectOutputStream>& _rxOutStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL
- read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception);
+ read(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XObjectInputStream>& _rxInStream) throw(::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// OControlModel's property handling
virtual void describeFixedProperties(
::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rProps
- ) const;
+ ) const SAL_OVERRIDE;
virtual void describeAggregateProperties(
::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& /* [out] */ _rAggregateProps
- ) const;
+ ) const SAL_OVERRIDE;
// XEventListener
- virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// prevent method hiding
using OBoundControlModel::getFastPropertyValue;
@@ -121,22 +121,22 @@ public:
protected:
// OBoundControlModel overridables
virtual ::com::sun::star::uno::Any
- translateDbColumnToControlValue( );
- virtual sal_Bool commitControlValueToDbColumn( bool _bPostReset );
+ translateDbColumnToControlValue( ) SAL_OVERRIDE;
+ virtual sal_Bool commitControlValueToDbColumn( bool _bPostReset ) SAL_OVERRIDE;
- virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm );
- virtual void onDisconnectedDbColumn();
+ virtual void onConnectedDbColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxForm ) SAL_OVERRIDE;
+ virtual void onDisconnectedDbColumn() SAL_OVERRIDE;
virtual ::com::sun::star::uno::Any
- getDefaultForReset() const;
+ getDefaultForReset() const SAL_OVERRIDE;
- virtual void resetNoBroadcast();
+ virtual void resetNoBroadcast() SAL_OVERRIDE;
// OEntryListHelper overriables
- virtual void stringItemListChanged( ControlModelLock& _rInstanceLock );
- virtual void connectedExternalListSource( );
- virtual void disconnectedExternalListSource( );
- virtual void refreshInternalEntryList();
+ virtual void stringItemListChanged( ControlModelLock& _rInstanceLock ) SAL_OVERRIDE;
+ virtual void connectedExternalListSource( ) SAL_OVERRIDE;
+ virtual void disconnectedExternalListSource( ) SAL_OVERRIDE;
+ virtual void refreshInternalEntryList() SAL_OVERRIDE;
protected:
void loadData( bool _bForce );
@@ -155,7 +155,7 @@ public:
// XServiceInfo
IMPLEMENTATION_NAME(OComboBoxControl);
- virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception);
+ virtual StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};