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/controller/inc | |
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/controller/inc')
31 files changed, 203 insertions, 203 deletions
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 |