diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
| commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
| tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /chart2/source | |
| parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) | |
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 'chart2/source')
225 files changed, 2076 insertions, 1884 deletions
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index d8a824ed9965..18788dc81749 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -75,47 +75,47 @@ public: virtual ~AccessibleChartElement(); // ________ AccessibleBase ________ - virtual bool ImplUpdateChildren(); + virtual bool ImplUpdateChildren() SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ImplGetAccessibleChildById( sal_Int32 i ) const throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Int32 ImplGetAccessibleChildCount() const - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTitledBorderText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getToolTipText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // the following interface is implemented in AccessibleBase, however it is // also a (non-virtual) base class of XAccessibleExtendedComponent Thus // these methods have to be overloaded and forward to AccessibleBase // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: bool m_bHasText; diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index bd3e2d32e96d..07c1c990ab04 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -50,40 +50,40 @@ public: // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XAccessibleContext ________ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XAccessibleExtendedComponent ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTitledBorderText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getToolTipText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::accessibility::AccessibleShape* m_pAccShape; diff --git a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx index 694e40dc1a8f..715fa61d51f0 100644 --- a/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx +++ b/chart2/source/controller/accessibility/AccessibleViewForwarder.hxx @@ -36,12 +36,12 @@ public: virtual ~AccessibleViewForwarder(); // ________ IAccessibleViewforwarder ________ - virtual bool IsValid() const; - virtual Rectangle GetVisibleArea() const; - virtual Point LogicToPixel( const Point& rPoint ) const; - virtual Size LogicToPixel( const Size& rSize ) const; - virtual Point PixelToLogic( const Point& rPoint ) const; - virtual Size PixelToLogic( const Size& rSize ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisibleArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point& rPoint ) const SAL_OVERRIDE; + virtual Size LogicToPixel( const Size& rSize ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point& rPoint ) const SAL_OVERRIDE; + virtual Size PixelToLogic( const Size& rSize ) const SAL_OVERRIDE; private: AccessibleViewForwarder( AccessibleViewForwarder& ); diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index f453b9d7a780..b65e2f8eb148 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -56,34 +56,34 @@ public: // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); - virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() SAL_OVERRIDE; + virtual const std::vector< WrappedProperty* > createWrappedProperties() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; private: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 989c0b8078a8..61ea830d5513 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -71,53 +71,53 @@ public: APPHELPER_XSERVICEINFO_DECL() //ReferenceSizePropertyProvider - virtual void updateReferenceSize(); - virtual ::com::sun::star::uno::Any getReferenceSize(); - virtual ::com::sun::star::awt::Size getCurrentSizeForReference(); + virtual void updateReferenceSize() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any getReferenceSize() SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size getCurrentSizeForReference() SAL_OVERRIDE; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ chart::XAxis ____ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XNumberFormatsSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); - virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() SAL_OVERRIDE; + virtual const std::vector< WrappedProperty* > createWrappedProperties() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; private: //methods ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxis(); diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index c3f39cee5b89..406c2ff76100 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -134,12 +134,12 @@ struct lcl_AllOperator : public lcl_Operator { } - virtual bool setsCategories( bool /*bDataInColumns*/ ) + virtual bool setsCategories( bool /*bDataInColumns*/ ) SAL_OVERRIDE { return true; } - virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) + virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) SAL_OVERRIDE { if( !xDataAccess.is() ) return; @@ -181,7 +181,7 @@ struct lcl_DataOperator : public lcl_Operator { } - virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) + virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) SAL_OVERRIDE { if( xDataAccess.is() ) xDataAccess->setData( lcl_getNANInsteadDBL_MIN( m_rData ) ); @@ -201,13 +201,13 @@ struct lcl_RowDescriptionsOperator : public lcl_Operator { } - virtual bool setsCategories( bool bDataInColumns ) + virtual bool setsCategories( bool bDataInColumns ) SAL_OVERRIDE { m_bDataInColumns = bDataInColumns; return bDataInColumns; } - virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) + virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) SAL_OVERRIDE { if( xDataAccess.is() ) { @@ -233,13 +233,13 @@ struct lcl_ComplexRowDescriptionsOperator : public lcl_Operator { } - virtual bool setsCategories( bool bDataInColumns ) + virtual bool setsCategories( bool bDataInColumns ) SAL_OVERRIDE { m_bDataInColumns = bDataInColumns; return bDataInColumns; } - virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) + virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) SAL_OVERRIDE { if( xDataAccess.is() ) { @@ -262,12 +262,12 @@ struct lcl_AnyRowDescriptionsOperator : public lcl_Operator { } - virtual bool setsCategories( bool bDataInColumns ) + virtual bool setsCategories( bool bDataInColumns ) SAL_OVERRIDE { return bDataInColumns; } - virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) + virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) SAL_OVERRIDE { if( xDataAccess.is() ) xDataAccess->setAnyRowDescriptions( m_rAnyRowDescriptions ); @@ -287,13 +287,13 @@ struct lcl_ColumnDescriptionsOperator : public lcl_Operator { } - virtual bool setsCategories( bool bDataInColumns ) + virtual bool setsCategories( bool bDataInColumns ) SAL_OVERRIDE { m_bDataInColumns = bDataInColumns; return !bDataInColumns; } - virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) + virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) SAL_OVERRIDE { if( xDataAccess.is() ) { @@ -319,13 +319,13 @@ struct lcl_ComplexColumnDescriptionsOperator : public lcl_Operator { } - virtual bool setsCategories( bool bDataInColumns ) + virtual bool setsCategories( bool bDataInColumns ) SAL_OVERRIDE { m_bDataInColumns = bDataInColumns; return !bDataInColumns; } - virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) + virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) SAL_OVERRIDE { if( xDataAccess.is() ) { @@ -348,12 +348,12 @@ struct lcl_AnyColumnDescriptionsOperator : public lcl_Operator { } - virtual bool setsCategories( bool bDataInColumns ) + virtual bool setsCategories( bool bDataInColumns ) SAL_OVERRIDE { return bDataInColumns; } - virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) + virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) SAL_OVERRIDE { if( xDataAccess.is() ) xDataAccess->setAnyColumnDescriptions( m_rAnyColumnDescriptions ); @@ -370,12 +370,12 @@ struct lcl_DateCategoriesOperator : public lcl_Operator { } - virtual bool setsCategories( bool /*bDataInColumns*/ ) + virtual bool setsCategories( bool /*bDataInColumns*/ ) SAL_OVERRIDE { return true; } - virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) + virtual void apply( const Reference< XAnyDescriptionAccess >& xDataAccess ) SAL_OVERRIDE { Reference< XDateCategories > xDateCategories( xDataAccess, uno::UNO_QUERY ); if( xDateCategories.is() ) diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 370df448889f..3822c2697aaf 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -59,84 +59,84 @@ public: protected: // ____ XDateCategories ____ - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XAnyDescriptionAccess ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAnyRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAnyColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); + getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); + getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getNotANumber() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void fireChartDataChangeEvent( ::com::sun::star::chart::ChartDataChangeEvent& aEvent ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index c7eb4ef3b6bd..053ac1c43507 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -279,13 +279,13 @@ public: virtual ~WrappedDataSourceLabelsInFirstRowProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -377,13 +377,13 @@ public: virtual ~WrappedDataSourceLabelsInFirstColumnProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -475,13 +475,13 @@ public: virtual ~WrappedHasLegendProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -559,13 +559,13 @@ public: virtual ~WrappedHasMainTitleProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -632,13 +632,13 @@ public: virtual ~WrappedHasSubTitleProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index 222b0ef24633..047f803bf4fe 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -218,13 +218,13 @@ public: virtual ~WrappedAttachedAxisProperty(); virtual void setPropertyValue( const Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -290,8 +290,8 @@ public: virtual ~WrappedSegmentOffsetProperty(); protected: - virtual Any convertInnerToOuterValue( const Any& rInnerValue ) const; - virtual Any convertOuterToInnerValue( const Any& rOuterValue ) const; + virtual Any convertInnerToOuterValue( const Any& rInnerValue ) const SAL_OVERRIDE; + virtual Any convertOuterToInnerValue( const Any& rOuterValue ) const SAL_OVERRIDE; }; WrappedSegmentOffsetProperty::WrappedSegmentOffsetProperty() : @@ -332,13 +332,13 @@ public: virtual ~WrappedLineColorProperty(); virtual void setPropertyValue( const Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; @@ -393,10 +393,10 @@ public: virtual ~WrappedLineStyleProperty(); virtual void setPropertyValue( const Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index db2ee7e80090..743a5c172c44 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -78,40 +78,40 @@ public: // ___lang::XInitialization___ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //ReferenceSizePropertyProvider - virtual void updateReferenceSize(); - virtual ::com::sun::star::uno::Any getReferenceSize(); - virtual ::com::sun::star::awt::Size getCurrentSizeForReference(); + virtual void updateReferenceSize() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any getReferenceSize() SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size getCurrentSizeForReference() SAL_OVERRIDE; protected: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); - virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() SAL_OVERRIDE; + virtual const std::vector< WrappedProperty* > createWrappedProperties() SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); + ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //own methods ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeries(); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index a10ee39018c0..5ea89aa06033 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -1210,13 +1210,13 @@ public: virtual ~WrappedDataRowSourceProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1312,13 +1312,13 @@ public: virtual ~WrappedStackingProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: //methods bool detectInnerValue( StackMode& eInnerStackMode ) const; @@ -1424,13 +1424,13 @@ public: virtual ~WrappedDim3DProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1495,13 +1495,13 @@ public: virtual ~WrappedVerticalProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1571,13 +1571,13 @@ public: virtual ~WrappedNumberOfLinesProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: //methods bool detectInnerValue( uno::Any& rInnerValue ) const; @@ -1725,13 +1725,13 @@ public: virtual ~WrappedAttributedDataPointsProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1839,13 +1839,13 @@ public: virtual ~WrappedSolidTypeProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1912,13 +1912,13 @@ public: virtual ~WrappedAutomaticSizeProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; }; WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty() @@ -1984,7 +1984,7 @@ public: virtual ~WrappedIncludeHiddenCellsProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 8ea94cbdd0ff..72512bdd9fe4 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -86,157 +86,157 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDiagram ____ virtual OUString SAL_CALL getDiagramType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XShape (base of XDiagram) ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XAxisSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XAxisZSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getZAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getZMainGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getZHelpGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getZAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTwoAxisXSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getSecondaryXAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getXAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXMainGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getXHelpGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTwoAxisYSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getSecondaryYAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getYAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYAxis() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYHelpGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getYMainGrid() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XSecondAxisTitleSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getSecondXAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getSecondYAxisTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XStatisticDisplay ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getUpBar() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDownBar() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinMaxLine() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ X3DDisplay ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getWall() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getFloor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDiagramPositioning ____ - virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDiagramPositionIncludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDiagramPositionExcludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDiagramPositionIncludingAxes( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const ::com::sun::star::awt::Rectangle& PositionRect ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDiagramProvider ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL getDiagram() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); - virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() SAL_OVERRIDE; + virtual const std::vector< WrappedProperty* > createWrappedProperties() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; private: void updateFromModel(); diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index 6de2a04153b2..bc0fe0818d78 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -66,19 +66,19 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); - virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() SAL_OVERRIDE; + virtual const std::vector< WrappedProperty* > createWrappedProperties() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; private: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index c275e3796797..5aa6c35324b4 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -60,13 +60,13 @@ public: virtual ~WrappedLegendAlignmentProperty(); virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; protected: - virtual Any convertInnerToOuterValue( const Any& rInnerValue ) const; - virtual Any convertOuterToInnerValue( const Any& rOuterValue ) const; + virtual Any convertInnerToOuterValue( const Any& rInnerValue ) const SAL_OVERRIDE; + virtual Any convertOuterToInnerValue( const Any& rOuterValue ) const SAL_OVERRIDE; }; WrappedLegendAlignmentProperty::WrappedLegendAlignmentProperty() diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index eb1bb481e824..177be2486c91 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -58,40 +58,40 @@ public: APPHELPER_XSERVICEINFO_DECL() //ReferenceSizePropertyProvider - virtual void updateReferenceSize(); - virtual ::com::sun::star::uno::Any getReferenceSize(); - virtual ::com::sun::star::awt::Size getCurrentSizeForReference(); + virtual void updateReferenceSize() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any getReferenceSize() SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size getCurrentSizeForReference() SAL_OVERRIDE; // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); - virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() SAL_OVERRIDE; + virtual const std::vector< WrappedProperty* > createWrappedProperties() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; private: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 0a56a4cdc281..369e212c95bb 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -65,44 +65,44 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 3d3dee6c3191..0599503f9229 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -54,11 +54,11 @@ public: virtual ~WrappedTitleStringProperty(); virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; protected: Reference< uno::XComponentContext > m_xContext; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index dc3d277a010f..71650f57c5b2 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -57,35 +57,35 @@ public: APPHELPER_XSERVICEINFO_DECL() //ReferenceSizePropertyProvider - virtual void updateReferenceSize(); - virtual ::com::sun::star::uno::Any getReferenceSize(); - virtual ::com::sun::star::awt::Size getCurrentSizeForReference(); + virtual void updateReferenceSize() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any getReferenceSize() SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size getCurrentSizeForReference() SAL_OVERRIDE; protected: // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XShapeDescriptor (base of XShape) ____ virtual OUString SAL_CALL getShapeType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // character properties have to be handled differently (via the XFormattedString elements) void getFastCharacterPropertyValue( sal_Int32 nHandle, ::com::sun::star::uno::Any& rValue ); @@ -93,21 +93,21 @@ protected: throw (::com::sun::star::uno::Exception); // ____ WrappedPropertySet ____ - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); - virtual const std::vector< WrappedProperty* > createWrappedProperties(); + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() SAL_OVERRIDE; + virtual const std::vector< WrappedProperty* > createWrappedProperties() SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getFirstCharacterPropertySet(); diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 579deb21bcdd..c4c003bea4fc 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -64,44 +64,44 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: //methods ::cppu::IPropertyArrayHelper& getInfoHelper(); diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index abb01b19a1be..f1896d876227 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -53,19 +53,19 @@ public: // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); - virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() SAL_OVERRIDE; + virtual const std::vector< WrappedProperty* > createWrappedProperties() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; private: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index 7ad704203d09..9d84b1fd92bb 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -34,10 +34,10 @@ public: virtual ~WrappedAddInProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -50,10 +50,10 @@ public: virtual ~WrappedBaseDiagramProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -66,10 +66,10 @@ public: virtual ~WrappedAdditionalShapesProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -82,10 +82,10 @@ public: virtual ~WrappedRefreshAddInAllowedProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ChartDocumentWrapper& m_rChartDocumentWrapper; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 28e3019955fd..d48727ace25d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -41,11 +41,11 @@ public: virtual ~WrappedAutomaticPositionProperty(); virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; }; WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index ffae3a8344aa..616a7b6ac9dd 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -41,13 +41,13 @@ public: virtual ~WrappedAxisAndGridExistenceProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -208,13 +208,13 @@ public: virtual ~WrappedAxisTitleExistenceProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -322,13 +322,13 @@ public: virtual ~WrappedAxisLabelExistenceProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: //member ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index fa87165862e4..9e59aab5e0ae 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -37,20 +37,20 @@ public: virtual ~WrappedCharacterHeightProperty_Base(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: - virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const; - virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const; + virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const SAL_OVERRIDE; protected: ReferenceSizePropertyProvider* m_pRefSizePropProvider; diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx index 0e2020aff790..2b352032a2ad 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx @@ -39,8 +39,8 @@ namespace wrapper class WrappedDataCaptionProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 > { public: - virtual sal_Int32 getValueFromSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const; + virtual sal_Int32 getValueFromSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const SAL_OVERRIDE; explicit WrappedDataCaptionProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 64d66613697f..54f284569126 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -40,10 +40,10 @@ public: virtual ~WrappedBarPositionProperty_Base(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; void setDimensionAndAxisIndex( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index 63a562c72e87..618fc074fb09 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -38,13 +38,13 @@ public: virtual ~WrappedNumberFormatProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; friend class WrappedLinkNumberFormatProperty; private: @@ -60,13 +60,13 @@ public: virtual ~WrappedLinkNumberFormatProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; friend class WrappedNumberFormatProperty; private: diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index e2c64272eac8..56b7789ea075 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -60,10 +60,10 @@ public: static void addWrappedProperties( std::vector< WrappedProperty* >& rList, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: //methods void setPropertyValue( tScaleProperty eScaleProperty, const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 5b6e32e9054c..1092b580113d 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -41,11 +41,11 @@ public: virtual ~WrappedScaleTextProperty(); virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); + throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; private: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index 88108d4596f9..f2e7cd3bd5c1 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -45,13 +45,13 @@ public: virtual ~WrappedD3DTransformMatrixProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx index 1cf6b28fd2e2..b309a9043580 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx @@ -35,7 +35,7 @@ public: , DataSeriesPointWrapper* pDataSeriesPointWrapper ); virtual ~WrappedSeriesAreaOrLineProperty(); - virtual OUString getInnerName() const; + virtual OUString getInnerName() const SAL_OVERRIDE; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index a8177f2ffc9a..717fa93e2cf2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -111,7 +111,7 @@ public: } } virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE { PROPERTYTYPE aNewValue = PROPERTYTYPE(); if( ! (rOuterValue >>= aNewValue) ) @@ -136,7 +136,7 @@ public: } virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE { if( m_ePropertyType == DIAGRAM ) { @@ -160,7 +160,7 @@ public: } virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE { return m_aDefaultValue; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index 13a7560724f5..3edef79bf576 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -94,7 +94,7 @@ public: return bHasDetectableInnerValue; } void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE { PROPERTYTYPE aNewValue; if( ! (rOuterValue >>= aNewValue) ) @@ -132,7 +132,7 @@ public: } ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE { bool bHasAmbiguousValue = false; PROPERTYTYPE aValue; @@ -144,7 +144,7 @@ public: } ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE { return m_aDefaultValue; } @@ -163,8 +163,8 @@ public: explicit WrappedSplineTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ); virtual ~WrappedSplineTypeProperty(); - virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const; - virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const; + virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const SAL_OVERRIDE; }; namespace diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx index 473447f3b26c..6189fee41e87 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx @@ -204,8 +204,8 @@ protected: class WrappedConstantErrorLowProperty : public WrappedStatisticProperty< double > { public: - virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const; + virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const SAL_OVERRIDE; explicit WrappedConstantErrorLowProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -258,8 +258,8 @@ void WrappedConstantErrorLowProperty::setValueToSeries( const Reference< beans:: class WrappedConstantErrorHighProperty : public WrappedStatisticProperty< double > { public: - virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const; + virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const SAL_OVERRIDE; explicit WrappedConstantErrorHighProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -312,8 +312,8 @@ void WrappedConstantErrorHighProperty::setValueToSeries( const Reference< beans: class WrappedMeanValueProperty : public WrappedStatisticProperty< sal_Bool > { public: - virtual sal_Bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Bool& aNewValue ) const; + virtual sal_Bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Bool& aNewValue ) const SAL_OVERRIDE; explicit WrappedMeanValueProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -356,8 +356,8 @@ void WrappedMeanValueProperty::setValueToSeries( const Reference< beans::XProper class WrappedErrorCategoryProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorCategory > { public: - virtual ::com::sun::star::chart::ChartErrorCategory getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorCategory& aNewValue ) const; + virtual ::com::sun::star::chart::ChartErrorCategory getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorCategory& aNewValue ) const SAL_OVERRIDE; explicit WrappedErrorCategoryProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -454,8 +454,8 @@ void WrappedErrorCategoryProperty::setValueToSeries( const Reference< beans::XPr class WrappedPercentageErrorProperty : public WrappedStatisticProperty< double > { public: - virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const; + virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const SAL_OVERRIDE; explicit WrappedPercentageErrorProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -508,8 +508,8 @@ void WrappedPercentageErrorProperty::setValueToSeries( const Reference< beans::X class WrappedErrorMarginProperty : public WrappedStatisticProperty< double > { public: - virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const; + virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const SAL_OVERRIDE; explicit WrappedErrorMarginProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -562,8 +562,8 @@ void WrappedErrorMarginProperty::setValueToSeries( const Reference< beans::XProp class WrappedErrorIndicatorProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartErrorIndicatorType > { public: - virtual ::com::sun::star::chart::ChartErrorIndicatorType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorIndicatorType& aNewValue ) const; + virtual ::com::sun::star::chart::ChartErrorIndicatorType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartErrorIndicatorType& aNewValue ) const SAL_OVERRIDE; explicit WrappedErrorIndicatorProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -635,8 +635,8 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP class WrappedErrorBarStyleProperty : public WrappedStatisticProperty< sal_Int32 > { public: - virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& nNewValue ) const; + virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& nNewValue ) const SAL_OVERRIDE; explicit WrappedErrorBarStyleProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact1, tSeriesOrDiagramPropertyType ePropertyType ); @@ -681,8 +681,8 @@ void WrappedErrorBarStyleProperty::setValueToSeries( const Reference< beans::XPr class WrappedErrorBarRangePositiveProperty : public WrappedStatisticProperty< OUString > { public: - virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const; + virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const SAL_OVERRIDE; explicit WrappedErrorBarRangePositiveProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -748,8 +748,8 @@ void WrappedErrorBarRangePositiveProperty::setValueToSeries( const Reference< be class WrappedErrorBarRangeNegativeProperty : public WrappedStatisticProperty< OUString > { public: - virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const; + virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const SAL_OVERRIDE; explicit WrappedErrorBarRangeNegativeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -815,8 +815,8 @@ void WrappedErrorBarRangeNegativeProperty::setValueToSeries( const Reference< be class WrappedRegressionCurvesProperty : public WrappedStatisticProperty< ::com::sun::star::chart::ChartRegressionCurveType > { public: - virtual ::com::sun::star::chart::ChartRegressionCurveType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartRegressionCurveType & aNewValue ) const; + virtual ::com::sun::star::chart::ChartRegressionCurveType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const ::com::sun::star::chart::ChartRegressionCurveType & aNewValue ) const SAL_OVERRIDE; explicit WrappedRegressionCurvesProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -869,9 +869,9 @@ void WrappedRegressionCurvesProperty::setValueToSeries( const Reference< beans:: class WrappedStatisticPropertySetProperty : public WrappedStatisticProperty< Reference< beans::XPropertySet > > { public: - virtual Reference< beans::XPropertySet > getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; + virtual Reference< beans::XPropertySet > getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; // properties are read-only, so this method should never be called - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const Reference< beans::XPropertySet > & xNewValue ) const; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const Reference< beans::XPropertySet > & xNewValue ) const SAL_OVERRIDE; enum PropertySetType { diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 8cdf63006ca8..d1b320553adc 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -46,10 +46,10 @@ public: virtual ~WrappedStockProperty(); void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0; @@ -122,9 +122,9 @@ public: virtual ~WrappedVolumeProperty(); ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const; + uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const SAL_OVERRIDE; }; WrappedVolumeProperty::WrappedVolumeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) @@ -193,9 +193,9 @@ public: virtual ~WrappedUpDownProperty(); ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; - uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const; + uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( sal_Bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const SAL_OVERRIDE; }; WrappedUpDownProperty::WrappedUpDownProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact ) : WrappedStockProperty( "UpDown", uno::makeAny(sal_False) , spChart2ModelContact ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index fb03897f2dc7..b8f9a8e1827e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -67,13 +67,13 @@ namespace wrapper class WrappedSymbolTypeProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 > { public: - virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const; + virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const SAL_OVERRIDE; virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException); + throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) SAL_OVERRIDE; virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException); + throw (beans::UnknownPropertyException, uno::RuntimeException) SAL_OVERRIDE; explicit WrappedSymbolTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -83,8 +83,8 @@ public: class WrappedSymbolBitmapURLProperty : public WrappedSeriesOrDiagramProperty< OUString > { public: - virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewGraphicURL ) const; + virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewGraphicURL ) const SAL_OVERRIDE; explicit WrappedSymbolBitmapURLProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -94,10 +94,10 @@ public: class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty< awt::Size > { public: - virtual awt::Size getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const awt::Size& aNewSize ) const; + virtual awt::Size getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const awt::Size& aNewSize ) const SAL_OVERRIDE; virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException); + throw (beans::UnknownPropertyException, uno::RuntimeException) SAL_OVERRIDE; explicit WrappedSymbolSizeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); @@ -107,10 +107,10 @@ public: class WrappedSymbolAndLinesProperty : public WrappedSeriesOrDiagramProperty< sal_Bool > { public: - virtual sal_Bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const; - virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Bool& bDrawLines ) const; + virtual sal_Bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const SAL_OVERRIDE; + virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Bool& bDrawLines ) const SAL_OVERRIDE; virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException); + throw (beans::UnknownPropertyException, uno::RuntimeException) SAL_OVERRIDE; explicit WrappedSymbolAndLinesProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx index 842b41403138..09fdb7e34d94 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx @@ -31,11 +31,11 @@ public: virtual ~WrappedTextRotationProperty(); virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: - virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const; - virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const; + virtual ::com::sun::star::uno::Any convertInnerToOuterValue( const ::com::sun::star::uno::Any& rInnerValue ) const SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const SAL_OVERRIDE; bool m_bDirectState; }; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index c4aee6202c8e..f27fd813c549 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -135,10 +135,10 @@ public: ColumnOrBarChartDialogController_Base(); virtual ~ColumnOrBarChartDialogController_Base(); - virtual bool shouldShow_3DLookControl() const; - virtual bool shouldShow_GeometryControl() const; + virtual bool shouldShow_3DLookControl() const SAL_OVERRIDE; + virtual bool shouldShow_GeometryControl() const SAL_OVERRIDE; - virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter ); + virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter ) SAL_OVERRIDE; }; class ColumnChartDialogController : public ColumnOrBarChartDialogController_Base @@ -147,10 +147,10 @@ public: ColumnChartDialogController(); virtual ~ColumnChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; }; class BarChartDialogController : public ColumnOrBarChartDialogController_Base @@ -159,10 +159,10 @@ public: BarChartDialogController(); virtual ~BarChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; }; class PieChartDialogController : public ChartTypeDialogController @@ -171,13 +171,13 @@ public: PieChartDialogController(); virtual ~PieChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); - virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; - virtual bool shouldShow_3DLookControl() const; + virtual bool shouldShow_3DLookControl() const SAL_OVERRIDE; }; class LineChartDialogController : public ChartTypeDialogController @@ -186,16 +186,16 @@ public: LineChartDialogController(); virtual ~LineChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); - virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); - virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; - virtual bool shouldShow_StackingControl() const; - virtual bool shouldShow_DeepStackingControl() const; - virtual bool shouldShow_SplineControl() const; + virtual bool shouldShow_StackingControl() const SAL_OVERRIDE; + virtual bool shouldShow_DeepStackingControl() const SAL_OVERRIDE; + virtual bool shouldShow_SplineControl() const SAL_OVERRIDE; }; class XYChartDialogController : public ChartTypeDialogController @@ -204,14 +204,14 @@ public: XYChartDialogController(); virtual ~XYChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); - virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; - virtual bool shouldShow_SplineControl() const; - virtual bool shouldShow_SortByXValuesResourceGroup() const; + virtual bool shouldShow_SplineControl() const SAL_OVERRIDE; + virtual bool shouldShow_SortByXValuesResourceGroup() const SAL_OVERRIDE; }; class AreaChartDialogController : public ChartTypeDialogController @@ -220,14 +220,14 @@ public: AreaChartDialogController(); virtual ~AreaChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); - virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); - virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToMainType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; - virtual bool shouldShow_3DLookControl() const; + virtual bool shouldShow_3DLookControl() const SAL_OVERRIDE; }; class NetChartDialogController : public ChartTypeDialogController @@ -236,13 +236,13 @@ public: NetChartDialogController(); virtual ~NetChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); - virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; - virtual bool shouldShow_StackingControl() const; + virtual bool shouldShow_StackingControl() const SAL_OVERRIDE; }; class StockChartDialogController : public ChartTypeDialogController @@ -251,11 +251,11 @@ public: StockChartDialogController(); virtual ~StockChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); - virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; }; class CombiColumnLineChartDialogController : public ChartTypeDialogController @@ -263,19 +263,19 @@ class CombiColumnLineChartDialogController : public ChartTypeDialogController public: CombiColumnLineChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); - virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; - virtual void showExtraControls(VclBuilderContainer* pParent); - virtual void hideExtraControls() const; + virtual void showExtraControls(VclBuilderContainer* pParent) SAL_OVERRIDE; + virtual void hideExtraControls() const SAL_OVERRIDE; virtual void fillExtraControls( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel - , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const; + , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const SAL_OVERRIDE; - virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException); + virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: DECL_LINK( ChangeLineCountHdl, void* ); @@ -291,11 +291,11 @@ public: BubbleChartDialogController(); virtual ~BubbleChartDialogController(); - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); - virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; + virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ) SAL_OVERRIDE; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 054a677454d9..e4784797110c 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -103,7 +103,7 @@ class SeriesHeaderEdit : public Edit public: SeriesHeaderEdit( Window * pParent ); virtual ~SeriesHeaderEdit(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; void setStartColumn( sal_Int32 nStartColumn ); sal_Int32 getStartColumn() const; diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 5f2f980b0678..f32363a50b95 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -51,18 +51,18 @@ class DataBrowser : public ::svt::EditBrowseBox { protected: // EditBrowseBox overridables - virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; - virtual bool SeekRow( long nRow ); - virtual bool IsTabAllowed( bool bForward ) const; - virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ); - virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ); - virtual bool SaveModified(); - virtual void CursorMoved(); + virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const SAL_OVERRIDE; + virtual bool SeekRow( long nRow ) SAL_OVERRIDE; + virtual bool IsTabAllowed( bool bForward ) const SAL_OVERRIDE; + virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; + virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ) SAL_OVERRIDE; + virtual bool SaveModified() SAL_OVERRIDE; + virtual void CursorMoved() SAL_OVERRIDE; // called whenever the control of the current cell has been modified - virtual void CellModified(); - virtual void ColumnResized( sal_uInt16 nColId ); - virtual void EndScroll(); - virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ); + virtual void CellModified() SAL_OVERRIDE; + virtual void ColumnResized( sal_uInt16 nColId ) SAL_OVERRIDE; + virtual void EndScroll() SAL_OVERRIDE; + virtual void MouseButtonDown( const BrowserMouseEvent& rEvt ) SAL_OVERRIDE; void SetDirty(); @@ -78,7 +78,7 @@ public: @return the text out of the cell */ - virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const; + virtual OUString GetCellText(long nRow, sal_uInt16 nColId) const SAL_OVERRIDE; /** returns the number in the given cell. If a cell is empty or contains a string, the result will be Nan @@ -88,7 +88,7 @@ public: bool isDateString( const OUString& aInputString, double& fOutDateValue ); // Window - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; /// @return old state bool SetReadOnly( bool bNewState ); diff --git a/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx b/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx index 0adba3232624..19b603d2bc11 100644 --- a/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx +++ b/chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx @@ -20,13 +20,13 @@ public: GL3DBarChartDialogController(); virtual ~GL3DBarChartDialogController(); - virtual bool shouldShow_GL3DResourceGroup() const; + virtual bool shouldShow_GL3DResourceGroup() const SAL_OVERRIDE; - virtual OUString getName(); - virtual Image getImage(); - virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const; + virtual OUString getName() SAL_OVERRIDE; + virtual Image getImage() SAL_OVERRIDE; + virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const SAL_OVERRIDE; - virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); + virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ) SAL_OVERRIDE; }; } diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 13784c30ba53..a0e810df8e05 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -49,7 +49,7 @@ public: virtual ~DocumentChartTypeTemplateProvider(); // ____ ChartTypeTemplateProvider ____ - virtual Reference< chart2::XChartTypeTemplate > getCurrentTemplate() const; + virtual Reference< chart2::XChartTypeTemplate > getCurrentTemplate() const SAL_OVERRIDE; private: Reference< chart2::XChartTypeTemplate > m_xTemplate; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index 344e3c11ac21..c0ee28746d0b 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -47,7 +47,7 @@ public: // has to be called in case the dialog was closed with OK void commitPendingChanges(); - virtual void ActivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; private: DECL_LINK( SelectSchemeHdl, void* ); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 0cd61c57e74f..6d9aa3b1b57c 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -75,8 +75,8 @@ public: void Construct(); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ); - virtual void Reset( const SfxItemSet& rInAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; void ShowStaggeringControls( sal_Bool bShowStaggeringControls ); void SetComplexCategories( bool bComplexCategories ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 8c40cac22f6c..b143b44a15b3 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -36,10 +36,10 @@ public: AxisPositionsTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ); - virtual void Reset( const SfxItemSet& rInAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; void SetNumFormatter( SvNumberFormatter* pFormatter ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index ab7f5256b980..104fe0efeaef 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -317,7 +317,7 @@ public: void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines ); - virtual void StateChanged( StateChangedType nType ); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; private: DECL_LINK( SplineTypeListBoxHdl, void* ); @@ -404,7 +404,7 @@ public: void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter, bool bSteppedLines ); - virtual void StateChanged( StateChangedType nType ); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; private: diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 87c59c267870..e876d59097e7 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -58,11 +58,11 @@ public: , bool bDoLiveUpdate, bool bHideDescription = false ); virtual ~ChartTypeTabPage(); - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const; + ::com::sun::star::chart2::XChartTypeTemplate > getCurrentTemplate() const SAL_OVERRIDE; protected: ChartTypeDialogController* getSelectedMainType(); @@ -70,7 +70,7 @@ protected: void fillAllControls( const ChartTypeParameter& rParameter, bool bAlsoResetSubTypeList=true ); ChartTypeParameter getCurrentParamter() const; - virtual void stateChanged( ChangingResource* pResource ); + virtual void stateChanged( ChangingResource* pResource ) SAL_OVERRIDE; void commitToModel( const ChartTypeParameter& rParameter ); void selectMainType(); diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx index 6fdccb1d97b3..72d46d7514c3 100644 --- a/chart2/source/controller/dialogs/tp_DataLabel.hxx +++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx @@ -40,8 +40,8 @@ public: void SetNumberFormatter( SvNumberFormatter* pFormatter ); - virtual void Reset(const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs); + virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; + virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; private: DataLabelResources m_aDataLabelResources; diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 6cb17bcb9de3..de20639b147e 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -70,13 +70,13 @@ public: protected: // OWizardPage - virtual void ActivatePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) SAL_OVERRIDE; //TabPage - virtual void DeactivatePage(); + virtual void DeactivatePage() SAL_OVERRIDE; - virtual void initializePage(); + virtual void initializePage() SAL_OVERRIDE; DECL_LINK( SeriesSelectionChangedHdl, void* ); DECL_LINK( RoleSelectionChangedHdl, void* ); @@ -91,8 +91,8 @@ protected: DECL_LINK( AddMappingHdl, void* ); // ____ RangeSelectionListenerParent ____ - virtual void listeningFinished( const OUString & rNewRange ); - virtual void disposingRangeSelection(); + virtual void listeningFinished( const OUString & rNewRange ) SAL_OVERRIDE; + virtual void disposingRangeSelection() SAL_OVERRIDE; void updateControlState(); diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx index d92c98a221ed..4497135c44a8 100644 --- a/chart2/source/controller/dialogs/tp_DataSourceControls.hxx +++ b/chart2/source/controller/dialogs/tp_DataSourceControls.hxx @@ -49,7 +49,7 @@ class SeriesListBox : public ::SvTreeListBox public: explicit SeriesListBox(Window* pParent, WinBits nStyle); - virtual SvTreeListEntry* CreateEntry() const; + virtual SvTreeListEntry* CreateEntry() const SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx index cc38831c2dac..3f3fa08f9d9a 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx +++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx @@ -38,10 +38,10 @@ public: ::com::sun::star::chart2::XChartDocument > & xChartDocument ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ); - virtual void Reset( const SfxItemSet& rInAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: ErrorBarResources m_aErrorBarResources; diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx index 4c5232644339..c870e40979b3 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx +++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx @@ -39,8 +39,8 @@ public: SchLegendPosTabPage(Window* pParent, const SfxItemSet& rInAttrs); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs); - virtual void Reset(const SfxItemSet& rInAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx index 965af4540fce..a1a3f295b6e8 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx @@ -33,8 +33,8 @@ public: virtual ~SchLayoutTabPage(); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs); - virtual void Reset(const SfxItemSet& rInAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; private: BarGeometryResources* m_pGeometryResources; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx index a30835a2330d..3d3904662b18 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx @@ -36,8 +36,8 @@ public: virtual ~PolarOptionsTabPage(); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs); - virtual void Reset(const SfxItemSet& rInAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; private: CheckBox* m_pCB_Clockwise; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index b8ca0bfa1d56..30acf7716c4b 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -51,19 +51,19 @@ public: virtual ~RangeChooserTabPage(); //RangeSelectionListenerParent - virtual void listeningFinished( const OUString & rNewRange ); - virtual void disposingRangeSelection(); + virtual void listeningFinished( const OUString & rNewRange ) SAL_OVERRIDE; + virtual void disposingRangeSelection() SAL_OVERRIDE; void commitPage(); protected: //methods //OWizardPage - virtual void ActivatePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); + virtual void ActivatePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) SAL_OVERRIDE; //TabPage - virtual void DeactivatePage(); + virtual void DeactivatePage() SAL_OVERRIDE; void initControlsFromModel(); void changeDialogModelAccordingToControls(); diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index bae4891596a0..f7203efdbe4a 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -41,17 +41,17 @@ public: ScaleTabPage( Window* pParent, const SfxItemSet& rInAttrs ); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ); - virtual void Reset( const SfxItemSet& rInAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; using TabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pItemSet = NULL ) SAL_OVERRIDE; void SetNumFormatter( SvNumberFormatter* pFormatter ); void SetNumFormat(); void ShowAxisOrigin( bool bShowOrigin ); - virtual void StateChanged( StateChangedType nType ); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; private: CheckBox* m_pCbxReverse; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index eb23d82b188f..cabe8370530a 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -38,8 +38,8 @@ public: virtual ~SchOptionTabPage(); static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs); - virtual void Reset(const SfxItemSet& rInAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; void Init( bool bProvidesSecondaryYAxis, bool bProvidesOverlapAndGapWidth, bool bProvidesBarConnectors ); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx index 8e04fe0621e1..9740b9f29dda 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx @@ -48,8 +48,8 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rInAttrs); static SfxTabPage* CreateWithoutRotation(Window* pParent, const SfxItemSet& rInAttrs); - virtual bool FillItemSet(SfxItemSet& rOutAttrs); - virtual void Reset(const SfxItemSet& rInAttrs); + virtual bool FillItemSet(SfxItemSet& rOutAttrs) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet& rInAttrs) SAL_OVERRIDE; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx index 02d8ceb60749..63bfe137c5ff 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.hxx +++ b/chart2/source/controller/dialogs/tp_Trendline.hxx @@ -33,10 +33,10 @@ public: virtual ~TrendlineTabPage (); static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs ); - virtual bool FillItemSet( SfxItemSet& rOutAttrs ); - virtual void Reset( const SfxItemSet& rInAttrs ); + virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetNumFormatter( SvNumberFormatter* pFormatter ); private: diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index 33bb0979b0e1..26e2cb2aebae 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -45,9 +45,9 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); - virtual void initializePage(); - virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ); - virtual bool canAdvance() const; + virtual void initializePage() SAL_OVERRIDE; + virtual bool commitPage( ::svt::WizardTypes::CommitPageReason eReason ) SAL_OVERRIDE; + virtual bool canAdvance() const SAL_OVERRIDE; protected: void commitToModel(); diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 6dce61bf60f6..dbb171068e93 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -222,47 +222,47 @@ protected: AccessibleUniqueId GetId() const; // ________ XComponent ________ - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } // ________ WeakComponentImplHelper (XComponent::dispose) ________ - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ________ XAccessible ________ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XAccessibleContext ________ virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @return AccessibleRole.SHAPE virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleName() // throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleDescription() // throw (::com::sun::star::uno::RuntimeException); @@ -270,47 +270,47 @@ protected: // ________ XAccessibleComponent ________ virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // has to be defined in derived classes virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocation() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Size SAL_CALL getSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL grabFocus() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XServiceInfo ________ virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XEventListener ________ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XAccessibleEventBroadcaster ________ virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: enum eColorType diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 31a43c08c8c3..3e5ce2878a07 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -65,7 +65,7 @@ public: virtual ~AccessibleChartView(); // ____ WeakComponentHelper (called from XComponent::dispose()) ____ - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ____ lang::XInitialization ____ // 0: view::XSelectionSupplier offers notifications for selection changes and access to the selection itself @@ -77,33 +77,33 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ view::XSelectionChangeListener ____ - virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) 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; // ________ XAccessibleContext ________ virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ________ XAccessibleComponent ________ - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: // ________ AccessibleChartElement ________ - virtual ::com::sun::star::awt::Point GetUpperLeftOnScreen() const; + virtual ::com::sun::star::awt::Point GetUpperLeftOnScreen() const SAL_OVERRIDE; private: // methods /** @return the result that m_xWindow->getPosSize() _should_ return. It diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 6da06466ce70..135ea237f67f 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -67,32 +67,32 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XAccessibleContext ____ virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( ::sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleDescription() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAccessibleName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::accessibility::AccessibleTextHelper * m_pTextHelper; diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index 13eddab1a55e..4559c68866c8 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -54,17 +54,17 @@ public: SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~AxisItemConverter(); - virtual void FillItemSet( SfxItemSet & rOutItemSet ) const; - virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); + virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE; + virtual bool ApplyItemSet( const SfxItemSet & rItemSet ) SAL_OVERRIDE; protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index 6d015286f2f7..7ae26ebe2271 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -53,13 +53,13 @@ public: virtual ~CharacterPropertyItemConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > GetRefSizePropertySet() const; diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index fde19f4cd2b8..c87cd2ceb51f 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -88,110 +88,110 @@ protected: // ____ chart::XChartDocument ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getSubTitle() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getLegend() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getArea() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram > SAL_CALL getDiagram() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL attachData( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartData >& xData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModel ____ virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getURL() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL lockControllers() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL unlockControllers() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasControllersLocked() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XComponent ____ virtual void SAL_CALL dispose() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XInterface (for new interfaces) ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ::utl::OEventListenerAdapter ____ - virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ); + virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ) SAL_OVERRIDE; // ____ XDrawPageSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XMultiServiceFactory ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XAggregation ____ virtual void SAL_CALL setDelegator( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rDelegator ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ WrappedPropertySet ____ - virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence(); - virtual const std::vector< WrappedProperty* > createWrappedProperties(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet(); + virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() SAL_OVERRIDE; + virtual const std::vector< WrappedProperty* > createWrappedProperties() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() SAL_OVERRIDE; private: //methods void impl_resetAddIn(); diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index 5cbb3924e349..e59888539be6 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -69,17 +69,17 @@ public: virtual ~DataPointItemConverter(); - virtual void FillItemSet( SfxItemSet & rOutItemSet ) const; - virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); + virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE; + virtual bool ApplyItemSet( const SfxItemSet & rItemSet ) SAL_OVERRIDE; protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index 3ee9ad5e633a..450cae09be9c 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -56,7 +56,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xChartModel ); //fill list of selection handles 'aHdl' - virtual void SetMarkHandles(); + virtual void SetMarkHandles() SAL_OVERRIDE; SdrPageView* GetPageView() const; @@ -70,7 +70,7 @@ public: //pMarkHandleProvider can be NULL; ownership is not taken void setMarkHandleProvider( MarkHandleProvider* pMarkHandleProvider ); - void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); + void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0) SAL_OVERRIDE; SdrObject* getSelectedObject() const; SdrObject* getTextEditObject() const; @@ -81,7 +81,7 @@ public: SdrObject* getNamedSdrObject( const OUString& rName ) const; bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; static SdrObject* getSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ); diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index b51674d393be..94767e3e1a05 100644 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -52,17 +52,17 @@ public: ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ); virtual ~ErrorBarItemConverter(); - virtual void FillItemSet( SfxItemSet & rOutItemSet ) const; - virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); + virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE; + virtual bool ApplyItemSet( const SfxItemSet & rItemSet ) SAL_OVERRIDE; protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: ::boost::shared_ptr< ItemConverter > m_spGraphicConverter; diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index 88afda7cf054..a1b550d73581 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -55,13 +55,13 @@ public: virtual ~GraphicPropertyItemConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: eGraphicObjectType m_eGraphicObjectType; diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index b84f0ee15248..f2115cae1969 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -176,7 +176,7 @@ protected: ::com::sun::star::beans::XPropertySet > GetPropertySet() const; // ____ ::utl::OEventListenerAdapter ____ - virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ); + virtual void _disposing( const ::com::sun::star::lang::EventObject& rSource ) SAL_OVERRIDE; protected: /** sets a new property set, that you get with GetPropertySet(). It should diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index c6ef674efe58..d00a029a3afc 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -50,17 +50,17 @@ public: SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~LegendItemConverter(); - virtual void FillItemSet( SfxItemSet & rOutItemSet ) const; - virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); + virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE; + virtual bool ApplyItemSet( const SfxItemSet & rItemSet ) SAL_OVERRIDE; protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/MultipleChartConverters.hxx b/chart2/source/controller/inc/MultipleChartConverters.hxx index 10a4360c1c23..55add5927acd 100644 --- a/chart2/source/controller/inc/MultipleChartConverters.hxx +++ b/chart2/source/controller/inc/MultipleChartConverters.hxx @@ -49,7 +49,7 @@ public: virtual ~AllAxisItemConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; class AllGridItemConverter : public ::comphelper::MultipleItemConverter @@ -65,7 +65,7 @@ public: virtual ~AllGridItemConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; class AllDataLabelItemConverter : public ::comphelper::MultipleItemConverter @@ -85,7 +85,7 @@ public: virtual ~AllDataLabelItemConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; class AllTitleItemConverter : public ::comphelper::MultipleItemConverter @@ -105,7 +105,7 @@ public: virtual ~AllTitleItemConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; class AllSeriesStatisticsConverter : public ::comphelper::MultipleItemConverter @@ -118,7 +118,7 @@ public: virtual ~AllSeriesStatisticsConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; } // namespace wrapper diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx index 8abeb8464aff..0a877c3f86b4 100644 --- a/chart2/source/controller/inc/MultipleItemConverter.hxx +++ b/chart2/source/controller/inc/MultipleItemConverter.hxx @@ -35,11 +35,11 @@ class MultipleItemConverter : public ItemConverter public: virtual ~MultipleItemConverter(); - virtual void FillItemSet( SfxItemSet & rOutItemSet ) const; - virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); + virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE; + virtual bool ApplyItemSet( const SfxItemSet & rItemSet ) SAL_OVERRIDE; /// implemented empty (returns always false) - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; protected: MultipleItemConverter( SfxItemPool& rItemPool ); diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index bab90fb85f2f..1e9852178061 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -52,13 +52,13 @@ public: protected: // ____ XRangeSelectionListener ____ virtual void SAL_CALL done( const ::com::sun::star::sheet::RangeSelectionEvent& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL aborted( const ::com::sun::star::sheet::RangeSelectionEvent& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: RangeSelectionListenerParent & m_rParent; diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index 9493307f6e2f..df7d307dad19 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -49,17 +49,17 @@ public: ::com::sun::star::lang::XMultiServiceFactory > & xNamedPropertyContainerFactory ); virtual ~RegressionCurveItemConverter(); - virtual void FillItemSet( SfxItemSet & rOutItemSet ) const; - virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); + virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE; + virtual bool ApplyItemSet( const SfxItemSet & rItemSet ) SAL_OVERRIDE; protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: ::boost::shared_ptr< ItemConverter > m_spGraphicConverter; diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index b9af5ac38b96..a247ad99cded 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -53,17 +53,17 @@ public: SAL_WNODEPRECATED_DECLARATIONS_POP virtual ~RegressionEquationItemConverter(); - virtual void FillItemSet( SfxItemSet & rOutItemSet ) const; - virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); + virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE; + virtual bool ApplyItemSet( const SfxItemSet & rItemSet ) SAL_OVERRIDE; protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 20d852bcb67f..2ee4ca1d7de1 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -45,13 +45,13 @@ public: virtual ~SeriesOptionsItemConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index 4af88285a89b..2cece6f4573d 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -45,13 +45,13 @@ public: virtual ~StatisticsItemConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index 15b9f313183c..71319bc3ad52 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -51,17 +51,17 @@ public: virtual ~TitleItemConverter(); - virtual void FillItemSet( SfxItemSet & rOutItemSet ) const; - virtual bool ApplyItemSet( const SfxItemSet & rItemSet ); + virtual void FillItemSet( SfxItemSet & rOutItemSet ) const SAL_OVERRIDE; + virtual bool ApplyItemSet( const SfxItemSet & rItemSet ) SAL_OVERRIDE; protected: - virtual const sal_uInt16 * GetWhichPairs() const; - virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; + virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE; virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( ::com::sun::star::uno::Exception ); + throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 70d5ce8515e3..7098e9f6f9af 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -45,21 +45,21 @@ private: virtual ~ChartTypeUnoDlg(); // OGenericUnoDialog overridables - virtual void implInitialize(const com::sun::star::uno::Any& _rValue); - virtual Dialog* createDialog(Window* _pParent); + virtual void implInitialize(const com::sun::star::uno::Any& _rValue) SAL_OVERRIDE; + virtual Dialog* createDialog(Window* _pParent) SAL_OVERRIDE; // XTypeProvider - virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const SAL_OVERRIDE; //no default constructor ChartTypeUnoDlg(); diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index 83c2a24b2aa8..fbf64b63b9dc 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -55,21 +55,21 @@ public: bool isClosable(); // TabPageNotifiable - virtual void setInvalidPage( TabPage * pTabPage ); - virtual void setValidPage( TabPage * pTabPage ); + virtual void setInvalidPage( TabPage * pTabPage ) SAL_OVERRIDE; + virtual void setValidPage( TabPage * pTabPage ) SAL_OVERRIDE; protected: - virtual bool leaveState( WizardState _nState ); - virtual WizardState determineNextState(WizardState nCurrentState) const; - virtual void enterState(WizardState nState); + virtual bool leaveState( WizardState _nState ) SAL_OVERRIDE; + virtual WizardState determineNextState(WizardState nCurrentState) const SAL_OVERRIDE; + virtual void enterState(WizardState nState) SAL_OVERRIDE; - virtual OUString getStateDisplayName( WizardState nState ) const; + virtual OUString getStateDisplayName( WizardState nState ) const SAL_OVERRIDE; private: //no default constructor CreationWizard(); - virtual svt::OWizardPage* createPage(WizardState nState); + virtual svt::OWizardPage* createPage(WizardState nState) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartModel; diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index b2d772b4ff67..5113b9914098 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -54,47 +54,47 @@ public: virtual ~CreationWizardUnoDlg(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // XTypeProvider - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo APPHELPER_XSERVICEINFO_DECL() APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg) // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - 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; //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; DECL_LINK( DialogEventHdl, VclWindowEvent* ); protected: // ____ OComponentHelper ____ /// Called in dispose method after the listeners were notified. - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: //no default constructor diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 347977a8871a..c1caf7950d03 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -50,7 +50,7 @@ public: virtual ~DataEditor(); // Dialog - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; void SetReadOnly( bool bReadOnly ); bool ApplyChangesToModel(); diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index e3c1af883e56..a960e56169b2 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -57,11 +57,11 @@ public: virtual ~DataSourceDialog(); // from Dialog (base of TabDialog) - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; // TabPageNotifiable - virtual void setInvalidPage( TabPage * pTabPage ); - virtual void setValidPage( TabPage * pTabPage ); + virtual void setInvalidPage( TabPage * pTabPage ) SAL_OVERRIDE; + virtual void setValidPage( TabPage * pTabPage ) SAL_OVERRIDE; protected: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index f2e40f992209..39ff9750ad41 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -48,7 +48,7 @@ public: const OUString& rSelectedObjectCID ); void FillItemSet( SfxItemSet& rOutAttrs ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; private: const SfxItemSet & rInAttrs; diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index ffe10c6adc34..ff7289da4e05 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -116,7 +116,7 @@ private: double m_fAxisMinorStepWidthForErrorBarDecimals; bool m_bOKPressed; - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; Link m_aOriginalOKClickHdl; DECL_LINK( OKPressed, void * ); diff --git a/chart2/source/controller/inc/dlg_ShapeFont.hxx b/chart2/source/controller/inc/dlg_ShapeFont.hxx index 14622e04f00b..7a6aefbf7fc9 100644 --- a/chart2/source/controller/inc/dlg_ShapeFont.hxx +++ b/chart2/source/controller/inc/dlg_ShapeFont.hxx @@ -34,7 +34,7 @@ public: ShapeFontDialog(Window* pParent, const SfxItemSet* pAttr, const ViewElementListProvider* pViewElementListProvider); private: - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; const ViewElementListProvider* m_pViewElementListProvider; sal_uInt16 m_nNamePageId; diff --git a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx index 4f8805eeb86d..e3b4bab64c16 100644 --- a/chart2/source/controller/inc/dlg_ShapeParagraph.hxx +++ b/chart2/source/controller/inc/dlg_ShapeParagraph.hxx @@ -31,7 +31,7 @@ class ShapeParagraphDialog : public SfxTabDialog public: ShapeParagraphDialog(Window* pParent, const SfxItemSet* pAttr); private: - virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage); + virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SAL_OVERRIDE; sal_uInt16 m_nTabPageId; }; diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index f4a13a9e0a62..90193f884bf2 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -46,7 +46,7 @@ public: ~View3DDialog(); // from Dialog (base of TabDialog) - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; private: TabControl* m_pTabControl; diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index c6b3112b00b2..785141844705 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -63,8 +63,8 @@ public: void FillValueSets(); // ____ RangeSelectionListenerParent ____ - virtual void listeningFinished( const OUString & rNewRange ); - virtual void disposingRangeSelection(); + virtual void listeningFinished( const OUString & rNewRange ) SAL_OVERRIDE; + virtual void disposingRangeSelection() SAL_OVERRIDE; private: // category diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 0f008e02a0cb..2593499ec939 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -65,7 +65,7 @@ public: virtual ~FormattedStringsConverter(); protected: - virtual const sal_uInt16 * GetWhichPairs() const; + virtual const sal_uInt16 * GetWhichPairs() const SAL_OVERRIDE; }; SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index a65dc4d07dfa..533378941f22 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -165,43 +165,43 @@ public: virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL - getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception); + getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL - getModel() throw (::com::sun::star::uno::RuntimeException, std::exception); + getModel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL - getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception); + getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& rValue ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent (base of XController) virtual void SAL_CALL - dispose() throw (::com::sun::star::uno::RuntimeException, std::exception); + dispose() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatchProvider (required interface) virtual ::com::sun::star::uno::Reference< @@ -209,43 +209,43 @@ public: queryDispatch( const ::com::sun::star::util::URL& rURL , const OUString& rTargetFrameName , sal_Int32 nSearchFlags) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor > & xDescripts) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::view::XSelectionSupplier (optional interface) virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& rSelection ) - throw ( com::sun::star::lang::IllegalArgumentException, std::exception ); + throw ( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL - getSelection() throw (::com::sun::star::uno::RuntimeException, std::exception); + getSelection() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< com::sun::star::view::XSelectionChangeListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< com::sun::star::view::XSelectionChangeListener > & xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::ui::XContextMenuInterception (optional interface) virtual void SAL_CALL registerContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL releaseContextMenuInterceptor( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XContextMenuInterceptor > & xInterceptor) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //additional interfaces @@ -254,16 +254,16 @@ public: queryClosing( const ::com::sun::star::lang::EventObject& Source , sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException - , ::com::sun::star::uno::RuntimeException, std::exception); + , ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatch @@ -272,154 +272,154 @@ public: , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl , const ::com::sun::star::util::URL& aURL ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl , const ::com::sun::star::util::URL& aURL ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindow virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible( sal_Bool Visible ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setEnable( sal_Bool Enable ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - setFocus() throw (::com::sun::star::uno::RuntimeException, std::exception); + setFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang XMultiServiceFactory virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XModifyListener virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XModeChangeListener virtual void SAL_CALL modeChanged( const ::com::sun::star::util::ModeChangeEvent& _rSource ) throw (::com::sun::star::uno::RuntimeException, - std::exception); + std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XLayoutManagerListener virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // chart2::WindowController - virtual void PrePaint(); - virtual void execute_Paint( const Rectangle& rRect ); - virtual void execute_MouseButtonDown( const MouseEvent& rMEvt ); - virtual void execute_MouseMove( const MouseEvent& rMEvt ); - virtual void execute_Tracking( const TrackingEvent& rTEvt ); - virtual void execute_MouseButtonUp( const MouseEvent& rMEvt ); - virtual void execute_Resize(); - virtual void execute_Activate(); - virtual void execute_Deactivate(); - virtual void execute_GetFocus(); - virtual void execute_LoseFocus(); - virtual void execute_Command( const CommandEvent& rCEvt ); - virtual bool execute_KeyInput( const KeyEvent& rKEvt ); + virtual void PrePaint() SAL_OVERRIDE; + virtual void execute_Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void execute_MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void execute_MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void execute_Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void execute_MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void execute_Resize() SAL_OVERRIDE; + virtual void execute_Activate() SAL_OVERRIDE; + virtual void execute_Deactivate() SAL_OVERRIDE; + virtual void execute_GetFocus() SAL_OVERRIDE; + virtual void execute_LoseFocus() SAL_OVERRIDE; + virtual void execute_Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual bool execute_KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; virtual bool requestQuickHelp( ::Point aAtLogicPosition, bool bIsBalloonHelp, - OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ); + OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; static bool isObjectDeleteable( const ::com::sun::star::uno::Any& rSelection ); diff --git a/chart2/source/controller/main/ChartDropTargetHelper.hxx b/chart2/source/controller/main/ChartDropTargetHelper.hxx index 5f09c5d1349a..fca3b8715c39 100644 --- a/chart2/source/controller/main/ChartDropTargetHelper.hxx +++ b/chart2/source/controller/main/ChartDropTargetHelper.hxx @@ -41,8 +41,8 @@ public: protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; private: // not available diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 75959c134289..769a38572cfd 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -64,10 +64,10 @@ public: ::com::sun::star::beans::PropertyValue >& rMediaDescriptor ,const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL - cancel() throw (::com::sun::star::uno::RuntimeException, std::exception); + cancel() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } //namespace chart diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx index d8d4ba015be9..b3c3815e4f34 100644 --- a/chart2/source/controller/main/ChartTransferable.hxx +++ b/chart2/source/controller/main/ChartTransferable.hxx @@ -42,10 +42,10 @@ public: protected: // implementation of TransferableHelper methods - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, - const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > m_xMetaFileGraphic; diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 1738c1912bc9..ec5c05bde7c5 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -39,28 +39,28 @@ public: void clear(); //from base class Window: - virtual void PrePaint(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual void Activate(); - virtual void Deactivate(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void Command( const CommandEvent& rCEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void PrePaint() SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; void ForceInvalidate(); - virtual void Invalidate( sal_uInt16 nFlags = 0 ); - virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); - virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 ); + virtual void Invalidate( sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; + virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; + virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; private: WindowController* m_pWindowController; diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 5555edf47952..e28ec3ee96bc 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -101,29 +101,29 @@ protected: virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& Control, const ::com::sun::star::util::URL& URL ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& Control, const ::com::sun::star::util::URL& URL ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx index 20a5df87286f..96c13df4de27 100644 --- a/chart2/source/controller/main/ConfigurationAccess.cxx +++ b/chart2/source/controller/main/ConfigurationAccess.cxx @@ -50,8 +50,8 @@ public: virtual ~CalcConfigItem(); FieldUnit getFieldUnit(); - virtual void Commit(); - virtual void Notify( const uno::Sequence<OUString>& aPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; }; CalcConfigItem::CalcConfigItem() diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index ca321497da4c..cb23be2d1a20 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -63,37 +63,37 @@ public: virtual ~ControllerCommandDispatch(); // late initialisation, especially for adding as listener - virtual void initialize(); + virtual void initialize() SAL_OVERRIDE; protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void fireStatusEvent( const OUString & rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void fireStatusEventForURLImpl( diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx index 809fd7126cd2..dbc33d17b947 100644 --- a/chart2/source/controller/main/DragMethod_Base.hxx +++ b/chart2/source/controller/main/DragMethod_Base.hxx @@ -40,8 +40,8 @@ public: virtual OUString getUndoDescription() const; - virtual void TakeSdrDragComment(OUString& rStr) const; - virtual Pointer GetSdrDragPointer() const; + virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE; + virtual Pointer GetSdrDragPointer() const SAL_OVERRIDE; protected: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getChartModel() const; diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index da71f1ca92ac..50ffb19ec04a 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -32,15 +32,15 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel ); virtual ~DragMethod_PieSegment(); - virtual void TakeSdrDragComment(OUString& rStr) const; - virtual bool BeginSdrDrag(); - virtual void MoveSdrDrag(const Point& rPnt); - virtual bool EndSdrDrag(bool bCopy); + virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE; + virtual bool BeginSdrDrag() SAL_OVERRIDE; + virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE; + virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; - virtual basegfx::B2DHomMatrix getCurrentTransformation(); + virtual basegfx::B2DHomMatrix getCurrentTransformation() SAL_OVERRIDE; protected: - virtual void createSdrDragEntries(); + virtual void createSdrDragEntries() SAL_OVERRIDE; private: ::basegfx::B2DVector m_aStartVector; diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx index 49982665748f..c9d1fb1045bd 100644 --- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx +++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx @@ -45,13 +45,13 @@ public: ); virtual ~DragMethod_RotateDiagram(); - virtual void TakeSdrDragComment(OUString& rStr) const; + virtual void TakeSdrDragComment(OUString& rStr) const SAL_OVERRIDE; - virtual bool BeginSdrDrag(); - virtual void MoveSdrDrag(const Point& rPnt); - virtual bool EndSdrDrag(bool bCopy); + virtual bool BeginSdrDrag() SAL_OVERRIDE; + virtual void MoveSdrDrag(const Point& rPnt) SAL_OVERRIDE; + virtual bool EndSdrDrag(bool bCopy) SAL_OVERRIDE; - virtual void CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager); + virtual void CreateOverlayGeometry(sdr::overlay::OverlayManager& rOverlayManager) SAL_OVERRIDE; private: E3dScene* m_pScene; diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 0e2c87b50572..c1def595af56 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -39,29 +39,29 @@ public: virtual ~DrawCommandDispatch(); // late initialisation, especially for adding as listener - virtual void initialize(); + virtual void initialize() SAL_OVERRIDE; - virtual bool isFeatureSupported( const OUString& rCommandURL ); + virtual bool isFeatureSupported( const OUString& rCommandURL ) SAL_OVERRIDE; void setAttributes( SdrObject* pObj ); void setLineEnds( SfxItemSet& rAttr ); protected: // WeakComponentImplHelperBase - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // state of a feature - virtual FeatureState getState( const OUString& rCommand ); + virtual FeatureState getState( const OUString& rCommand ) SAL_OVERRIDE; // execute a feature - virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) SAL_OVERRIDE; // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures() SAL_OVERRIDE; private: void setInsertObj( sal_uInt16 eObj ); diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index c0c32ca22d55..26d842880528 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -50,9 +50,9 @@ class SelectorListBox : public ListBox SelectorListBox( Window* pParent, WinBits nStyle ); virtual ~SelectorListBox(); - virtual void Select(); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual void Select() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; void ReleaseFocus_Impl(); @@ -83,16 +83,16 @@ public: APPHELPER_SERVICE_FACTORY_HELPER(ElementSelectorToolbarController) // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& Parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: //no default constructor diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 90ffa284af7f..684c78b8c09d 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -55,7 +55,7 @@ public: virtual ~FeatureCommandDispatchBase(); // late initialisation, especially for adding as listener - virtual void initialize(); + virtual void initialize() SAL_OVERRIDE; virtual bool isFeatureSupported( const OUString& rCommandURL ); @@ -63,10 +63,10 @@ protected: // XDispatch virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void fireStatusEvent( const OUString& rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener ); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener ) SAL_OVERRIDE; // state of a feature virtual FeatureState getState( const OUString& rCommand ) = 0; diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx index c588dbdfcff5..3a57622a433c 100644 --- a/chart2/source/controller/main/SelectionHelper.hxx +++ b/chart2/source/controller/main/SelectionHelper.hxx @@ -107,8 +107,8 @@ public: virtual ~SelectionHelper(); //MarkHandleProvider: - virtual bool getMarkHandles( SdrHdlList& rHdlList ); - virtual bool getFrameDragSingles(); + virtual bool getMarkHandles( SdrHdlList& rHdlList ) SAL_OVERRIDE; + virtual bool getFrameDragSingles() SAL_OVERRIDE; SdrObject* getObjectToMark();//sets also internally the mark object //-> getMarkHandles will behave different if this method has found a Mark Object different from m_pSelectedObj diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index e7bb9f63388d..b1601890458e 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -42,24 +42,24 @@ public: virtual ~ShapeController(); // late initialisation, especially for adding as listener - virtual void initialize(); + virtual void initialize() SAL_OVERRIDE; protected: // WeakComponentImplHelperBase - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // state of a feature - virtual FeatureState getState( const OUString& rCommand ); + virtual FeatureState getState( const OUString& rCommand ) SAL_OVERRIDE; // execute a feature - virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ); + virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) SAL_OVERRIDE; // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures() SAL_OVERRIDE; private: DECL_LINK( CheckNameHdl, AbstractSvxNameDialog* ); diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx index 2a4068e5a615..0f2dc0eab47b 100644 --- a/chart2/source/controller/main/ShapeToolbarController.hxx +++ b/chart2/source/controller/main/ShapeToolbarController.hxx @@ -57,35 +57,35 @@ public: virtual ~ShapeToolbarController(); // ::com::sun::star::uno::XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire() throw (); - virtual void SAL_CALL release() throw (); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE; + virtual void SAL_CALL release() throw () SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // needed by registration static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XStatusListener - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XToolbarController - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XSubToolbarController - virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index 1e16856f9d28..09471c3038f8 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -55,37 +55,37 @@ public: virtual ~StatusBarCommandDispatch(); // late initialisation, especially for adding as listener - virtual void initialize(); + virtual void initialize() SAL_OVERRIDE; protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ____ XModifyListener (override from CommandDispatch) ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void fireStatusEvent( const OUString & rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) SAL_OVERRIDE; // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index 542555a7f981..dc8945da6228 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -69,12 +69,12 @@ public: ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: virtual ~UndoElement(); @@ -97,12 +97,12 @@ public: ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; protected: virtual ~ShapeUndoElement(); diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index aec5d699ddc3..fd0bd2aa7c18 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -40,27 +40,27 @@ public: virtual ~UndoCommandDispatch(); // late initialisation, especially for adding as listener - virtual void initialize(); + virtual void initialize() SAL_OVERRIDE; protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void fireStatusEvent( const OUString & rURL, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index bbe887e4e053..e4c9d80f407f 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -95,47 +95,47 @@ protected: // ____ XPropertySet ____ /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::comphelper::OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; /// @see ::comphelper::OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XNumericalDataSequence ____ /// @see ::com::sun::star::chart::data::XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; // <properties> sal_Int32 m_nNumberFormatKey; diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 0cb4e3d5e9c8..8b8210f2ef77 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -62,10 +62,10 @@ public: protected: // ____ XColorScheme ____ SAL_DLLPRIVATE virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ConfigItemListener ____ - SAL_DLLPRIVATE virtual void notify( const OUString & rPropertyName ); + SAL_DLLPRIVATE virtual void notify( const OUString & rPropertyName ) SAL_OVERRIDE; private: SAL_DLLPRIVATE void retrieveConfigColors(); diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 799201427342..84d2c3781e74 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -56,11 +56,11 @@ protected: // ____ XDataSource ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDataSink ____ virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::com::sun::star::uno::Sequence< diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index d24f1208b69f..55f57acee3a7 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -87,63 +87,63 @@ public: // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception); + getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertyState virtual com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException, std::exception); + throw (com::sun::star::beans::UnknownPropertyException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const com::sun::star::uno::Sequence< OUString >& rPropNames ) - throw (com::sun::star::beans::UnknownPropertyException, std::exception); + throw (com::sun::star::beans::UnknownPropertyException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException, std::exception); + throw (com::sun::star::beans::UnknownPropertyException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) - throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, std::exception); + throw (com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; protected: ErrorBar( const ErrorBar & rOther ); // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDataSink ____ virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDataSource ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChild ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index fc113c7afe53..1247d41d6517 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -33,18 +33,18 @@ public: protected: virtual OUString ImplGetRepresentation( const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter, - sal_Int32 nNumberFormatKey ) const; + sal_Int32 nNumberFormatKey ) const SAL_OVERRIDE; private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -54,7 +54,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // formula is: f(x) = exp(m_fLogIntercept) * exp( m_fLogSlope * x ) // mathematical model f(x) = Intercept * Slope^x diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 284a9ba1264e..0fb2718edc0e 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -88,133 +88,133 @@ public: // ____ XInternalDataProvider ____ virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getDataByRangeRepresentation( const OUString& aRange ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDataByRangeRepresentation( const OUString& aRange, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aNewData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL appendSequence() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL registerDataSequenceForChanges( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSeq ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDataProvider (base of XInternalDataProvider) ____ virtual ::sal_Bool SAL_CALL createDataSourcePossible( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XRangeXMLConversion ____ virtual OUString SAL_CALL convertRangeToXML( const OUString& aRangeRepresentation ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL convertRangeFromXML( const OUString& aXMLRange ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDateCategories ____ - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getDateCategories() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDateCategories( const ::com::sun::star::uno::Sequence< double >& rDates ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XAnyDescriptionAccess ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAnyRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAnyRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); + getAnyColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAnyColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); + getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception); + getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeChartDataChangeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getNotANumber() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) - throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception); + throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; private: void lcl_addDataSequenceToMap( diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index f825d45ae38a..c3166e69219d 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -67,27 +67,27 @@ public: protected: // ____ XLabeledDataSequence ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getValues() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setValues( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL getLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setLabel( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >& xSequence ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > m_xData; diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index e2426d878b48..ce7626d00977 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -106,8 +106,8 @@ OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_addCloseListener( const ::com::sun::st throw(::com::sun::star::uno::RuntimeException); protected: - virtual sal_Bool impl_canStartApiCall(); - virtual void impl_apiCallCountReachedNull(); + virtual sal_Bool impl_canStartApiCall() SAL_OVERRIDE; + virtual void impl_apiCallCountReachedNull() SAL_OVERRIDE; void impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto ); sal_Bool impl_shouldCloseAtNextChance(); diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index 6696bcfa0599..a30a402e7f26 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -37,7 +37,7 @@ private: sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -47,7 +47,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index a91d6bbc5e65..e7855b397738 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -33,18 +33,18 @@ public: protected: virtual OUString ImplGetRepresentation( const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter, - sal_Int32 nNumberFormatKey ) const; + sal_Int32 nNumberFormatKey ) const SAL_OVERRIDE; private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -54,7 +54,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // formula is: f(x) = m_fSlope * log( x ) + m_fIntercept double m_fSlope; diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index 5bafcd4254c7..3e0bd177621b 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -33,18 +33,18 @@ public: protected: virtual OUString ImplGetRepresentation( const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter, - sal_Int32 nNumberFormatKey ) const; + sal_Int32 nNumberFormatKey ) const SAL_OVERRIDE; private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -54,7 +54,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // formula is: f(x) = m_fMeanValue double m_fMeanValue; diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 72627705a446..648354044d41 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -71,23 +71,23 @@ protected: // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ WeakComponentImplHelperBase ____ - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: /// call disposing() at all listeners and remove all listeners diff --git a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx index 5ef6e253129d..b2ea275c13c1 100644 --- a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx @@ -34,18 +34,18 @@ public: protected: virtual OUString ImplGetRepresentation( const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter, - sal_Int32 nNumberFormatKey ) const; + sal_Int32 nNumberFormatKey ) const SAL_OVERRIDE; private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -55,7 +55,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; std::vector<double> aYList; std::vector<double> aXList; diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 3a2f748d220e..a5b462329460 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -52,28 +52,28 @@ public: virtual ~NameContainer(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess - virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Type SAL_CALL getElementType( ) throw( com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual com::sun::star::uno::Type SAL_CALL getElementType( ) throw( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloneable - virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: //methods NameContainer();//no default contructor diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 33cbb8a61f81..960a40ccbfc0 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -76,7 +76,7 @@ protected: @see ::cppu::OPropertySetHelper */ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() = 0; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE = 0; /** Try to convert the value <code>rValue</code> to the type required by the property associated with <code>nHandle</code>. @@ -107,7 +107,7 @@ protected: ::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; /** The same as setFastProperyValue; nHandle is always valid. The changes must not be broadcasted in this method. @@ -129,7 +129,7 @@ protected: 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; /** The same as getFastProperyValue, but return the value through rValue and @@ -139,7 +139,7 @@ protected: */ virtual void SAL_CALL getFastPropertyValue ( ::com::sun::star::uno::Any& rValue, - sal_Int32 nHandle ) const; + sal_Int32 nHandle ) const SAL_OVERRIDE; /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -156,67 +156,67 @@ protected: // ____ XInterface ____ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTypeProvider ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XPropertyState ____ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XMultiPropertyStates ____ // Note: getPropertyStates() is already implemented in XPropertyState with the // same signature virtual void SAL_CALL setAllPropertiesToDefault() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XStyleSupplier ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle > SAL_CALL getStyle() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::style::XStyle >& xStyle ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XMultiPropertySet ____ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values ) - throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XFastPropertySet ____ virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Note: it is assumed that the base class implements setPropertyValue by // using setFastPropertyValue diff --git a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx index bf05e8a766ca..59b898f89309 100644 --- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx @@ -34,18 +34,18 @@ public: protected: virtual OUString ImplGetRepresentation( const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter, - sal_Int32 nNumberFormatKey ) const; + sal_Int32 nNumberFormatKey ) const SAL_OVERRIDE; virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -55,7 +55,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; std::vector<double> mCoefficients; }; diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index b581ca14556b..dba739e214cc 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -34,18 +34,18 @@ public: protected: virtual OUString ImplGetRepresentation( const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter, - sal_Int32 nNumberFormatKey ) const; + sal_Int32 nNumberFormatKey ) const SAL_OVERRIDE; private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence<double>& aXValues, const css::uno::Sequence<double>& aYValues ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getCurveValue( double x ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues( double min, @@ -55,7 +55,7 @@ private: const css::uno::Reference<css::chart2::XScaling>& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // formula is: f(x) = x ^ m_fSlope * m_fIntercept double m_fSlope; diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index c036fc165211..e27c6d11ec49 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -57,27 +57,27 @@ public: protected: // ____ XRangeHighlighter ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeSelectionChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: void fireSelectionEvent(); diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index 0128d4c0bc80..e4f8f9290092 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -63,16 +63,16 @@ protected: sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL recalculateRegression( const com::sun::star::uno::Sequence< double >& aXValues, const com::sun::star::uno::Sequence< double >& aYValues ) - throw (com::sun::star::uno::RuntimeException, std::exception) = 0; + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual double SAL_CALL getCurveValue( double x ) throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception) = 0; + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual com::sun::star::uno::Sequence< com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues( double min, @@ -82,18 +82,18 @@ protected: const com::sun::star::uno::Reference< com::sun::star::chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) throw (com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception); + com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getCorrelationCoefficient() - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getRepresentation() - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getFormattedRepresentation( const com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >& xNumFmtSupplier, sal_Int32 nNumberFormatKey ) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 3d3d6621c4bc..f978b57bf002 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -53,15 +53,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const double m_fBase; @@ -93,15 +93,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const double m_fBase; @@ -131,15 +131,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const double m_fSlope; @@ -170,15 +170,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const double m_fExponent; diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index 03b5fe4a4cc7..ad6ad440049c 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -36,13 +36,13 @@ namespace apphelper #define APPHELPER_XSERVICEINFO_DECL() \ virtual OUString SAL_CALL \ getImplementationName() \ - throw( ::com::sun::star::uno::RuntimeException, std::exception ); \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ virtual sal_Bool SAL_CALL \ supportsService( const OUString& ServiceName ) \ - throw( ::com::sun::star::uno::RuntimeException, std::exception ); \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL \ getSupportedServiceNames() \ - throw( ::com::sun::star::uno::RuntimeException, std::exception ); \ + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ \ static OUString getImplementationName_Static(); \ static ::com::sun::star::uno::Sequence< OUString > \ diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index ba95a5d8b59f..6037c3c8aa93 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -95,77 +95,77 @@ protected: // ____ XPropertySet ____ /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::comphelper::OPropertySetHelper - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; /// @see ::comphelper::OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; + virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const SAL_OVERRIDE; // ____ XDataSequence ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel( ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XNumericalDataSequence ____ /// @see ::com::sun::star::chart::data::XNumericalDataSequence - virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< double > SAL_CALL getNumericalData() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTextualDataSequence ____ /// @see ::com::sun::star::chart::data::XTextualDataSequence - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XIndexReplace ____ virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XIndexAccess (base of XIndexReplace) ____ virtual ::sal_Int32 SAL_CALL getCount() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XElementAccess (base of XIndexAccess) ____ virtual ::com::sun::star::uno::Type SAL_CALL getElementType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL hasElements() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XNamed (for setting a new range representation) ____ virtual OUString SAL_CALL getName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setName( const OUString& aName ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifiable ____ virtual ::sal_Bool SAL_CALL isModified() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster (base of XModifiable) ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void fireModifyEvent(); diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index f2195acf7f1c..1b7c3def267f 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -90,7 +90,7 @@ public: protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class WeakSelectionChangeListenerAdapter : @@ -105,7 +105,7 @@ protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index 63c2f522fd8d..dd44a5507dfc 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -36,18 +36,18 @@ public: virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: ::com::sun::star::uno::Any m_aOuterDefaultValue; }; diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index 0611c34b9dd2..84ff4610873b 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -36,7 +36,7 @@ public: virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const throw (::com::sun::star::beans::UnknownPropertyException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 53c5c79e9fb5..87e530903a0c 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -34,19 +34,19 @@ public: virtual ~WrappedIgnoreProperty(); virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getPropertyValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; SAL_DLLPRIVATE virtual void setPropertyToDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; SAL_DLLPRIVATE virtual ::com::sun::star::uno::Any getPropertyDefault( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; SAL_DLLPRIVATE virtual ::com::sun::star::beans::PropertyState getPropertyState( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState >& xInnerPropertyState ) const - throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; protected: ::com::sun::star::uno::Any m_aDefaultValue; diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 6252974efec1..5fa0d634b737 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -57,35 +57,35 @@ public: public: //XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertyState - virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: //methods /** give all the properties that should be visible to the outer side diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index ba2ee856dc08..4d13598946f7 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -80,7 +80,7 @@ public: SAL_DLLPRIVATE const SfxItemPool& GetItemPool() const; SAL_DLLPRIVATE virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - createUnoModel(); + createUnoModel() SAL_OVERRIDE; SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getUnoModel(); SdrModel& getSdrModel(); diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index bcdcf76540c5..27dcd8496c55 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -65,14 +65,14 @@ public: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -82,57 +82,57 @@ public: protected: // ____ XCoordinateSystem ____ virtual ::sal_Int32 SAL_CALL getDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAxisByDimension( ::sal_Int32 nDimension, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > SAL_CALL getAxisByDimension( ::sal_Int32 nDimension, ::sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeContainer ____ virtual void SAL_CALL addChartType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& aChartType ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeChartType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& aChartType ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > SAL_CALL getChartTypes() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setChartTypes( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aChartTypes ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index e8c243053ac4..72d5fb6661dd 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -38,14 +38,14 @@ public: // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getViewServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 2fd9541c5a9a..f51fc92a60a9 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -43,7 +43,20 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~ChartTypeManager(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); + /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeManager ) @@ -52,17 +65,17 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeManager ____ // currently empty diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index a4a2d4b69d82..214567b4eb54 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -94,38 +94,38 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL resetAllDataPoints() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDataSink ____ /// @see ::com::sun::star::chart2::data::XDataSink virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > >& aData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDataSource ____ /// @see ::com::sun::star::chart2::data::XDataSource virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + 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 ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ /// @see ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -136,46 +136,46 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve >& aRegressionCurve ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeRegressionCurve( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve >& aRegressionCurve ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setRegressionCurves( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurve > >& aRegressionCurves ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 4c9ade06606d..1b54819d50d5 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -83,108 +83,108 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XFastPropertySet ____ virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) - throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; virtual void SAL_CALL getFastPropertyValue( - ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; + ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; // ____ XDiagram ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getWall() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getFloor() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend > SAL_CALL getLegend() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setLegend( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XLegend >& xLegend ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDefaultColorScheme( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XColorScheme >& xColorScheme ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDiagramData( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCoordinateSystemContainer ____ virtual void SAL_CALL addCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& aCoordSys ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeCoordinateSystem( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem >& aCoordSys ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setCoordinateSystems( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > >& aCoordinateSystems ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL set3DSettingsToDefault() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultRotation() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDefaultIllumination() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index ac6685b6ff09..513e0126e6c1 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -38,14 +38,14 @@ public: // ____ XCoordinateSystem ____ virtual OUString SAL_CALL getCoordinateSystemType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getViewServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index 6652311f3701..6e8d3d098ea4 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -50,8 +50,19 @@ public: explicit StockBar( bool bRisingCourse ); virtual ~StockBar(); - /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() @@ -61,39 +72,39 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index b106c7d764e6..500e6be86dbf 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -73,23 +73,23 @@ protected: virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XExporter ____ virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; inline OUString getDocumentHandler() const { return m_sDocumentHandler; } inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } @@ -161,7 +161,7 @@ private: class XMLReportFilterHelper : public XMLFilter { virtual void isOasisFormat(const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& _rMediaDescriptor, bool & _rOutOASIS ); + ::com::sun::star::beans::PropertyValue >& _rMediaDescriptor, bool & _rOutOASIS ) SAL_OVERRIDE; public: explicit XMLReportFilterHelper( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & _xContext ) @@ -180,7 +180,7 @@ public: protected: virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException, std::exception ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return getImplementationName_Static(); } @@ -189,7 +189,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { setDocumentHandler( "com.sun.star.comp.report.ImportDocumentHandler" ); XMLFilter::setTargetDocument(Document); @@ -200,13 +200,13 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& Document ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception) + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { setDocumentHandler( "com.sun.star.comp.report.ExportDocumentHandler" ); XMLFilter::setSourceDocument(Document); } - virtual OUString getMediaType(bool _bOasis); + virtual OUString getMediaType(bool _bOasis) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index d99e1f80acc1..e2e20168797c 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -77,67 +77,67 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XAxis ____ virtual void SAL_CALL setScaleData( const ::com::sun::star::chart2::ScaleData& rScaleData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::chart2::ScaleData SAL_CALL getScaleData() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getGridProperties() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > SAL_CALL getSubGridProperties() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > SAL_CALL getSubTickProperties() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTitled ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ // Note: the coordinate systems are not cloned! virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 45658afb317e..ce0c89b72baa 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -66,51 +66,51 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() 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; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ // Note: m_xParentProperties are not cloned! virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChild ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index f06b89d3e259..ade1c38f7299 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -64,17 +64,17 @@ public: /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() - virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { ::property::OPropertySet::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ::property::OPropertySet::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { ::property::OPropertySet::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XPropertyChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { ::property::OPropertySet::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { ::property::OPropertySet::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference<css::beans::XVetoableChangeListener>& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { ::property::OPropertySet::removeVetoableChangeListener(p1, p2); } protected: @@ -82,46 +82,46 @@ protected: // ____ XFormattedString ____ virtual OUString SAL_CALL getString() - throw (::css::uno::RuntimeException, std::exception); + throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setString( const OUString& String ) - throw (::css::uno::RuntimeException, std::exception); + throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::css::beans::UnknownPropertyException); + throw(::css::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::css::uno::Reference< ::css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::css::uno::RuntimeException, std::exception); + throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::css::uno::Reference< ::css::util::XCloneable > SAL_CALL createClone() - throw (::css::uno::RuntimeException, std::exception); + throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::css::uno::Reference< ::css::util::XModifyListener >& aListener ) - throw (::css::uno::RuntimeException, std::exception); + throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::css::uno::Reference< ::css::util::XModifyListener >& aListener ) - throw (::css::uno::RuntimeException, std::exception); + throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::css::lang::EventObject& aEvent ) - throw (::css::uno::RuntimeException, std::exception); + throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::css::lang::EventObject& Source ) - throw (::css::uno::RuntimeException, std::exception); + throw (::css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 73b3a0012ddd..1c75dcd559f1 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -73,39 +73,39 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 22712c9ce285..59cd90764608 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -72,40 +72,40 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index f4b0b589b149..7098579eca7c 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -67,40 +67,40 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 84d12923ec24..31a4b1fdc0d2 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -70,50 +70,50 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTitle ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& Strings ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index e352fa2af311..097fde7838bd 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -78,8 +78,8 @@ namespace chart // IUndoManagerImplementation virtual ::osl::Mutex& getMutex(); - virtual ::svl::IUndoManager& getImplUndoManager(); - virtual Reference< XUndoManager > getThis(); + virtual ::svl::IUndoManager& getImplUndoManager() SAL_OVERRIDE; + virtual Reference< XUndoManager > getThis() SAL_OVERRIDE; // attribute access ::cppu::OWeakObject& getParent() { return m_rParent; } @@ -155,16 +155,16 @@ namespace chart } // IMutexGuard - virtual void clear(); - virtual ::framework::IMutex& getGuardedMutex(); + virtual void clear() SAL_OVERRIDE; + virtual ::framework::IMutex& getGuardedMutex() SAL_OVERRIDE; }; class DummyMutex : public ::framework::IMutex { public: virtual ~DummyMutex() {} - virtual void acquire() { } - virtual void release() { } + virtual void acquire() SAL_OVERRIDE { } + virtual void release() SAL_OVERRIDE { } }; ::framework::IMutex& UndoManagerMethodGuard::getGuardedMutex() diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx index eb390e8e1b15..9698b9dd586d 100644 --- a/chart2/source/model/main/UndoManager.hxx +++ b/chart2/source/model/main/UndoManager.hxx @@ -47,43 +47,43 @@ namespace chart virtual ~UndoManager(); // XInterface - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XComponent equivalents void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLockable (base of XUndoManager) - virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild (base of XUndoManager) - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::boost::scoped_ptr< impl::UndoManager_Impl > m_pImpl; diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index a0cd1c02f088..18dec3884007 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -52,8 +52,19 @@ public: Wall(); virtual ~Wall(); - /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() @@ -63,40 +74,40 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; void fireModifyEvent(); diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index d8f1b30358a3..7ba638d61f2a 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -33,7 +33,19 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~AreaChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( AreaChartType ) @@ -43,11 +55,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index bbcdcc6fb1f8..9a97fe083b75 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -54,35 +54,35 @@ public: protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > - getChartTypeForIndex( sal_Int32 nChartTypeIndex ); - virtual sal_Int32 getDimension() const; - virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const; + getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; + virtual sal_Int32 getDimension() const SAL_OVERRIDE; + virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const SAL_OVERRIDE; private: StackMode m_eStackMode; diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 4f6c980370f4..0f7496b8350d 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -33,7 +33,19 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~BarChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( BarChartType ) @@ -43,14 +55,14 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index f5b0bf5da44b..f5f931aab993 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -61,45 +61,45 @@ public: protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > - getChartTypeForIndex( sal_Int32 nChartTypeIndex ); - virtual sal_Int32 getDimension() const; - virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const; - virtual bool isSwapXAndY() const; + getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; + virtual sal_Int32 getDimension() const SAL_OVERRIDE; + virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const SAL_OVERRIDE; + virtual bool isSwapXAndY() const SAL_OVERRIDE; virtual void createCoordinateSystems( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystemContainer > & xCooSysCnt ); + ::com::sun::star::chart2::XCoordinateSystemContainer > & xCooSysCnt ) SAL_OVERRIDE; private: StackMode m_eStackMode; diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index c6cec1fad8e4..8ea10d536c79 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -34,7 +34,19 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~BubbleChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( BubbleChartType ) @@ -44,35 +56,35 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index e216802bd147..57e61932116b 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -50,36 +50,36 @@ public: protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > - getChartTypeForIndex( sal_Int32 nChartTypeIndex ); - virtual sal_Int32 getDimension() const; - virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const; + getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; + virtual sal_Int32 getDimension() const SAL_OVERRIDE; + virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/BubbleDataInterpreter.hxx b/chart2/source/model/template/BubbleDataInterpreter.hxx index b2e8be0cb114..68a20e83bdc8 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.hxx +++ b/chart2/source/model/template/BubbleDataInterpreter.hxx @@ -38,13 +38,13 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index c24291023a57..b22e443e1da2 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -33,7 +33,19 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~CandleStickChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( CandleStickChartType ) @@ -43,37 +55,37 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ OPropertySet ____ 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; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 3e36bf8ed721..76f5595b55ae 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -67,71 +67,71 @@ protected: // ____ XChartType ____ // still abstract ! implement ! virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception) = 0; + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedOptionalRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XDataSeriesContainer ____ virtual void SAL_CALL addDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& aDataSeries ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeDataSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& aDataSeries ) throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > > SAL_CALL getDataSeries() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDataSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aDataSeries ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void fireModifyEvent(); // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; using OPropertySet::disposing; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 43a26b0357a1..78f45b84f0f9 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -81,7 +81,20 @@ public: const OUString & rServiceName ); virtual ~ChartTypeTemplate(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); + /// establish methods for factory instatiation // APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeTemplate ) @@ -90,36 +103,36 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL createDiagramByDataSource( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// denotes if the chart needs categories at the first scale virtual sal_Bool SAL_CALL supportsCategories() - throw (::css::uno::RuntimeException, ::std::exception); + throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; virtual void SAL_CALL changeDiagram( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL changeDiagramData( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, ::sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // still abstract: getChartTypeForNewSeries() virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) @@ -127,7 +140,7 @@ protected: // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods to overload for automatic creation diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index dcfdf3e76b17..eb14206e9cb7 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -33,7 +33,19 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~ColumnChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( ColumnChartType ) @@ -43,24 +55,24 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index e24f768e3a9c..117f0bb12b82 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -54,33 +54,33 @@ public: protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ChartTypeTemplate ____ virtual void createChartTypes( @@ -94,12 +94,12 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > & aOldChartTypesSeq - ); + ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > - getChartTypeForIndex( sal_Int32 nChartTypeIndex ); + getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; - virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const; + virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const SAL_OVERRIDE; private: StackMode m_eStackMode; diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx index 319a1bec12fa..fafa9c36833b 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -39,7 +39,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: sal_Int32 m_nNumberOfLines; diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index 84776c21a9e1..9f49db3d29dd 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -75,16 +75,16 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL mergeInterpretedData( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 2bd4ade19cd4..d23aa9e161c6 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -32,7 +32,19 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~FilledNetChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( FilledNetChartType ) @@ -42,11 +54,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index c5da45c70072..8c37009e3338 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -25,7 +25,19 @@ public: GL3DBarChartType( const css::uno::Reference<css::uno::XComponentContext>& xContext ); virtual ~GL3DBarChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); APPHELPER_SERVICE_FACTORY_HELPER( GL3DBarChartType ) @@ -33,22 +45,22 @@ protected: GL3DBarChartType( const GL3DBarChartType& rOther ); virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // OPropertySet virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException); + throw (css::beans::UnknownPropertyException) SAL_OVERRIDE; - virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; // XPropertySet virtual css::uno::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx index 4f4a0ce2df99..3f86fa0e322b 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx @@ -29,16 +29,16 @@ public: virtual ~GL3DBarChartTypeTemplate(); - virtual css::uno::Reference<css::chart2::XChartType> getChartTypeForIndex( sal_Int32 nChartTypeIndex ); + virtual css::uno::Reference<css::chart2::XChartType> getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; // XChartTypeTemplate virtual css::uno::Reference<css::chart2::XChartType> SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence<css::uno::Reference<css::chart2::XChartType> >& xOldChartTypes ) - throw (::css::uno::RuntimeException, ::std::exception); + throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsCategories() - throw (::css::uno::RuntimeException, ::std::exception); + throw (::css::uno::RuntimeException, ::std::exception) SAL_OVERRIDE; }; } diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index e0db220f1e91..ca7ac9def0ad 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -34,7 +34,19 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~LineChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( LineChartType ) @@ -44,21 +56,21 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index 43dd77eae7a1..4097d7e37155 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -56,37 +56,37 @@ public: protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > - getChartTypeForIndex( sal_Int32 nChartTypeIndex ); - virtual sal_Int32 getDimension() const; - virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const; + getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; + virtual sal_Int32 getDimension() const SAL_OVERRIDE; + virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const SAL_OVERRIDE; private: StackMode m_eStackMode; diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index 123f78217d61..1c90bc179d0c 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -39,18 +39,18 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class NetChartType : public NetChartType_Base @@ -60,7 +60,19 @@ public: ::com::sun::star::uno::XComponentContext > const & xContext ); virtual ~NetChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( NetChartType ) @@ -70,11 +82,11 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index 48462140950c..563e08828cec 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -47,23 +47,23 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > - getChartTypeForIndex( sal_Int32 nChartTypeIndex ); - virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const; + getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; + virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const SAL_OVERRIDE; private: StackMode m_eStackMode; diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index c4bdfc183be9..6c350fd85e60 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -34,7 +34,19 @@ public: sal_Bool bUseRings = sal_False ); virtual ~PieChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( PieChartType ) @@ -44,30 +56,30 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedPropertyRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index b5fd2113f24a..117feeb0ee74 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -55,55 +55,55 @@ public: protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ChartTypeTemplate ____ - virtual sal_Int32 getDimension() const; + virtual sal_Int32 getDimension() const SAL_OVERRIDE; virtual void adaptDiagram( const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XDiagram > & xDiagram ); + ::com::sun::star::chart2::XDiagram > & xDiagram ) SAL_OVERRIDE; - virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ); + virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ) SAL_OVERRIDE; virtual void adaptAxes( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys ); + ::com::sun::star::chart2::XCoordinateSystem > > & rCoordSys ) SAL_OVERRIDE; virtual void adaptScales( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > > & aCooSysSeq, const ::com::sun::star::uno::Reference< - ::com::sun::star::chart2::data::XLabeledDataSequence > & xCategories ); + ::com::sun::star::chart2::data::XLabeledDataSequence > & xCategories ) SAL_OVERRIDE; virtual void createChartTypes( const ::com::sun::star::uno::Sequence< @@ -116,10 +116,10 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > & aOldChartTypesSeq - ); + ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > - getChartTypeForIndex( sal_Int32 nChartTypeIndex ); + getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 378966d660fc..91d29f075f9e 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -38,7 +38,19 @@ public: sal_Int32 nOrder = 3 ); virtual ~ScatterChartType(); - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); /// establish methods for factory instatiation APPHELPER_SERVICE_FACTORY_HELPER( ScatterChartType ) @@ -48,30 +60,30 @@ protected: // ____ XChartType ____ virtual OUString SAL_CALL getChartType() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedMandatoryRoles() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL createCoordinateSystem( ::sal_Int32 DimensionCount ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index 08f52443649b..0d9e879a49e0 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -54,41 +54,41 @@ public: protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL supportsCategories() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ ChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > - getChartTypeForIndex( sal_Int32 nChartTypeIndex ); - virtual sal_Int32 getDimension() const; - virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const; + getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; + virtual sal_Int32 getDimension() const SAL_OVERRIDE; + virtual StackMode getStackMode( sal_Int32 nChartTypeIndex ) const SAL_OVERRIDE; private: bool m_bHasSymbols; diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 582413b61278..954ea241c3a0 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -68,39 +68,39 @@ public: protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL applyStyle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL resetStyles( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ChartTypeTemplate - virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ); + virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ) SAL_OVERRIDE; // ____ ChartTypeTemplate ____ virtual void createChartTypes( @@ -114,10 +114,10 @@ protected: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > > & aOldChartTypesSeq - ); + ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType > - getChartTypeForIndex( sal_Int32 nChartTypeIndex ); + getChartTypeForIndex( sal_Int32 nChartTypeIndex ) SAL_OVERRIDE; private: // todo: deprecate this variable diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx index b33235586b5d..472b49e3841d 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -41,13 +41,13 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: StockChartTypeTemplate::StockVariant m_eStockVariant; diff --git a/chart2/source/model/template/XYDataInterpreter.hxx b/chart2/source/model/template/XYDataInterpreter.hxx index 7cd698945a38..34f595fc0492 100644 --- a/chart2/source/model/template/XYDataInterpreter.hxx +++ b/chart2/source/model/template/XYDataInterpreter.hxx @@ -38,13 +38,13 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xSource, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > >& aSeriesToReUse ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::chart2::InterpretedData SAL_CALL reinterpretDataSeries( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isDataCompatible( const ::com::sun::star::chart2::InterpretedData& aInterpretedData ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; } // namespace chart diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 821f06923a52..f448c3143242 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -60,8 +60,8 @@ public: protected: // ____ ::utl::ConfigItem ____ - virtual void Commit(); - virtual void Notify( const Sequence< OUString > & aPropertyNames ); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const Sequence< OUString > & aPropertyNames ) SAL_OVERRIDE; private: ConfigItemListener & m_rListener; diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 4a5eade472a9..31a08c7afafc 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -236,8 +236,8 @@ public: virtual ~SplitCategoriesProvider_ForLabeledDataSequences() {} - virtual sal_Int32 getLevelCount() const; - virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const; + virtual sal_Int32 getLevelCount() const SAL_OVERRIDE; + virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const SAL_OVERRIDE; private: const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index e2874961da1c..a2aac52eaed5 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -1272,8 +1272,8 @@ public: virtual ~SplitCategoriesProvider_ForComplexDescriptions() {} - virtual sal_Int32 getLevelCount() const; - virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const; + virtual sal_Int32 getLevelCount() const SAL_OVERRIDE; + virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const SAL_OVERRIDE; private: const ::std::vector< ::std::vector< uno::Any > >& m_rComplexDescriptions; diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index 0b0aed64e47c..fe5e0c73c6ae 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -41,10 +41,10 @@ public: void stopListening(); //XModifyListener - virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; //XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; using ::cppu::WeakComponentImplHelperBase::disposing; diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 3da827761450..4aad97372c95 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -80,29 +80,29 @@ public: protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; // ____ OPropertySet ____ - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XRegressionCurve ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getEquationProperties() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setEquationProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xEquationProperties ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ // not implemented here @@ -112,25 +112,25 @@ protected: // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; using ::cppu::OPropertySetHelper::disposing; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; void fireModifyEvent(); @@ -159,7 +159,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -179,7 +179,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -199,7 +199,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -219,7 +219,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -239,7 +239,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -259,7 +259,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() @@ -279,7 +279,7 @@ public: // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index f3239fe77885..481bd421d940 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -57,8 +57,20 @@ public: ::com::sun::star::uno::XComponentContext > & xContext ); virtual ~RegressionEquation(); - /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + //TODO: are these actually used (given they are not SAL_OVERRIDE)? + virtual OUString SAL_CALL + getImplementationName() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL + supportsService( const OUString& ServiceName ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + getSupportedServiceNames() + throw( ::com::sun::star::uno::RuntimeException, std::exception ); + static OUString getImplementationName_Static(); + static ::com::sun::star::uno::Sequence< OUString > + getSupportedServiceNames_Static(); + /// merge XInterface implementations DECLARE_XINTERFACE() /// establish methods for factory instatiation @@ -69,51 +81,51 @@ protected: // ____ OPropertySet ____ virtual ::com::sun::star::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(::com::sun::star::beans::UnknownPropertyException); + throw(::com::sun::star::beans::UnknownPropertyException) SAL_OVERRIDE; - virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); + virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE; // ____ XPropertySet ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XCloneable ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XModifyListener ____ virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XTitle ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > > SAL_CALL getText() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XFormattedString > >& Strings ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; using ::cppu::OPropertySetHelper::disposing; // ____ OPropertySet ____ - virtual void firePropertyChangeEvent(); + virtual void firePropertyChangeEvent() SAL_OVERRIDE; void fireModifyEvent(); diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 74c784b794d6..df1d24ba20f8 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -48,15 +48,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const Date m_aNullDate; @@ -80,15 +80,15 @@ public: // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > SAL_CALL - getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception); + getInverseScaling() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceName ____ virtual OUString SAL_CALL getServiceName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const Date m_aNullDate; diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx index ca96020934bf..4952e64ecf6a 100644 --- a/chart2/source/view/axes/Tickmarks.hxx +++ b/chart2/source/view/axes/Tickmarks.hxx @@ -69,8 +69,8 @@ class PureTickIter : public TickIter public: PureTickIter( ::std::vector< TickInfo >& rTickInfoVector ); virtual ~PureTickIter(); - virtual TickInfo* firstInfo(); - virtual TickInfo* nextInfo(); + virtual TickInfo* firstInfo() SAL_OVERRIDE; + virtual TickInfo* nextInfo() SAL_OVERRIDE; private: ::std::vector< TickInfo >& m_rTickVector; @@ -125,7 +125,7 @@ public: , bool bIncludeFarAwayDistanceIfSo = false , bool bIncludeSpaceBetweenTickAndText = true ) const; - virtual void updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const; + virtual void updateScreenValues( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) const SAL_OVERRIDE; bool isHorizontalAxis() const; bool isVerticalAxis() const; diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index 5c1252eb4210..5301d753bdee 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -39,8 +39,8 @@ public: virtual double* firstValue(); virtual double* nextValue(); - virtual TickInfo* firstInfo(); - virtual TickInfo* nextInfo(); + virtual TickInfo* firstInfo() SAL_OVERRIDE; + virtual TickInfo* nextInfo() SAL_OVERRIDE; sal_Int32 getCurrentDepth() const { return m_nCurrentDepth; } diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index d74bff750934..ed1efd86313b 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -53,7 +53,7 @@ public: virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ); diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index 9539a2b6732c..526ec8e84b6a 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -39,7 +39,7 @@ public: VAxisOrGridBase( sal_Int32 nDimensionIndex, sal_Int32 nDimensionCount ); virtual ~VAxisOrGridBase(); - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ) SAL_OVERRIDE; virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 5e8c829992b2..c7badd1cf865 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -208,8 +208,8 @@ public: , const AxisLabelStaggering eAxisLabelStaggering , bool bInnerLine ); - virtual TickInfo* firstInfo(); - virtual TickInfo* nextInfo(); + virtual TickInfo* firstInfo() SAL_OVERRIDE; + virtual TickInfo* nextInfo() SAL_OVERRIDE; private: //methods LabelIterator(); @@ -380,8 +380,8 @@ public: , sal_Int32 nLongestLabelIndex ); virtual ~MaxLabelTickIter(); - virtual TickInfo* firstInfo(); - virtual TickInfo* nextInfo(); + virtual TickInfo* firstInfo() SAL_OVERRIDE; + virtual TickInfo* nextInfo() SAL_OVERRIDE; private: ::std::vector< TickInfo >& m_rTickInfoVector; diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index e0fef479a07a..b5122d9bf955 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -37,21 +37,21 @@ public: virtual ~VCartesianAxis(); - virtual void createMaximumLabels(); - virtual void createLabels(); - virtual void updatePositions(); + virtual void createMaximumLabels() SAL_OVERRIDE; + virtual void createLabels() SAL_OVERRIDE; + virtual void updatePositions() SAL_OVERRIDE; - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; - virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); - virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ); + virtual sal_Int32 estimateMaximumAutoMainIncrementCount() SAL_OVERRIDE; + virtual void createAllTickInfos( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos ) SAL_OVERRIDE; void createAllTickInfosFromComplexCategories( ::std::vector< ::std::vector< TickInfo > >& rAllTickInfos, bool bShiftedPosition ); TickIter* createLabelTickIterator( sal_Int32 nTextLevel ); TickIter* createMaximumLabelTickIterator( sal_Int32 nTextLevel ); sal_Int32 getTextLevelCount() const; - virtual TickFactory* createTickFactory(); + virtual TickFactory* createTickFactory() SAL_OVERRIDE; double getLogicValueWhereMainLineCrossesOtherAxis() const; double getLogicValueWhereLabelLineCrossesOtherAxis() const; diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 956ff81485a1..03eca709063d 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -46,7 +46,7 @@ public: //XTextualDataSequence virtual uno::Sequence< OUString > SAL_CALL getTextualData() - throw ( uno::RuntimeException, std::exception) + throw ( uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_aTextSequence; } diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx index 67402802b31a..71bdbf45c813 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.hxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.hxx @@ -36,12 +36,12 @@ public: virtual void createVAxisList( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier , const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ); + , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) SAL_OVERRIDE; - virtual void initVAxisInList(); - virtual void updateScalesAndIncrementsOnAxes(); + virtual void initVAxisInList() SAL_OVERRIDE; + virtual void updateScalesAndIncrementsOnAxes() SAL_OVERRIDE; - virtual void createGridShapes(); + virtual void createGridShapes() SAL_OVERRIDE; private: VCartesianCoordinateSystem(); diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx index da370e0c4cff..cb816a7390d4 100644 --- a/chart2/source/view/axes/VCartesianGrid.hxx +++ b/chart2/source/view/axes/VCartesianGrid.hxx @@ -39,7 +39,7 @@ public: ); virtual ~VCartesianGrid(); - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; static void fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList , const ::com::sun::star::uno::Sequence< diff --git a/chart2/source/view/axes/VPolarAngleAxis.hxx b/chart2/source/view/axes/VPolarAngleAxis.hxx index 87baa81dec8c..247b2662b641 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.hxx +++ b/chart2/source/view/axes/VPolarAngleAxis.hxx @@ -36,11 +36,11 @@ public: , sal_Int32 nDimensionCount ); virtual ~VPolarAngleAxis(); - virtual void createMaximumLabels(); - virtual void createLabels(); - virtual void updatePositions(); + virtual void createMaximumLabels() SAL_OVERRIDE; + virtual void createLabels() SAL_OVERRIDE; + virtual void updatePositions() SAL_OVERRIDE; - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; private: //methods bool createTextShapes_ForAngleAxis( diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx index d26ed48b741e..09f6052bef59 100644 --- a/chart2/source/view/axes/VPolarAxis.hxx +++ b/chart2/source/view/axes/VPolarAxis.hxx @@ -38,7 +38,7 @@ public: void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ); - virtual sal_Bool isAnythingToDraw(); + virtual sal_Bool isAnythingToDraw() SAL_OVERRIDE; virtual ~VPolarAxis(); diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.hxx b/chart2/source/view/axes/VPolarCoordinateSystem.hxx index 120de9cbaa52..b5c5b858bdab 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.hxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.hxx @@ -35,17 +35,17 @@ public: //better performance for big data virtual ::com::sun::star::uno::Sequence< sal_Int32 > getCoordinateSystemResolution( const ::com::sun::star::awt::Size& rPageSize - , const ::com::sun::star::awt::Size& rPageResolution ); + , const ::com::sun::star::awt::Size& rPageResolution ) SAL_OVERRIDE; virtual void createVAxisList( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > & xNumberFormatsSupplier , const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ); + , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) SAL_OVERRIDE; - virtual void initVAxisInList(); - virtual void updateScalesAndIncrementsOnAxes(); + virtual void initVAxisInList() SAL_OVERRIDE; + virtual void updateScalesAndIncrementsOnAxes() SAL_OVERRIDE; - virtual void createGridShapes(); + virtual void createGridShapes() SAL_OVERRIDE; private: VPolarCoordinateSystem(); diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx index e16f58ffcd59..95576b9cb093 100644 --- a/chart2/source/view/axes/VPolarGrid.hxx +++ b/chart2/source/view/axes/VPolarGrid.hxx @@ -42,7 +42,7 @@ public: ); virtual ~VPolarGrid(); - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; void setIncrements( const std::vector< ExplicitIncrementData >& rIncrements ); diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index 56b1119e70bd..81aec8928a04 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -46,31 +46,31 @@ public: , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory , const OUString& rCID - ) throw (::com::sun::star::uno::RuntimeException ); + ) throw (::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ); + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix ) SAL_OVERRIDE; - virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); + virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE; virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual void initAxisLabelProperties( const ::com::sun::star::awt::Size& rFontReferenceSize - , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ); + , const ::com::sun::star::awt::Rectangle& rMaximumSpaceForLabels ) SAL_OVERRIDE; - virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); + virtual sal_Int32 estimateMaximumAutoMainIncrementCount() SAL_OVERRIDE; - virtual void createMaximumLabels(); - virtual void createLabels(); - virtual void updatePositions(); + virtual void createMaximumLabels() SAL_OVERRIDE; + virtual void createLabels() SAL_OVERRIDE; + virtual void updatePositions() SAL_OVERRIDE; - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; protected: //methods - virtual bool prepareShapeCreation(); + virtual bool prepareShapeCreation() SAL_OVERRIDE; private: //member boost::scoped_ptr<VCartesianAxis> m_apAxisWithLabels; diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 7e8fe7e2fe5e..1c50f79cdcb4 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -37,19 +37,19 @@ public: ); virtual ~AreaChart(); - virtual void createShapes(); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void createShapes() SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - virtual bool keepAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual bool keepAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier - virtual double getMaximumX(); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual double getMaximumX() SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual LegendSymbolStyle getLegendSymbolStyle(); - virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); + virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/BarChart.hxx b/chart2/source/view/charttypes/BarChart.hxx index 5fbbe6cfb931..e1099e2c5675 100644 --- a/chart2/source/view/charttypes/BarChart.hxx +++ b/chart2/source/view/charttypes/BarChart.hxx @@ -35,11 +35,11 @@ public: , sal_Int32 nDimensionCount ); virtual ~BarChart(); - virtual void createShapes(); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void createShapes() SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - virtual bool keepAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual bool keepAspectRatio() const SAL_OVERRIDE; private: //methods //no default constructor @@ -62,7 +62,7 @@ private: //methods , double fScaledLowerBarDepth, double fScaledUpperBarDepth, double fBaseValue , BarPositionHelper* pPosHelper ) const; - virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const;//nAxisIndex indicates whether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 ) + virtual PlottingPositionHelper& getPlottingPositionHelper( sal_Int32 nAxisIndex ) const SAL_OVERRIDE;//nAxisIndex indicates whether the position belongs to the main axis ( nAxisIndex==0 ) or secondary axis ( nAxisIndex==1 ) void adaptOverlapAndGapwidthForGroupBarsPerAxis(); diff --git a/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx index 4e01b254a18c..8e7fa3d739f1 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.hxx +++ b/chart2/source/view/charttypes/BarPositionHelper.hxx @@ -36,12 +36,12 @@ public: BarPositionHelper( const BarPositionHelper& rSource ); virtual ~BarPositionHelper(); - virtual PlottingPositionHelper* clone() const; + virtual PlottingPositionHelper* clone() const SAL_OVERRIDE; void updateSeriesCount( double fSeriesCount ); /*only enter the size of x stacked series*/ - virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const; - virtual void setScaledCategoryWidth( double fScaledCategoryWidth ); + virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const SAL_OVERRIDE; + virtual void setScaledCategoryWidth( double fScaledCategoryWidth ) SAL_OVERRIDE; }; } //namespace chart diff --git a/chart2/source/view/charttypes/BubbleChart.hxx b/chart2/source/view/charttypes/BubbleChart.hxx index 0ed111d35ce6..583df2129ade 100644 --- a/chart2/source/view/charttypes/BubbleChart.hxx +++ b/chart2/source/view/charttypes/BubbleChart.hxx @@ -34,17 +34,17 @@ public: , sal_Int32 nDimensionCount ); virtual ~BubbleChart(); - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual LegendSymbolStyle getLegendSymbolStyle(); + virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/CandleStickChart.hxx b/chart2/source/view/charttypes/CandleStickChart.hxx index 736c9ce9d13f..2a69d10fdbe8 100644 --- a/chart2/source/view/charttypes/CandleStickChart.hxx +++ b/chart2/source/view/charttypes/CandleStickChart.hxx @@ -35,15 +35,15 @@ public: , sal_Int32 nDimensionCount ); virtual ~CandleStickChart(); - virtual void createShapes(); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void createShapes() SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual LegendSymbolStyle getLegendSymbolStyle(); + virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/GL3DBarChart.hxx b/chart2/source/view/charttypes/GL3DBarChart.hxx index d5ecf7766680..87128a87188e 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.hxx +++ b/chart2/source/view/charttypes/GL3DBarChart.hxx @@ -20,7 +20,7 @@ public: GL3DBarChart( const css::uno::Reference<css::chart2::XChartType>& xChartTypeModel ); virtual ~GL3DBarChart(); - virtual void createShapes(); + virtual void createShapes() SAL_OVERRIDE; }; } diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx index 8b041bb294a9..6f3e42b89669 100644 --- a/chart2/source/view/charttypes/NetChart.hxx +++ b/chart2/source/view/charttypes/NetChart.hxx @@ -37,19 +37,19 @@ public: ); virtual ~NetChart(); - virtual void createShapes(); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void createShapes() SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - virtual bool keepAspectRatio() const; + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual bool keepAspectRatio() const SAL_OVERRIDE; // MinimumAndMaximumSupplier - virtual double getMaximumX(); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual double getMaximumX() SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual LegendSymbolStyle getLegendSymbolStyle(); - virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); + virtual LegendSymbolStyle getLegendSymbolStyle() SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx index 313fb9a49bd4..6814b86b3297 100644 --- a/chart2/source/view/charttypes/PieChart.hxx +++ b/chart2/source/view/charttypes/PieChart.hxx @@ -37,27 +37,27 @@ public: , sal_Int32 nDimensionCount, bool bExcludingPositioning ); virtual ~PieChart(); - virtual void createShapes(); - virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ); + virtual void createShapes() SAL_OVERRIDE; + virtual void rearrangeLabelToAvoidOverlapIfRequested( const ::com::sun::star::awt::Size& rPageSize ) SAL_OVERRIDE; - virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); - virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ); + virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE; + virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) SAL_OVERRIDE; - virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const; - virtual bool keepAspectRatio() const; - virtual bool shouldSnapRectToUsedArea(); + virtual ::com::sun::star::drawing::Direction3D getPreferredDiagramAspectRatio() const SAL_OVERRIDE; + virtual bool keepAspectRatio() const SAL_OVERRIDE; + virtual bool shouldSnapRectToUsedArea() SAL_OVERRIDE; //MinimumAndMaximumSupplier - virtual double getMinimumX(); - virtual double getMaximumX(); - virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - - virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ); - virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual double getMinimumX() SAL_OVERRIDE; + virtual double getMaximumX() SAL_OVERRIDE; + virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + + virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; private: //methods //no default constructor diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index d27bc7d39104..ca0790551bac 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -39,13 +39,13 @@ public: virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::com::sun::star::drawing::HomogenMatrix m_Matrix; diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx index c777756cf567..01959188a89d 100644 --- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx +++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx @@ -69,21 +69,21 @@ public: void clearMinimumAndMaximumSupplierList(); //--MinimumAndMaximumSupplier - virtual double getMinimumX(); - virtual double getMaximumX(); - virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - virtual double getMinimumZ(); - virtual double getMaximumZ(); - - virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ); - virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); - - virtual long calculateTimeResolutionOnXAxis(); - virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ); + virtual double getMinimumX() SAL_OVERRIDE; + virtual double getMaximumX() SAL_OVERRIDE; + virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + virtual double getMinimumZ() SAL_OVERRIDE; + virtual double getMaximumZ() SAL_OVERRIDE; + + virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + + virtual long calculateTimeResolutionOnXAxis() SAL_OVERRIDE; + virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) SAL_OVERRIDE; private: typedef ::std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet; diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx b/chart2/source/view/inc/OpenglShapeFactory.hxx index 823ad4e17dfe..e9b2614131fa 100644 --- a/chart2/source/view/inc/OpenglShapeFactory.hxx +++ b/chart2/source/view/inc/OpenglShapeFactory.hxx @@ -26,13 +26,13 @@ public: createGroup2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ); + , const OUString& aName = OUString() ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroup3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ); + , const OUString& aName = OUString() ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCube( const ::com::sun::star::uno::Reference< @@ -42,14 +42,14 @@ public: , sal_Int32 nRotateZAngleHundredthDegree , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap - , bool bRounded = false); + , bool bRounded = false) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCylinder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPosition , const ::com::sun::star::drawing::Direction3D& rSize - , sal_Int32 nRotateZAngleHundredthDegree ); + , sal_Int32 nRotateZAngleHundredthDegree ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPyramid( const ::com::sun::star::uno::Reference< @@ -60,21 +60,21 @@ public: , bool bRotateZ , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp - , const tPropertyNameMap& rPropertyNameMap); + , const tPropertyNameMap& rPropertyNameMap) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCone( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPosition , const ::com::sun::star::drawing::Direction3D& rSize - , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ); + , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPieSegment2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ); + , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPieSegment( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -82,7 +82,7 @@ public: , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , const ::com::sun::star::drawing::Direction3D& rOffset , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene - , double fDepth ); + , double fDepth ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createStripe( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -91,16 +91,16 @@ public: , const tPropertyNameMap& rPropertyNameMap , sal_Bool bDoubleSided = true , short nRotatedTexture = 0 //0 to 7 are the different possibilities - , bool bFlatNormals=true ); + , bool bFlatNormals=true ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createArea3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon - , double fDepth); + , double fDepth) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createArea2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon); + , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createSymbol2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -108,37 +108,37 @@ public: , const ::com::sun::star::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol , sal_Int32 nBorderColor=0 - , sal_Int32 nFillColor=0 ); + , sal_Int32 nFillColor=0 ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createGraphic2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPos , const ::com::sun::star::drawing::Direction3D& rSize - , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ); + , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PointSequenceSequence& rPoints - , const VLineProperties* pLineProperties = NULL ); + , const VLineProperties* pLineProperties = NULL ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ); + const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints - , const VLineProperties& rLineProperties ); + , const VLineProperties& rLineProperties ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCircle2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize ); + , const ::com::sun::star::drawing::Direction3D& rSize ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCircle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::awt::Size& rSize - , const ::com::sun::star::awt::Point& rPosition ); + , const ::com::sun::star::awt::Point& rPosition ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D @@ -146,7 +146,7 @@ public: , const tNameSequence& rPropNames , const tAnySequence& rPropValues , const ::com::sun::star::uno::Any& rATransformation - ); + ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D, @@ -155,13 +155,13 @@ public: com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & xTextProperties, - double nRotation, const OUString& aName ); + double nRotation, const OUString& aName ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createInvisibleRectangle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize ); + , const ::com::sun::star::awt::Size& rSize ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( @@ -171,18 +171,18 @@ public: const com::sun::star::awt::Point& rPosition, const tNameSequence& rPropNames, const tAnySequence& rPropValues, - StackPosition ePos = Top ); + StackPosition ePos = Top ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ); + ::com::sun::star::drawing::XShapes >& xTarget ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getOrCreateChartRootShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& xPage ); + ::com::sun::star::drawing::XDrawPage>& xPage ) SAL_OVERRIDE; - virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ); + virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ) SAL_OVERRIDE; virtual void render(com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > xRootShape) SAL_OVERRIDE; diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index e2a6cf327e69..f2f81dee7428 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -150,15 +150,15 @@ public: PolarPlottingPositionHelper( const PolarPlottingPositionHelper& rSource ); virtual ~PolarPlottingPositionHelper(); - virtual PlottingPositionHelper* clone() const; + virtual PlottingPositionHelper* clone() const SAL_OVERRIDE; - virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix); - virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); + virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix) SAL_OVERRIDE; + virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) SAL_OVERRIDE; ::basegfx::B3DHomMatrix getUnitCartesianToScene() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > - getTransformationScaledLogicToScene() const; + getTransformationScaledLogicToScene() const SAL_OVERRIDE; //the resulting values should be used for input to the transformation //received with 'getTransformationScaledLogicToScene' @@ -168,9 +168,9 @@ public: virtual ::com::sun::star::drawing::Position3D - transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const; + transformLogicToScene( double fX, double fY, double fZ, bool bClip ) const SAL_OVERRIDE; virtual ::com::sun::star::drawing::Position3D - transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const; + transformScaledLogicToScene( double fX, double fY, double fZ, bool bClip ) const SAL_OVERRIDE; ::com::sun::star::drawing::Position3D transformAngleRadiusToScene( double fLogicValueOnAngleAxis, double fLogicValueOnRadiusAxis, double fLogicZ, bool bDoScaling=true ) const; ::com::sun::star::drawing::Position3D diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 40551932ae95..77940e83ac5b 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -36,13 +36,13 @@ public: createGroup2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ); + , const OUString& aName = OUString() ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > createGroup3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const OUString& aName = OUString() ); + , const OUString& aName = OUString() ) SAL_OVERRIDE; @@ -54,14 +54,14 @@ public: , sal_Int32 nRotateZAngleHundredthDegree , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap - , bool bRounded = false); + , bool bRounded = false) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCylinder( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPosition , const ::com::sun::star::drawing::Direction3D& rSize - , sal_Int32 nRotateZAngleHundredthDegree ); + , sal_Int32 nRotateZAngleHundredthDegree ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPyramid( const ::com::sun::star::uno::Reference< @@ -72,21 +72,21 @@ public: , bool bRotateZ , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSourceProp - , const tPropertyNameMap& rPropertyNameMap); + , const tPropertyNameMap& rPropertyNameMap) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCone( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPosition , const ::com::sun::star::drawing::Direction3D& rSize - , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ); + , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPieSegment2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , const ::com::sun::star::drawing::Direction3D& rOffset - , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ); + , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createPieSegment( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -94,7 +94,7 @@ public: , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , const ::com::sun::star::drawing::Direction3D& rOffset , const ::com::sun::star::drawing::HomogenMatrix& rUnitCircleToScene - , double fDepth ); + , double fDepth ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createStripe( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -103,16 +103,16 @@ public: , const tPropertyNameMap& rPropertyNameMap , sal_Bool bDoubleSided = true , short nRotatedTexture = 0 //0 to 7 are the different possibilities - , bool bFlatNormals=true ); + , bool bFlatNormals=true ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createArea3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon - , double fDepth); + , double fDepth) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createArea2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon); + , const ::com::sun::star::drawing::PolyPolygonShape3D& rPolyPolygon) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createSymbol2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget @@ -120,37 +120,37 @@ public: , const ::com::sun::star::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol , sal_Int32 nBorderColor=0 - , sal_Int32 nFillColor=0 ); + , sal_Int32 nFillColor=0 ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createGraphic2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPos , const ::com::sun::star::drawing::Direction3D& rSize - , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ); + , const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& xGraphic ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PointSequenceSequence& rPoints - , const VLineProperties* pLineProperties = NULL ); + , const VLineProperties* pLineProperties = NULL ) SAL_OVERRIDE; virtual com::sun::star::uno::Reference< com::sun::star::drawing::XShape > createLine ( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& xTarget, - const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ); + const com::sun::star::awt::Size& rSize, const com::sun::star::awt::Point& rPosition ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createLine3D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::PolyPolygonShape3D& rPoints - , const VLineProperties& rLineProperties ); + , const VLineProperties& rLineProperties ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCircle2D( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::drawing::Position3D& rPos - , const ::com::sun::star::drawing::Direction3D& rSize ); + , const ::com::sun::star::drawing::Direction3D& rSize ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createCircle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget , const ::com::sun::star::awt::Size& rSize - , const ::com::sun::star::awt::Point& rPosition ); + , const ::com::sun::star::awt::Point& rPosition ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D @@ -158,7 +158,7 @@ public: , const tNameSequence& rPropNames , const tAnySequence& rPropValues , const ::com::sun::star::uno::Any& rATransformation - ); + ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D, @@ -167,13 +167,13 @@ public: com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::chart2::XFormattedString > >& xFormattedString, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > & xTextProperties, - double nRotation, const OUString& aName ); + double nRotation, const OUString& aName ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createInvisibleRectangle( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget - , const ::com::sun::star::awt::Size& rSize ); + , const ::com::sun::star::awt::Size& rSize ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( @@ -183,18 +183,18 @@ public: const com::sun::star::awt::Point& rPosition, const tNameSequence& rPropNames, const tAnySequence& rPropValues, - StackPosition ePos = Top ); + StackPosition ePos = Top ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > createRectangle( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget ); + ::com::sun::star::drawing::XShapes >& xTarget ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getOrCreateChartRootShape( const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XDrawPage>& xPage ); + ::com::sun::star::drawing::XDrawPage>& xPage ) SAL_OVERRIDE; - virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ); + virtual void setPageSize( com::sun::star::uno::Reference < com::sun::star::drawing::XShapes > xChartShapes, const com::sun::star::awt::Size& rSize ) SAL_OVERRIDE; /** * not necessary right now diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index 470952f9c8d5..3c85a00a55dd 100644 --- a/chart2/source/view/inc/VPolarTransformation.hxx +++ b/chart2/source/view/inc/VPolarTransformation.hxx @@ -39,13 +39,13 @@ public: virtual ::com::sun::star::uno::Sequence< double > SAL_CALL transform( const ::com::sun::star::uno::Sequence< double >& rSourceValues ) throw (::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getSourceDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// @see ::com::sun::star::chart2::XTransformation virtual sal_Int32 SAL_CALL getTargetDimension() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: PolarPlottingPositionHelper m_aPositionHelper; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 6b708addf668..d95c8e00f590 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -158,23 +158,23 @@ public: // MinimumAndMaximumSupplier - virtual double getMinimumX(); - virtual double getMaximumX(); + virtual double getMinimumX() SAL_OVERRIDE; + virtual double getMaximumX() SAL_OVERRIDE; - virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); - virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ); + virtual double getMinimumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; + virtual double getMaximumYInRange( double fMinimumX, double fMaximumX, sal_Int32 nAxisIndex ) SAL_OVERRIDE; - virtual double getMinimumZ(); - virtual double getMaximumZ(); + virtual double getMinimumZ() SAL_OVERRIDE; + virtual double getMaximumZ() SAL_OVERRIDE; - virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ); - virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ); - virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ); - virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ); - virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ); + virtual bool isExpandBorderToIncrementRhythm( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandIfValuesCloseToBorder( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandWideValuesToZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isExpandNarrowValuesTowardZero( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; + virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) SAL_OVERRIDE; - virtual long calculateTimeResolutionOnXAxis(); - virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ); + virtual long calculateTimeResolutionOnXAxis() SAL_OVERRIDE; + virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) SAL_OVERRIDE; @@ -192,10 +192,10 @@ public: ::com::sun::star::lang::XMultiServiceFactory >& xShapeFactory, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext - ); + ) SAL_OVERRIDE; virtual LegendSymbolStyle getLegendSymbolStyle(); - virtual com::sun::star::awt::Size getPreferredLegendKeyAspectRatio(); + virtual com::sun::star::awt::Size getPreferredLegendKeyAspectRatio() SAL_OVERRIDE; virtual ::com::sun::star::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); diff --git a/chart2/source/view/main/ChartItemPool.hxx b/chart2/source/view/main/ChartItemPool.hxx index 0d3fa7726e8b..899e0ed7bcac 100644 --- a/chart2/source/view/main/ChartItemPool.hxx +++ b/chart2/source/view/main/ChartItemPool.hxx @@ -37,8 +37,8 @@ protected: virtual ~ChartItemPool(); public: - virtual SfxItemPool* Clone() const; - SfxMapUnit GetMetric( sal_uInt16 nWhich ) const; + virtual SfxItemPool* Clone() const SAL_OVERRIDE; + SfxMapUnit GetMetric( sal_uInt16 nWhich ) const SAL_OVERRIDE; /// creates a pure chart item pool static SfxItemPool* CreateChartItemPool(); diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index bdec56519512..c3978f4484d9 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -87,13 +87,13 @@ public: mrProperties(rProps) {} virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception); + throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw(uno::RuntimeException, std::exception); + throw(uno::RuntimeException, std::exception) SAL_OVERRIDE; private: const std::map<OUString, uno::Any>& mrProperties; diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 032651fb3f0d..d480bae65f6a 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -114,54 +114,54 @@ public: DummyXShape(); // XNamed - virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XShape - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getShapeType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // normal non UNO methods @@ -220,7 +220,7 @@ public: DummyPieSegment2D(double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree, double fUnitCircleInnerRadius, double fUnitCircleOuterRadius, const drawing::Direction3D& rOffset, const drawing::HomogenMatrix& rUnitCircleToScene); - void render(); + void render() SAL_OVERRIDE; private: double mfUnitCircleStartAngleDegree; double mfUnitCircleWidthAngleDegree; @@ -277,7 +277,7 @@ class DummySymbol2D : public DummyXShape public: DummySymbol2D(const drawing::Position3D& rPosition, const drawing::Direction3D& rSize, sal_Int32 nStandardSymbol, sal_Int32 nFillColor); - void render(); + void render() SAL_OVERRIDE; private: drawing::Position3D mrPosition; drawing::Direction3D mrSize; @@ -344,9 +344,9 @@ public: virtual void render() SAL_OVERRIDE; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void setTransformatAsProperty(const com::sun::star::drawing::HomogenMatrix3& rMatrix); @@ -361,25 +361,25 @@ class DummyXShapes : public DummyXShape, public com::sun::star::drawing::XShapes { public: - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( 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); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + 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; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XShapes - virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL add( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL remove( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) ; - virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCount() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // normal methods - virtual void render(); + virtual void render() SAL_OVERRIDE; protected: std::vector<com::sun::star::uno::Reference< com::sun::star::drawing::XShape > > maUNOShapes; @@ -391,10 +391,10 @@ class DummyChart : public DummyXShapes public: DummyChart(com::sun::star::uno::Reference< com::sun::star::drawing::XShape > xDrawPage); ~DummyChart(); - virtual DummyChart* getRootShape(); + virtual DummyChart* getRootShape() SAL_OVERRIDE; - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void render() SAL_OVERRIDE; @@ -415,10 +415,10 @@ class DummyGroup2D : public DummyXShapes public: DummyGroup2D(const OUString& rName); - virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::awt::Point SAL_CALL getPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class DummyGroup3D : public DummyXShapes |