diff options
Diffstat (limited to 'forms/source/inc')
-rw-r--r-- | forms/source/inc/FormComponent.hxx | 200 | ||||
-rw-r--r-- | forms/source/inc/InterfaceContainer.hxx | 74 | ||||
-rw-r--r-- | forms/source/inc/formnavigation.hxx | 20 | ||||
-rw-r--r-- | forms/source/inc/listenercontainers.hxx | 2 | ||||
-rw-r--r-- | forms/source/inc/property.hxx | 2 |
5 files changed, 149 insertions, 149 deletions
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx index 88ec9502803d..0faf02256a0d 100644 --- a/forms/source/inc/FormComponent.hxx +++ b/forms/source/inc/FormComponent.hxx @@ -82,9 +82,9 @@ namespace frm // macros for quickly declaring/implementing XServiceInfo #define DECLARE_XPERSISTOBJECT() \ - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ - virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; \ - virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; \ + virtual void SAL_CALL read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; class OControlModel; @@ -210,45 +210,45 @@ protected: // UNO DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XComponent (as base of XControl) - virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL dispose( ) throw(css::uno::RuntimeException, std::exception) override { OComponentHelper::dispose(); } - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override { OComponentHelper::addEventListener(_rxListener); } - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override { OComponentHelper::removeEventListener(_rxListener); } // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0; // XServiceInfo - static version static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(css::uno::RuntimeException); // XControl - virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL createPeer(const css::uno::Reference<css::awt::XToolkit>& Toolkit, const css::uno::Reference<css::awt::XWindowPeer>& Parent) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setModel(const css::uno::Reference<css::awt::XControlModel>& Model) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference<css::awt::XView> SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setContext(const css::uno::Reference<css::uno::XInterface>& Context) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getContext() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createPeer(const css::uno::Reference<css::awt::XToolkit>& Toolkit, const css::uno::Reference<css::awt::XWindowPeer>& Parent) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::awt::XWindowPeer> SAL_CALL getPeer() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference<css::awt::XControlModel>& Model) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::awt::XControlModel> SAL_CALL getModel() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference<css::awt::XView> SAL_CALL getView() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isDesignMode() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isTransparent() throw (css::uno::RuntimeException, std::exception) override; protected: virtual css::uno::Sequence< css::uno::Type> _getTypes(); @@ -284,24 +284,24 @@ public: virtual ~OBoundControl(); DECLARE_UNO3_AGG_DEFAULTS(OBoundControl, OControl) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override; // XBoundControl - virtual sal_Bool SAL_CALL getLock() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setLock(sal_Bool _bLock) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getLock() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLock(sal_Bool _bLock) throw(css::uno::RuntimeException, std::exception) override; // default implementation just disables the controls, overwrite _setLock to change this behaviour // XControl - virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setModel(const css::uno::Reference< css::awt::XControlModel >& Model) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; protected: - virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() override; // implement the lock setting void _setLock(bool _bLock); }; @@ -391,65 +391,65 @@ protected: public: DECLARE_UNO3_AGG_DEFAULTS(OControl, OComponentHelper) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; // XTypeProvider - virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type> SAL_CALL getTypes() throw(css::uno::RuntimeException, std::exception) override; // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName(const OUString& aName) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override = 0; // XSericeInfo - static version(s) static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(css::uno::RuntimeException); // XPersistObject - virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual OUString SAL_CALL getServiceName() throw(css::uno::RuntimeException, std::exception) override = 0; virtual void SAL_CALL - write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + write(const css::uno::Reference< css::io::XObjectOutputStream>& _rxOutStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL - read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + read(const css::uno::Reference< css::io::XObjectInputStream>& _rxInStream) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; // XChild (base of XFormComponent) - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; // css::beans::XPropertyState - virtual css::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle) SAL_OVERRIDE; - virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle) SAL_OVERRIDE; - virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual css::beans::PropertyState getPropertyStateByHandle(sal_Int32 nHandle) override; + virtual void setPropertyToDefaultByHandle(sal_Int32 nHandle) override; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone( ) throw (css::uno::RuntimeException, std::exception) override = 0; // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override; // XPropertyAccess - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; protected: using OPropertySetAggregationHelper::setPropertyValues; @@ -461,9 +461,9 @@ protected: protected: // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception) override; // OPropertySetHelper - virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; + virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; /** describes the properties provided by this class, or its respective derived class @@ -475,13 +475,13 @@ protected: ) const; // IPropertyBagHelperContext - virtual ::osl::Mutex& getMutex() SAL_OVERRIDE; + virtual ::osl::Mutex& getMutex() override; virtual void describeFixedAndAggregateProperties( css::uno::Sequence< css::beans::Property >& _out_rFixedProperties, css::uno::Sequence< css::beans::Property >& _out_rAggregateProperties - ) const SAL_OVERRIDE; + ) const override; virtual css::uno::Reference< css::beans::XMultiPropertySet > - getPropertiesInterface() SAL_OVERRIDE; + getPropertiesInterface() override; /** describes the properties of our aggregate @@ -665,7 +665,7 @@ protected: virtual ~OBoundControlModel(); /// late ctor after cloning - virtual void clonedFrom( const OControlModel* _pOriginal ) SAL_OVERRIDE; + virtual void clonedFrom( const OControlModel* _pOriginal ) override; /** initializes the part of the class which is related to the control value. @@ -944,7 +944,7 @@ protected: */ virtual void resetNoBroadcast(); - virtual css::uno::Sequence< css::uno::Type> _getTypes() SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Type> _getTypes() override; /// sets m_xField to the given new value, without notifying our listeners void impl_setField_noNotify( @@ -962,7 +962,7 @@ protected: // OControlModel's property handling virtual void describeFixedProperties( css::uno::Sequence< css::beans::Property >& /* [out] */ _rProps - ) const SAL_OVERRIDE; + ) const override; public: inline const css::uno::Reference< css::beans::XPropertySet>& getField() const @@ -973,89 +973,89 @@ public: public: // UNO link DECLARE_UNO3_AGG_DEFAULTS(OBoundControlModel, OControlModel) - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) override; // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // XReset - virtual void SAL_CALL reset( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reset( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeResetListener( const css::uno::Reference< css::form::XResetListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; // XServiceInfo - static version static css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames_Static() throw(css::uno::RuntimeException); // XChild - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XPersistObject - virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; // XBoundComponent - virtual sal_Bool SAL_CALL commit() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL commit() throw(css::uno::RuntimeException, std::exception) override; // XUpdateBroadcaster (base of XBoundComponent) - virtual void SAL_CALL addUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeUpdateListener( const css::uno::Reference< css::form::XUpdateListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override; // XPropertySet - virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue(css::uno::Any& rValue, sal_Int32 nHandle) const override; virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& _rConvertedValue, css::uno::Any& _rOldValue, sal_Int32 _nHandle, const css::uno::Any& _rValue ) - throw (css::lang::IllegalArgumentException) SAL_OVERRIDE; + throw (css::lang::IllegalArgumentException) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) SAL_OVERRIDE; + throw (css::uno::Exception, std::exception) override; using ::cppu::OPropertySetHelper::getFastPropertyValue; // css::beans::XPropertyState - virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const SAL_OVERRIDE; + virtual css::uno::Any getPropertyDefaultByHandle( sal_Int32 nHandle ) const override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& Source) throw (css::uno::RuntimeException, std::exception) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override; // XRowSetChangeListener - virtual void SAL_CALL onRowSetChanged( const css::lang::EventObject& i_Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL onRowSetChanged( const css::lang::EventObject& i_Event ) throw (css::uno::RuntimeException, std::exception) override; // XLoadListener - virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL loaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unloading( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL unloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reloading( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL reloaded( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) override; protected: // XBindableValue - virtual void SAL_CALL setValueBinding( const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::form::binding::XValueBinding > SAL_CALL getValueBinding( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValueBinding( const css::uno::Reference< css::form::binding::XValueBinding >& _rxBinding ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::form::binding::XValueBinding > SAL_CALL getValueBinding( ) throw (css::uno::RuntimeException, std::exception) override; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& _rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL modified( const css::lang::EventObject& _rEvent ) throw (css::uno::RuntimeException, std::exception) override; // XValidatable - virtual void SAL_CALL setValidator( const css::uno::Reference< css::form::validation::XValidator >& Validator ) throw (css::util::VetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Reference< css::form::validation::XValidator > SAL_CALL getValidator( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValidator( const css::uno::Reference< css::form::validation::XValidator >& Validator ) throw (css::util::VetoException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::form::validation::XValidator > SAL_CALL getValidator( ) throw (css::uno::RuntimeException, std::exception) override; // XValidityConstraintListener - virtual void SAL_CALL validityConstraintChanged( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL validityConstraintChanged( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // XValidatableFormComponent - virtual sal_Bool SAL_CALL isValid( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isValid( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeFormComponentValidityListener( const css::uno::Reference< css::form::validation::XFormComponentValidityListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; protected: // OPropertyChangeListener virtual void - _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + _propertyChanged( const css::beans::PropertyChangeEvent& _rEvt ) throw ( css::uno::RuntimeException, std::exception ) override; /// checks whether we currently have an external value binding in place inline bool hasExternalValueBinding() const { return m_xExternalBinding.is(); } diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 96a5d1717d89..e274ec5e3ea5 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -126,62 +126,62 @@ protected: public: // css::io::XPersistObject - virtual OUString SAL_CALL getServiceName( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; - virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getServiceName( ) throw(css::uno::RuntimeException, std::exception) override = 0; + virtual void SAL_CALL write( const css::uno::Reference< css::io::XObjectOutputStream >& OutStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL read( const css::uno::Reference< css::io::XObjectInputStream >& InStream ) throw(css::io::IOException, css::uno::RuntimeException, std::exception) override; // css::lang::XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing(const css::lang::EventObject& _rSource) throw(css::uno::RuntimeException, std::exception) override; // css::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange(const css::beans::PropertyChangeEvent& evt) throw (css::uno::RuntimeException, std::exception) override; // css::container::XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override ; + virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; // css::container::XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration> SAL_CALL createEnumeration() throw(css::uno::RuntimeException, std::exception) override; // css::container::XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence<OUString> SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence<OUString> SAL_CALL getElementNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; // css::container::XNameReplace - virtual void SAL_CALL replaceByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XNameContainer - virtual void SAL_CALL insertByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeByName(const OUString& Name) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertByName(const OUString& Name, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByName(const OUString& Name) throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XIndexReplace - virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL replaceByIndex(sal_Int32 _nIndex, const css::uno::Any& _rElement) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XIndexContainer - virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL insertByIndex(sal_Int32 _nIndex, const css::uno::Any& Element) throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeByIndex(sal_Int32 _nIndex) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; // css::container::XContainer - virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeContainerListener(const css::uno::Reference< css::container::XContainerListener>& _rxListener) throw(css::uno::RuntimeException, std::exception) override; // css::script::XEventAttacherManager - virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const css::script::ScriptEventDescriptor& aScriptEvent ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const css::uno::Sequence< css::script::ScriptEventDescriptor >& aScriptEvents ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL attach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject, const css::uno::Any& aHelper ) throw(css::lang::IllegalArgumentException, css::lang::ServiceNotRegisteredException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL detach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addScriptListener( const css::uno::Reference< css::script::XScriptListener >& xListener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removeScriptListener( const css::uno::Reference< css::script::XScriptListener >& Listener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerScriptEvent( sal_Int32 nIndex, const css::script::ScriptEventDescriptor& aScriptEvent ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL registerScriptEvents( sal_Int32 nIndex, const css::uno::Sequence< css::script::ScriptEventDescriptor >& aScriptEvents ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL revokeScriptEvent( sal_Int32 nIndex, const OUString& aListenerType, const OUString& aEventMethod, const OUString& aRemoveListenerParam ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL revokeScriptEvents( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeEntry( sal_Int32 nIndex ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::script::ScriptEventDescriptor > SAL_CALL getScriptEvents( sal_Int32 Index ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL attach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject, const css::uno::Any& aHelper ) throw(css::lang::IllegalArgumentException, css::lang::ServiceNotRegisteredException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL detach( sal_Int32 nIndex, const css::uno::Reference< css::uno::XInterface >& xObject ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addScriptListener( const css::uno::Reference< css::script::XScriptListener >& xListener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removeScriptListener( const css::uno::Reference< css::script::XScriptListener >& Listener ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; protected: // helper @@ -298,15 +298,15 @@ public: DECLARE_UNO3_AGG_DEFAULTS(OFormComponents, FormComponentsBase) - virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL queryAggregation(const css::uno::Type& _rType) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; // OComponentHelper - virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL disposing() override; // css::form::XFormComponent - virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference<css::uno::XInterface> SAL_CALL getParent() throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent(const css::uno::Reference<css::uno::XInterface>& Parent) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; // XEventListener using OInterfaceContainer::disposing; diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx index 2981955519d0..f79b0bfb6f99 100644 --- a/forms/source/inc/formnavigation.hxx +++ b/forms/source/inc/formnavigation.hxx @@ -82,22 +82,22 @@ namespace frm void SAL_CALL dispose( ) throw( css::uno::RuntimeException ); // XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL registerDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& Interceptor ) throw (css::uno::RuntimeException, std::exception) override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& State ) throw (css::uno::RuntimeException, std::exception) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; // IFeatureDispatcher - virtual void dispatch( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; - virtual void dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamName, const css::uno::Any& _rParamValue ) const SAL_OVERRIDE; - virtual bool isEnabled( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; - virtual bool getBooleanState( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; - virtual OUString getStringState( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; - virtual sal_Int32 getIntegerState( sal_Int16 _nFeatureId ) const SAL_OVERRIDE; + virtual void dispatch( sal_Int16 _nFeatureId ) const override; + virtual void dispatchWithArgument( sal_Int16 _nFeatureId, const sal_Char* _pParamName, const css::uno::Any& _rParamValue ) const override; + virtual bool isEnabled( sal_Int16 _nFeatureId ) const override; + virtual bool getBooleanState( sal_Int16 _nFeatureId ) const override; + virtual OUString getStringState( sal_Int16 _nFeatureId ) const override; + virtual sal_Int32 getIntegerState( sal_Int16 _nFeatureId ) const override; // own overridables /** is called when the interceptors have. diff --git a/forms/source/inc/listenercontainers.hxx b/forms/source/inc/listenercontainers.hxx index 386e75937f6d..59cdccc35a02 100644 --- a/forms/source/inc/listenercontainers.hxx +++ b/forms/source/inc/listenercontainers.hxx @@ -103,7 +103,7 @@ namespace frm virtual bool implTypedNotify( const css::uno::Reference< css::form::XResetListener >& _rxListener, const css::lang::EventObject& _rEvent - ) SAL_OVERRIDE; + ) override; }; diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx index 7737652f0d31..a6dd9d05a344 100644 --- a/forms/source/inc/property.hxx +++ b/forms/source/inc/property.hxx @@ -96,7 +96,7 @@ class ConcreteInfoService : public ::comphelper::IPropertyInfoService public: virtual ~ConcreteInfoService() {} - virtual sal_Int32 getPreferredPropertyId(const OUString& _rName) SAL_OVERRIDE; + virtual sal_Int32 getPreferredPropertyId(const OUString& _rName) override; }; |