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 /include | |
| 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 'include')
494 files changed, 4625 insertions, 4625 deletions
diff --git a/include/avmedia/mediaitem.hxx b/include/avmedia/mediaitem.hxx index 07ae639e69eb..97a63a961597 100644 --- a/include/avmedia/mediaitem.hxx +++ b/include/avmedia/mediaitem.hxx @@ -70,15 +70,15 @@ public: MediaItem( const MediaItem& rMediaItem ); virtual ~MediaItem(); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit, OUString& rText, - const IntlWrapper *pIntl ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + const IntlWrapper *pIntl ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; void merge( const MediaItem& rMediaItem ); diff --git a/include/avmedia/mediaplayer.hxx b/include/avmedia/mediaplayer.hxx index dbcbe6fc9ba3..d1b5cb45cd01 100644 --- a/include/avmedia/mediaplayer.hxx +++ b/include/avmedia/mediaplayer.hxx @@ -52,8 +52,8 @@ public: private: - virtual void Resize(); - virtual void ToggleFloatingMode(); + virtual void Resize() SAL_OVERRIDE; + virtual void ToggleFloatingMode() SAL_OVERRIDE; MediaWindow* mpMediaWindow; Size maLastSize; diff --git a/include/avmedia/mediatoolbox.hxx b/include/avmedia/mediatoolbox.hxx index 5c7a4a3d1aca..bcf040071d22 100644 --- a/include/avmedia/mediatoolbox.hxx +++ b/include/avmedia/mediatoolbox.hxx @@ -44,8 +44,8 @@ public: MediaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbX ); ~MediaToolBoxControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window* pParent ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; private: diff --git a/include/comphelper/SettingsHelper.hxx b/include/comphelper/SettingsHelper.hxx index a2e5aab27097..571fea104e50 100644 --- a/include/comphelper/SettingsHelper.hxx +++ b/include/comphelper/SettingsHelper.hxx @@ -44,51 +44,51 @@ namespace comphelper : ChainablePropertySet ( pInfo, pMutex ) {} virtual ~ChainableHelperNoState () throw( ) {} - com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) throw (com::sun::star::uno::RuntimeException, std::exception) + 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 { return HelperBaseNoState::queryInterface( aType ); } - void SAL_CALL acquire( ) throw () + void SAL_CALL acquire( ) throw () SAL_OVERRIDE { HelperBaseNoState::acquire( ); } - void SAL_CALL release( ) throw () + void SAL_CALL release( ) throw () SAL_OVERRIDE { HelperBaseNoState::release( ); } // 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 { return ChainablePropertySet::getPropertySetInfo(); } 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 { ChainablePropertySet::setPropertyValue ( aPropertyName, aValue ); } 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 { return ChainablePropertySet::getPropertyValue ( PropertyName ); } 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 { ChainablePropertySet::addPropertyChangeListener ( aPropertyName, xListener ); } 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 { ChainablePropertySet::removePropertyChangeListener ( aPropertyName, aListener ); } 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 { ChainablePropertySet::addVetoableChangeListener ( PropertyName, aListener ); } 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 { ChainablePropertySet::removeVetoableChangeListener ( PropertyName, aListener ); } // 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) + 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 { ChainablePropertySet::setPropertyValues ( aPropertyNames, aValues ); } 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 { return ChainablePropertySet::getPropertyValues ( aPropertyNames ); } 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) + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { ChainablePropertySet::addPropertiesChangeListener ( aPropertyNames, xListener ); } 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) + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { ChainablePropertySet::removePropertiesChangeListener ( xListener ); } 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 { ChainablePropertySet::firePropertiesChangeEvent ( aPropertyNames, xListener ); } }; } diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 7233529c451f..8d284aaa0e49 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -96,13 +96,13 @@ namespace param virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // 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; // OPropertySetHelper - virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw( ::com::sun::star::lang::IllegalArgumentException ); - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw( ::com::sun::star::uno::Exception, std::exception ); - virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const; + virtual sal_Bool SAL_CALL convertFastPropertyValue( ::com::sun::star::uno::Any& rConvertedValue, ::com::sun::star::uno::Any& rOldValue, sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue) throw( ::com::sun::star::lang::IllegalArgumentException ) 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 ) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const SAL_OVERRIDE; // pseudo-XComponent virtual void SAL_CALL dispose(); @@ -156,15 +156,15 @@ namespace param ParameterWrapperContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _rxComposer ); // ::com::sun::star::container::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; // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::container::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 _rIndex) 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 _rIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: const Parameters& getParameters() { return m_aParameters; } @@ -183,7 +183,7 @@ namespace param protected: // XComponent - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; private: void impl_checkDisposed_throw(); diff --git a/include/cppuhelper/implbase_ex_post.hxx b/include/cppuhelper/implbase_ex_post.hxx index 2373e9da21df..0dcc1b60d4d8 100644 --- a/include/cppuhelper/implbase_ex_post.hxx +++ b/include/cppuhelper/implbase_ex_post.hxx @@ -49,11 +49,11 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE ImplHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return ImplHelper_query( rType, (class_data *)&s_cd, this ); } \ - 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< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return ImplHelper_getTypes( (class_data *)&s_cd ); } \ - 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 \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< __CLASS_IFC##N > \ @@ -67,15 +67,15 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakImplHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return WeakImplHelper_query( rType, (class_data *)&s_cd, this, (OWeakObject *)this ); } \ - virtual void SAL_CALL acquire() throw () \ + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE \ { OWeakObject::acquire(); } \ - virtual void SAL_CALL release() throw () \ + virtual void SAL_CALL release() throw () SAL_OVERRIDE \ { OWeakObject::release(); } \ - 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< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return WeakImplHelper_getTypes( (class_data *)&s_cd ); } \ - 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 \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< __CLASS_IFC##N > \ @@ -89,17 +89,17 @@ class SAL_NO_VTABLE SAL_DLLPUBLIC_TEMPLATE WeakAggImplHelper##N \ { \ static class_data##N s_cd; \ public: \ - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) \ + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( ::com::sun::star::uno::Type const & rType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return OWeakAggObject::queryInterface( rType ); } \ - 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 ::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 \ { return WeakAggImplHelper_queryAgg( rType, (class_data *)&s_cd, this, (OWeakAggObject *)this ); } \ - virtual void SAL_CALL acquire() throw () \ + virtual void SAL_CALL acquire() throw () SAL_OVERRIDE \ { OWeakAggObject::acquire(); } \ - virtual void SAL_CALL release() throw () \ + virtual void SAL_CALL release() throw () SAL_OVERRIDE \ { OWeakAggObject::release(); } \ - 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< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE \ { return WeakAggImplHelper_getTypes( (class_data *)&s_cd ); } \ - 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 \ { return ImplHelper_getImplementationId( (class_data *)&s_cd ); } \ }; \ template< __CLASS_IFC##N > \ diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 94cfa9399c0d..448d864aba25 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -53,9 +53,9 @@ namespace dbaui // initialize will be called when after the controller finished his initialize method virtual void initialize(){} // window overridables - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; inline IController& getCommandController() const { return m_rController; } @@ -66,12 +66,12 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > getORB() { return m_xContext;} // the default implementation simply calls resizeAll( GetSizePixel() ) - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void attachFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); protected: // window overridables - virtual void Paint( const Rectangle& _rRect ); + virtual void Paint( const Rectangle& _rRect ) SAL_OVERRIDE; /// re-arrange all controls, including the toolbox, it's separator, and the "real view" virtual void resizeAll( const Rectangle& _rPlayground ); diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx index 01e5417045af..9798c5c5f8e3 100644 --- a/include/dbaccess/dbaundomanager.hxx +++ b/include/dbaccess/dbaundomanager.hxx @@ -49,39 +49,39 @@ namespace dbaui SfxUndoManager& GetSfxUndoManager() const; // 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; private: ::boost::scoped_ptr< UndoManager_Impl > m_pImpl; diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx index 6ffa59a62f07..fe9087030431 100644 --- a/include/dbaccess/dbsubcomponentcontroller.hxx +++ b/include/dbaccess/dbsubcomponentcontroller.hxx @@ -66,12 +66,12 @@ namespace dbaui protected: // OGenericUnoController - initialization - virtual void impl_initialize(); + virtual void impl_initialize() SAL_OVERRIDE; // OGenericUnoController - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const SAL_OVERRIDE; sal_Bool impl_isModified() const; virtual void impl_onModifyChanged(); @@ -145,22 +145,22 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const; // ::com::sun::star::frame::XController - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - 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 ); + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) 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 ) SAL_OVERRIDE; // XScriptInvocationContext - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > SAL_CALL getScriptContainer() 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); - virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isModified( ) 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) 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; // XTitle - virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxORB); @@ -177,16 +177,16 @@ namespace dbaui protected: // 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; // OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // 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 ::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; // 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< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: sal_Int32 getCurrentStartNumber() const; diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx index 1694da644127..f6a4952a75da 100644 --- a/include/dbaccess/genericcontroller.hxx +++ b/include/dbaccess/genericcontroller.hxx @@ -435,93 +435,93 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager > getLayoutManager(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame) const; // IController - virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); - virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); - virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); - virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); - virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const; - virtual sal_Bool isCommandEnabled(const OUString& _rCompleteCommandURL) const; - virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ); - virtual void notifyHiContrastChanged(); - virtual sal_Bool isDataSourceReadOnly() const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > getXController() throw( ::com::sun::star::uno::RuntimeException ); - virtual bool interceptUserInput( const NotifyEvent& _rEvent ); + virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) SAL_OVERRIDE; + virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const SAL_OVERRIDE; + virtual sal_Bool isCommandEnabled(const OUString& _rCompleteCommandURL) const SAL_OVERRIDE; + virtual sal_uInt16 registerCommandURL( const OUString& _rCompleteCommandURL ) SAL_OVERRIDE; + virtual void notifyHiContrastChanged() SAL_OVERRIDE; + virtual sal_Bool isDataSourceReadOnly() const SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > getXController() throw( ::com::sun::star::uno::RuntimeException ) SAL_OVERRIDE; + virtual bool interceptUserInput( const NotifyEvent& _rEvent ) SAL_OVERRIDE; // misc virtual sal_Bool isCommandChecked(sal_uInt16 _nCommandId) const; // ::com::sun::star::lang::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; // ::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 ); + virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // 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; // ::com::sun::star::frame::XController2 - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getComponentWindow() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getViewControllerName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCreationArguments() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL getComponentWindow() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getViewControllerName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCreationArguments() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XController - 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 ); - 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 ); - virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; - virtual ::com::sun::star::uno::Any SAL_CALL getViewData(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL restoreViewData(const ::com::sun::star::uno::Any& Data) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + 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 ) 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 ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; + virtual ::com::sun::star::uno::Any SAL_CALL getViewData(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL restoreViewData(const ::com::sun::star::uno::Any& Data) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatch - virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) 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 > & aListener, const ::com::sun::star::util::URL& aURL) 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 > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSlaveDispatchProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & _xNewProvider) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMasterDispatchProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & _xNewProvider) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSlaveDispatchProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & _xNewProvider) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMasterDispatchProvider(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & _xNewProvider) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - 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 >& aDescripts) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) 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 >& aDescripts) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); //LLA: need solar mutex {OGenericUnoController_COMPBASE::dispose(); } - virtual void SAL_CALL disposing(); - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException, std::exception); - 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); + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //LLA: need solar mutex {OGenericUnoController_COMPBASE::dispose(); } + virtual void SAL_CALL disposing() SAL_OVERRIDE; + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) 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) SAL_OVERRIDE; // ::com::sun::star::frame::XFrameActionListener - virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // 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); + 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; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) = 0; - 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) = 0; + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + 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 = 0; // XDispatchInformationProvider - virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( ::sal_Int16 ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTitle - virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (::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 setTitle( const OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTitleChangeBroadcaster - virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUserInputInterception - virtual void SAL_CALL addKeyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeKeyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addKeyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeKeyHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: #ifdef _MSC_VER diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index 12da3b787be5..8c1ee61565e5 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -148,7 +148,7 @@ public: @param nBytes Size of the passed data block. */ - virtual void Decode( sal_uInt8* pnData, sal_Size nBytes ); + virtual void Decode( sal_uInt8* pnData, sal_Size nBytes ) SAL_OVERRIDE; }; /** Encodes and decodes data from protected MSO Word 95- documents. @@ -169,7 +169,7 @@ public: @param nBytes Size of the passed data block. */ - virtual void Decode( sal_uInt8* pnData, sal_Size nBytes ); + virtual void Decode( sal_uInt8* pnData, sal_Size nBytes ) SAL_OVERRIDE; }; diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index f4d6c37b5597..1eaa7acdb5dd 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -105,7 +105,7 @@ class MSFILTER_DLLPUBLIC WString : public TBBase public: WString(){}; ~WString(){}; - bool Read(SvStream &rS); + bool Read(SvStream &rS) SAL_OVERRIDE; OUString getString(){ return sString; } }; @@ -124,8 +124,8 @@ class MSFILTER_DLLPUBLIC TBCExtraInfo : public TBBase public: TBCExtraInfo(); ~TBCExtraInfo(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; OUString getOnAction(); }; @@ -140,8 +140,8 @@ class MSFILTER_DLLPUBLIC TBCGeneralInfo : public TBBase public: TBCGeneralInfo(); ~TBCGeneralInfo() {} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; bool ImportToolBarControlData( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >& ); OUString CustomText() { return customText.getString(); } OUString DescriptionText() { return descriptionText.getString(); } @@ -156,8 +156,8 @@ friend class TBCBSpecific; // #FIXME hacky access, need to fix public: TBCBitMap(); ~TBCBitMap(); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; Bitmap& getBitMap(); }; @@ -168,8 +168,8 @@ class MSFILTER_DLLPUBLIC TBCMenuSpecific : public TBBase public: TBCMenuSpecific(); ~TBCMenuSpecific(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; OUString Name(); }; @@ -186,8 +186,8 @@ class MSFILTER_DLLPUBLIC TBCCDData : public TBBase public: TBCCDData(); ~TBCCDData(); - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; class TBCComboDropdownSpecific : public TBBase @@ -196,8 +196,8 @@ class TBCComboDropdownSpecific : public TBBase public: TBCComboDropdownSpecific( const TBCHeader& header ); TBCComboDropdownSpecific(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; class TBCBSpecific : public TBBase @@ -211,8 +211,8 @@ class TBCBSpecific : public TBBase public: TBCBSpecific(); ~TBCBSpecific(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; // #TODO just add a getGraphic member here TBCBitMap* getIcon(); TBCBitMap* getIconMask(); @@ -259,8 +259,8 @@ public: sal_uInt16 getTcID() const { return tcid; } bool isVisible() { return !( bFlagsTCR & 0x1 ); } bool isBeginGroup() { return ( bFlagsTCR & 0x2 ); } - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; sal_uInt32 getTbct() { return tbct; }; }; @@ -274,8 +274,8 @@ class MSFILTER_DLLPUBLIC TBCData : public TBBase public: TBCData( const TBCHeader& Header ); ~TBCData(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; bool ImportToolBarControl( CustomToolBarImportHelper&, std::vector< css::beans::PropertyValue >&, bool& bBeginGroup, bool bIsMenuBar ); TBCGeneralInfo& getGeneralInfo() { return controlGeneralInfo; } TBCMenuSpecific* getMenuSpecific(); @@ -294,8 +294,8 @@ class MSFILTER_DLLPUBLIC TB : public TBBase public: TB(); ~TB(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; sal_Int16 getcCL(){ return cCL; } WString& getName(){ return name; } bool IsEnabled(); @@ -310,8 +310,8 @@ public: sal_Int16 top; sal_Int16 right; sal_Int16 bottom; - bool Read( SvStream &rS ) { rS.ReadInt16( left ).ReadInt16( top ).ReadInt16( right ).ReadInt16( bottom ); return true; } - void Print( FILE* fo ); + bool Read( SvStream &rS ) SAL_OVERRIDE { rS.ReadInt16( left ).ReadInt16( top ).ReadInt16( right ).ReadInt16( bottom ); return true; } + void Print( FILE* fo ) SAL_OVERRIDE; }; typedef cppu::WeakImplHelper1< css::container::XIndexContainer > PropertyValueIndexContainer_BASE; @@ -329,8 +329,8 @@ class MSFILTER_DLLPUBLIC TBVisualData : public TBBase public: TBVisualData(); ~TBVisualData(){} - bool Read(SvStream &rS); - void Print( FILE* ); + bool Read(SvStream &rS) SAL_OVERRIDE; + void Print( FILE* ) SAL_OVERRIDE; }; #endif diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index 5afa6fe5f8d4..055eedb2f094 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -65,30 +65,30 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- virtual OUString SAL_CALL - getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); + getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService( const OUString& rService ) - 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); + getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com.sun.star.lang.XInitialization interface ---------------------------- virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) - 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; // com.sun.star.script.vba.XVBAMacroResolver interface -------------------- virtual OUString SAL_CALL resolveVBAMacroToScriptURL( const OUString& rVBAMacroName ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL resolveScriptURLtoVBAMacro( const OUString& rScriptURL ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index e3762d93ed42..91cdf074d87b 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -436,13 +436,13 @@ public: SdrEscherImport( PowerPointImportParam&, const OUString& rBaseURL ); virtual ~SdrEscherImport(); - virtual bool GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const; - virtual sal_Bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const; + virtual bool GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const SAL_OVERRIDE; + virtual sal_Bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const SAL_OVERRIDE; PptFontEntityAtom* GetFontEnityAtom( sal_uInt32 nNum ) const; void RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph ); virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const; - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); - virtual void ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj ); + virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ) SAL_OVERRIDE; + virtual void ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj ) SAL_OVERRIDE; void ImportHeaderFooterContainer( DffRecordHeader& rHeader, HeaderFooterEntry& rEntry ); }; @@ -560,7 +560,7 @@ protected: SfxStyleSheet*, SfxStyleSheet** ) const; - virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const; + virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const SAL_OVERRIDE; // #i32596# - new parameter <_nCalledByGroup>, which // indicates, if the OLE object is imported inside a group object. virtual SdrObject* ImportOLE( @@ -570,7 +570,7 @@ protected: const Rectangle& rVisArea, const int _nCalledByGroup, sal_Int64 nAspect - ) const; + ) const SAL_OVERRIDE; SvMemoryStream* ImportExOleObjStg( sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const; SdrPage* MakeBlancPage(sal_Bool bMaster) const; sal_Bool ReadFontCollection(); @@ -610,8 +610,8 @@ public: ) const; void ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL ); - virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const; - virtual sal_Bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const; + virtual bool GetColorFromPalette(sal_uInt16 nNum, Color& rColor) const SAL_OVERRIDE; + virtual sal_Bool SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const SAL_OVERRIDE; sal_Unicode PPTSubstitute( sal_uInt16 nFont, sal_Unicode nChar, @@ -620,7 +620,7 @@ public: char nDefault ) const; const PptDocumentAtom& GetDocumentAtom() const { return aDocAtom; } - virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const; + virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const SAL_OVERRIDE; SdrObject* CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, @@ -1295,7 +1295,7 @@ public: class PPTConvertOCXControls : public SvxMSConvertOCXControls { - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage(); + virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage() SAL_OVERRIDE; PptPageKind ePageKind; const SdrPowerPointImport* mpPPTImporter; com::sun::star::uno::Reference< com::sun::star::io::XInputStream > mxInStrm; @@ -1316,7 +1316,7 @@ public : const com::sun::star::awt::Size& rSize, com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape, bool bFloatingCtrl - ); + ) SAL_OVERRIDE; }; // PowerPoint record types diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 41a6ef5167c3..62f22d16d878 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -64,7 +64,7 @@ private: protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); @@ -108,7 +108,7 @@ protected: protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( bool bForced = false ); diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index ecd2ace89bca..18e94ab20a4d 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -39,9 +39,9 @@ private: DECL_LINK( UpdateHdl, void* ); protected: - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; public: RefEdit( Window* _pParent,IControlReferenceHandler* pParent, Window* pShrinkModeLabel, const ResId& rResId ); @@ -59,8 +59,8 @@ public: using Edit::SetText; - void SetText( const OUString& rStr ); - virtual void Modify(); + void SetText( const OUString& rStr ) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; void StartUpdateData(); @@ -89,10 +89,10 @@ private: RefEdit* pRefEdit; // zugeordnetes Edit-Control protected: - virtual void Click(); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Click() SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; public: RefButton(Window* _pParent, const ResId& rResId); diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx index f49eb77844b6..f2479bff352e 100644 --- a/include/oox/core/contexthandler.hxx +++ b/include/oox/core/contexthandler.hxx @@ -75,13 +75,13 @@ public: // com.sun.star.xml.sax.XFastContextHandler interface --------------------- - virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx index 7ee191eff6bd..4a1b2acb2a22 100644 --- a/include/oox/core/contexthandler2.hxx +++ b/include/oox/core/contexthandler2.hxx @@ -220,8 +220,8 @@ public: virtual ~ContextHandler2(); // resolve ambiguity from base classes - virtual void SAL_CALL acquire() throw() { ContextHandler::acquire(); } - virtual void SAL_CALL release() throw() { ContextHandler::release(); } + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { ContextHandler::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { ContextHandler::release(); } // com.sun.star.xml.sax.XFastContextHandler interface --------------------- @@ -230,38 +230,38 @@ public: sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; virtual void SAL_CALL characters( const OUString& rChars ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; virtual void SAL_CALL endFastElement( sal_Int32 nElement ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; // oox.core.ContextHandler interface -------------------------------------- - virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void endRecord( sal_Int32 nRecId ); + virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void endRecord( sal_Int32 nRecId ) SAL_OVERRIDE; // oox.core.ContextHandler2Helper interface ------------------------------- - virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); - virtual void onEndRecord(); + virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onEndRecord() SAL_OVERRIDE; }; diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx index 5101197d4797..1730f7327b1b 100644 --- a/include/oox/core/fasttokenhandler.hxx +++ b/include/oox/core/fasttokenhandler.hxx @@ -45,18 +45,18 @@ public: virtual ~FastTokenHandler(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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& rServiceName ) 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; // XFastTokenHandler - virtual sal_Int32 SAL_CALL getToken( const OUString& rIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getIdentifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getToken( const OUString& rIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getIdentifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getUTF8Identifier( sal_Int32 nToken ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getTokenFromUTF8( const ::com::sun::star::uno::Sequence< sal_Int8 >& Identifier ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Much faster direct C++ shortcut to the method that matters - virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const; + virtual sal_Int32 getTokenDirect( const char *pToken, sal_Int32 nLength ) const SAL_OVERRIDE; private: const TokenMap& mrTokenMap; ///< Reference to global token map singleton. diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx index 32b8a13901f8..5e91f600469c 100644 --- a/include/oox/core/filterbase.hxx +++ b/include/oox/core/filterbase.hxx @@ -203,15 +203,15 @@ public: 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& rServiceName ) - 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; // com.sun.star.lang.XInitialization interface ---------------------------- @@ -228,30 +228,30 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) throw( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // com.sun.star.document.XImporter interface ------------------------------ virtual void SAL_CALL setTargetDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument ) throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // com.sun.star.document.XExporter interface ------------------------------ virtual void SAL_CALL setSourceDocument( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rxDocument ) throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // com.sun.star.document.XFilter interface -------------------------------- virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ) - 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; protected: diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx index 7526dc3fb26c..e46340c4f7c0 100644 --- a/include/oox/core/filterdetect.hxx +++ b/include/oox/core/filterdetect.hxx @@ -54,18 +54,18 @@ public: virtual ~FilterDetectDocHandler(); // XFastDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFastContextHandler - virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endFastElement( sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createFastChildContext( sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); @@ -122,9 +122,9 @@ public: // com.sun.star.lang.XServiceInfo interface ------------------------------- - virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) 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& rServiceName ) 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; // com.sun.star.document.XExtendedFilterDetection interface --------------- @@ -146,7 +146,7 @@ public: */ virtual OUString SAL_CALL detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescSeq ) - 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::uno::XComponentContext > mxContext; diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx index c33a49e5fd7a..2570b340faa3 100644 --- a/include/oox/core/fragmenthandler.hxx +++ b/include/oox/core/fragmenthandler.hxx @@ -88,21 +88,21 @@ public: // com.sun.star.xml.sax.XFastDocumentHandler interface -------------------- - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& rxLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // com.sun.star.xml.sax.XFastContextHandler interface --------------------- - virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startUnknownElement( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endFastElement( ::sal_Int32 Element ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endUnknownElement( const OUString& Namespace, const OUString& Name ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createFastChildContext( ::sal_Int32 Element, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL createUnknownChildContext( const OUString& Namespace, const OUString& Name, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; // XML stream handling ---------------------------------------------------- diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx index a10d51b3c87f..a63d1601fd9e 100644 --- a/include/oox/core/fragmenthandler2.hxx +++ b/include/oox/core/fragmenthandler2.hxx @@ -52,8 +52,8 @@ public: virtual ~FragmentHandler2(); // resolve ambiguity from base classes - virtual void SAL_CALL acquire() throw() { FragmentHandler::acquire(); } - virtual void SAL_CALL release() throw() { FragmentHandler::release(); } + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { FragmentHandler::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { FragmentHandler::release(); } // com.sun.star.xml.sax.XFastContextHandler interface --------------------- @@ -62,48 +62,48 @@ public: sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; virtual void SAL_CALL startFastElement( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; virtual void SAL_CALL characters( const OUString& rChars ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; virtual void SAL_CALL endFastElement( sal_Int32 nElement ) throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL; + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_FINAL SAL_OVERRIDE; // com.sun.star.xml.sax.XFastDocumentHandler interface -------------------- virtual void SAL_CALL startDocument() throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL endDocument() throw( ::com::sun::star::xml::sax::SAXException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // oox.core.ContextHandler interface -------------------------------------- - virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void endRecord( sal_Int32 nRecId ); + virtual ContextHandlerRef createRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void startRecord( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void endRecord( sal_Int32 nRecId ) SAL_OVERRIDE; // oox.core.ContextHandler2Helper interface ------------------------------- - virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onStartElement( const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onStartElement( const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; - virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ); - virtual void onStartRecord( SequenceInputStream& rStrm ); - virtual void onEndRecord(); + virtual ContextHandlerRef onCreateRecordContext( sal_Int32 nRecId, SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onStartRecord( SequenceInputStream& rStrm ) SAL_OVERRIDE; + virtual void onEndRecord() SAL_OVERRIDE; // oox.core.FragmentHandler2 interface ------------------------------------ diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx index 756ef3e99f6c..15a6a804cffa 100644 --- a/include/oox/core/relationshandler.hxx +++ b/include/oox/core/relationshandler.hxx @@ -38,7 +38,7 @@ public: createFastChildContext( sal_Int32 nElement, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XFastAttributeList >& rxAttribs ) - throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: RelationsRef mxRelations; diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx index 5aed3d3d4c8c..a26bad854665 100644 --- a/include/oox/core/xmlfilterbase.hxx +++ b/include/oox/core/xmlfilterbase.hxx @@ -235,18 +235,18 @@ public: protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const; + implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > - implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const; + implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const SAL_OVERRIDE; - virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ); + virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor ) SAL_OVERRIDE; private: virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const; + const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxInStream ) const SAL_OVERRIDE; virtual StorageRef implCreateStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const; + const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ) const SAL_OVERRIDE; private: ::std::auto_ptr< XmlFilterBaseImpl > mxImpl; diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx index 4ca67edfaf69..e2cda6e4f88c 100644 --- a/include/oox/crypto/AgileEngine.hxx +++ b/include/oox/crypto/AgileEngine.hxx @@ -61,17 +61,17 @@ public: virtual bool writeEncryptionInfo( const OUString& rPassword, - BinaryXOutputStream& rStream); + BinaryXOutputStream& rStream) SAL_OVERRIDE; - virtual bool generateEncryptionKey(const OUString& rPassword); + virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE; virtual bool decrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream); + BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; virtual bool encrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream); + BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; }; } // namespace core diff --git a/include/oox/crypto/CryptTools.hxx b/include/oox/crypto/CryptTools.hxx index dde778d4df8c..a724f64ff218 100644 --- a/include/oox/crypto/CryptTools.hxx +++ b/include/oox/crypto/CryptTools.hxx @@ -95,7 +95,7 @@ public: virtual sal_uInt32 update( std::vector<sal_uInt8>& output, std::vector<sal_uInt8>& input, - sal_uInt32 inputLength = 0); + sal_uInt32 inputLength = 0) SAL_OVERRIDE; static sal_uInt32 aes128ecb( @@ -114,7 +114,7 @@ public: virtual sal_uInt32 update( std::vector<sal_uInt8>& output, std::vector<sal_uInt8>& input, - sal_uInt32 inputLength = 0); + sal_uInt32 inputLength = 0) SAL_OVERRIDE; }; class Digest diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx index 329d790a69cf..366eabc690cd 100644 --- a/include/oox/crypto/Standard2007Engine.hxx +++ b/include/oox/crypto/Standard2007Engine.hxx @@ -92,19 +92,19 @@ public: StandardEncryptionInfo& getInfo(); - virtual bool generateEncryptionKey(const OUString& rPassword); + virtual bool generateEncryptionKey(const OUString& rPassword) SAL_OVERRIDE; virtual bool writeEncryptionInfo( const OUString& rPassword, - BinaryXOutputStream& rStream); + BinaryXOutputStream& rStream) SAL_OVERRIDE; virtual bool decrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream); + BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; virtual bool encrypt( BinaryXInputStream& aInputStream, - BinaryXOutputStream& aOutputStream); + BinaryXOutputStream& aOutputStream) SAL_OVERRIDE; }; diff --git a/include/oox/drawingml/chart/axiscontext.hxx b/include/oox/drawingml/chart/axiscontext.hxx index 08ba65860075..0c832802b896 100644 --- a/include/oox/drawingml/chart/axiscontext.hxx +++ b/include/oox/drawingml/chart/axiscontext.hxx @@ -38,7 +38,7 @@ public: explicit AxisDispUnitsContext( ::oox::core::ContextHandler2Helper& rParent, AxisDispUnitsModel& rModel ); virtual ~AxisDispUnitsContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -54,7 +54,7 @@ public: explicit AxisContextBase( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~AxisContextBase(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -67,7 +67,7 @@ public: explicit CatAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~CatAxisContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -80,7 +80,7 @@ public: explicit DateAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~DateAxisContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -93,7 +93,7 @@ public: explicit SerAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~SerAxisContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -106,7 +106,7 @@ public: explicit ValAxisContext( ::oox::core::ContextHandler2Helper& rParent, AxisModel& rModel ); virtual ~ValAxisContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; diff --git a/include/oox/drawingml/chart/chartcontextbase.hxx b/include/oox/drawingml/chart/chartcontextbase.hxx index 5c5b3b6d52f0..9bf80ce947fc 100644 --- a/include/oox/drawingml/chart/chartcontextbase.hxx +++ b/include/oox/drawingml/chart/chartcontextbase.hxx @@ -66,7 +66,7 @@ public: explicit ShapePrWrapperContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rModel ); virtual ~ShapePrWrapperContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -81,7 +81,7 @@ public: explicit LayoutContext( ::oox::core::ContextHandler2Helper& rParent, LayoutModel& rModel ); virtual ~LayoutContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; diff --git a/include/oox/drawingml/chart/chartdrawingfragment.hxx b/include/oox/drawingml/chart/chartdrawingfragment.hxx index b904e2f4e831..b2d48df71b65 100644 --- a/include/oox/drawingml/chart/chartdrawingfragment.hxx +++ b/include/oox/drawingml/chart/chartdrawingfragment.hxx @@ -91,9 +91,9 @@ public: bool bOleSupport ); virtual ~ChartDrawingFragment(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > diff --git a/include/oox/drawingml/chart/chartspacefragment.hxx b/include/oox/drawingml/chart/chartspacefragment.hxx index 83c35621c89c..8f73594d8673 100644 --- a/include/oox/drawingml/chart/chartspacefragment.hxx +++ b/include/oox/drawingml/chart/chartspacefragment.hxx @@ -41,7 +41,7 @@ public: ChartSpaceModel& rModel ); virtual ~ChartSpaceFragment(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; ::oox::core::XmlFilterBase& mpFilterBase; }; diff --git a/include/oox/drawingml/chart/datasourcecontext.hxx b/include/oox/drawingml/chart/datasourcecontext.hxx index d9274d70ab4c..84c43bb921ac 100644 --- a/include/oox/drawingml/chart/datasourcecontext.hxx +++ b/include/oox/drawingml/chart/datasourcecontext.hxx @@ -42,8 +42,8 @@ public: explicit DoubleSequenceContext( ::oox::core::ContextHandler2Helper& rParent, DataSequenceModel& rModel ); virtual ~DoubleSequenceContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; private: sal_Int32 mnPtIndex; /// Current data point index. @@ -60,8 +60,8 @@ public: explicit StringSequenceContext( ::oox::core::ContextHandler2Helper& rParent, DataSequenceModel& rModel ); virtual ~StringSequenceContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; private: sal_Int32 mnPtIndex; /// Current data point index. @@ -80,7 +80,7 @@ public: explicit DataSourceContext( ::oox::core::ContextHandler2Helper& rParent, DataSourceModel& rModel ); virtual ~DataSourceContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; diff --git a/include/oox/drawingml/chart/plotareacontext.hxx b/include/oox/drawingml/chart/plotareacontext.hxx index bb7195f2e75d..4a2c06d90ec1 100644 --- a/include/oox/drawingml/chart/plotareacontext.hxx +++ b/include/oox/drawingml/chart/plotareacontext.hxx @@ -38,7 +38,7 @@ public: explicit View3DContext( ::oox::core::ContextHandler2Helper& rParent, View3DModel& rModel ); virtual ~View3DContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -54,7 +54,7 @@ public: explicit WallFloorContext( ::oox::core::ContextHandler2Helper& rParent, WallFloorModel& rModel ); virtual ~WallFloorContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -69,7 +69,7 @@ public: explicit DataTableContext( ::oox::core::ContextHandler2Helper& rParent, DataTableModel& rModel ); virtual ~DataTableContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -84,7 +84,7 @@ public: explicit PlotAreaContext( ::oox::core::ContextHandler2Helper& rParent, PlotAreaModel& rModel ); virtual ~PlotAreaContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; diff --git a/include/oox/drawingml/chart/seriescontext.hxx b/include/oox/drawingml/chart/seriescontext.hxx index 6ee9a83b32ab..d2be09c82486 100644 --- a/include/oox/drawingml/chart/seriescontext.hxx +++ b/include/oox/drawingml/chart/seriescontext.hxx @@ -38,8 +38,8 @@ public: explicit DataLabelContext( ::oox::core::ContextHandler2Helper& rParent, DataLabelModel& rModel ); virtual ~DataLabelContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; }; @@ -54,8 +54,8 @@ public: explicit DataLabelsContext( ::oox::core::ContextHandler2Helper& rParent, DataLabelsModel& rModel ); virtual ~DataLabelsContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; }; @@ -70,7 +70,7 @@ public: explicit PictureOptionsContext( ::oox::core::ContextHandler2Helper& rParent, PictureOptionsModel& rModel ); virtual ~PictureOptionsContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -85,7 +85,7 @@ public: explicit ErrorBarContext( ::oox::core::ContextHandler2Helper& rParent, ErrorBarModel& rModel ); virtual ~ErrorBarContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -100,7 +100,7 @@ public: explicit TrendlineLabelContext( ::oox::core::ContextHandler2Helper& rParent, TrendlineLabelModel& rModel ); virtual ~TrendlineLabelContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -115,8 +115,8 @@ public: explicit TrendlineContext( ::oox::core::ContextHandler2Helper& rParent, TrendlineModel& rModel ); virtual ~TrendlineContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; }; @@ -131,7 +131,7 @@ public: explicit DataPointContext( ::oox::core::ContextHandler2Helper& rParent, DataPointModel& rModel ); virtual ~DataPointContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -146,7 +146,7 @@ public: explicit SeriesContextBase( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~SeriesContextBase(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -159,7 +159,7 @@ public: explicit AreaSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~AreaSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -172,7 +172,7 @@ public: explicit BarSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~BarSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -185,7 +185,7 @@ public: explicit BubbleSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~BubbleSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -199,7 +199,7 @@ public: explicit LineSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~LineSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -213,7 +213,7 @@ public: explicit PieSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~PieSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -226,7 +226,7 @@ public: explicit RadarSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~RadarSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -239,7 +239,7 @@ public: explicit ScatterSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~ScatterSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -252,7 +252,7 @@ public: explicit SurfaceSeriesContext( ::oox::core::ContextHandler2Helper& rParent, SeriesModel& rModel ); virtual ~SurfaceSeriesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; diff --git a/include/oox/drawingml/chart/titlecontext.hxx b/include/oox/drawingml/chart/titlecontext.hxx index 4a7327290873..30c5abf24260 100644 --- a/include/oox/drawingml/chart/titlecontext.hxx +++ b/include/oox/drawingml/chart/titlecontext.hxx @@ -38,8 +38,8 @@ public: explicit TextContext( ::oox::core::ContextHandler2Helper& rParent, TextModel& rModel ); virtual ~TextContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; }; @@ -54,7 +54,7 @@ public: explicit TitleContext( ::oox::core::ContextHandler2Helper& rParent, TitleModel& rModel ); virtual ~TitleContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -69,7 +69,7 @@ public: explicit LegendContext( ::oox::core::ContextHandler2Helper& rParent, LegendModel& rModel ); virtual ~LegendContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; diff --git a/include/oox/drawingml/chart/typegroupcontext.hxx b/include/oox/drawingml/chart/typegroupcontext.hxx index 9a6e559f823e..7526a88f2f6e 100644 --- a/include/oox/drawingml/chart/typegroupcontext.hxx +++ b/include/oox/drawingml/chart/typegroupcontext.hxx @@ -38,7 +38,7 @@ public: explicit UpDownBarsContext( ::oox::core::ContextHandler2Helper& rParent, UpDownBarsModel& rModel ); virtual ~UpDownBarsContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -56,7 +56,7 @@ public: explicit AreaTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~AreaTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -69,7 +69,7 @@ public: explicit BarTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~BarTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -82,7 +82,7 @@ public: explicit BubbleTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~BubbleTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -96,7 +96,7 @@ public: explicit LineTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~LineTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -110,7 +110,7 @@ public: explicit PieTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~PieTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -123,7 +123,7 @@ public: explicit RadarTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~RadarTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -136,7 +136,7 @@ public: explicit ScatterTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~ScatterTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; @@ -150,7 +150,7 @@ public: explicit SurfaceTypeGroupContext( ::oox::core::ContextHandler2Helper& rParent, TypeGroupModel& rModel ); virtual ~SurfaceTypeGroupContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; diff --git a/include/oox/drawingml/textfield.hxx b/include/oox/drawingml/textfield.hxx index 4a2791836438..f1444e6e8c88 100644 --- a/include/oox/drawingml/textfield.hxx +++ b/include/oox/drawingml/textfield.hxx @@ -46,7 +46,7 @@ public: const ::com::sun::star::uno::Reference < ::com::sun::star::text::XText > & xText, const ::com::sun::star::uno::Reference < ::com::sun::star::text::XTextCursor > &xAt, const TextCharacterProperties& rTextCharacterStyle, - float nDefaultCharHeight) const; + float nDefaultCharHeight) const SAL_OVERRIDE; private: TextParagraphProperties maTextParagraphProperties; diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx index c0db743ebd7a..15c46e08a329 100644 --- a/include/oox/drawingml/themefragmenthandler.hxx +++ b/include/oox/drawingml/themefragmenthandler.hxx @@ -39,7 +39,7 @@ public: Theme& rTheme ); virtual ~ThemeFragmentHandler(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: Theme& mrTheme; diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx index 5c500e847161..25683ea14aa8 100644 --- a/include/oox/dump/dffdumper.hxx +++ b/include/oox/dump/dffdumper.hxx @@ -41,9 +41,9 @@ protected: using SequenceRecordObjectBase::construct; - virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ); - virtual void implWriteExtHeader(); - virtual void implDumpRecordBody(); + virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; + virtual void implWriteExtHeader() SAL_OVERRIDE; + virtual void implDumpRecordBody() SAL_OVERRIDE; virtual void implDumpClientAnchor(); private: diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx index 023e5bd72232..9e72588d7b79 100644 --- a/include/oox/dump/dumperbase.hxx +++ b/include/oox/dump/dumperbase.hxx @@ -604,17 +604,17 @@ public: protected: explicit NameListBase( const SharedConfigData& rCfgData ) : mrCfgData( rCfgData ) {} - virtual bool implIsValid() const; + virtual bool implIsValid() const SAL_OVERRIDE; virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ); + const OUString& rData ) SAL_OVERRIDE; virtual void implProcessConfigItemInt( TextInputStream& rStrm, sal_Int64 nKey, - const OUString& rData ); + const OUString& rData ) SAL_OVERRIDE; /** Derived classes set the name for the passed key. */ virtual void implSetName( sal_Int64 nKey, const OUString& rName ) = 0; @@ -657,16 +657,16 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ); + const OUString& rData ) SAL_OVERRIDE; /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; /** Returns the name for the passed key, or the default name, if key is not contained. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; /** Returns the name for the passed double value. */ - virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const SAL_OVERRIDE; /** Inserts all names from the passed list. */ - virtual void implIncludeList( const NameListBase& rList ); + virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; private: OUString maDefName; @@ -686,9 +686,9 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ); + const OUString& rData ) SAL_OVERRIDE; - virtual void implSetName( sal_Int64 nKey, const OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; private: void insertNames( sal_Int64 nStartKey, const OUString& rData ); @@ -713,16 +713,16 @@ protected: virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ); + const OUString& rData ) SAL_OVERRIDE; /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; /** Returns the name for the passed key. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; /** Returns the name for the passed double value. */ - virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const SAL_OVERRIDE; /** Inserts all flags from the passed list. */ - virtual void implIncludeList( const NameListBase& rList ); + virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; private: sal_Int64 mnIgnore; @@ -737,11 +737,11 @@ public: protected: /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; /** Returns the name for the passed key. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; /** Inserts all flags from the passed list. */ - virtual void implIncludeList( const NameListBase& rList ); + virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; private: struct ExtItemFormatKey @@ -773,13 +773,13 @@ public: protected: /** Sets the name for the passed key. */ - virtual void implSetName( sal_Int64 nKey, const OUString& rName ); + virtual void implSetName( sal_Int64 nKey, const OUString& rName ) SAL_OVERRIDE; /** Returns the converted value with appended unit name. */ - virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const; + virtual OUString implGetName( const Config& rCfg, sal_Int64 nKey ) const SAL_OVERRIDE; /** Returns the converted value with appended unit name. */ - virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const; + virtual OUString implGetNameDbl( const Config& rCfg, double fValue ) const SAL_OVERRIDE; /** Empty implementation. */ - virtual void implIncludeList( const NameListBase& rList ); + virtual void implIncludeList( const NameListBase& rList ) SAL_OVERRIDE; private: OUString maUnitName; @@ -847,11 +847,11 @@ public: bool isPasswordCancelled() const { return mbPwCancelled; } protected: - virtual bool implIsValid() const; + virtual bool implIsValid() const SAL_OVERRIDE; virtual void implProcessConfigItemStr( TextInputStream& rStrm, const OUString& rKey, - const OUString& rData ); + const OUString& rData ) SAL_OVERRIDE; private: bool readConfigFile( const OUString& rFileUrl ); @@ -953,7 +953,7 @@ protected: const StorageRef& rxRootStrg, const OUString& rSysFileName ); - virtual bool implIsValid() const; + virtual bool implIsValid() const SAL_OVERRIDE; virtual const OUString* implGetOption( const OUString& rKey ) const; virtual NameListRef implGetNameList( const OUString& rListName ) const; @@ -1064,7 +1064,7 @@ public: protected: - virtual bool implIsValid() const; + virtual bool implIsValid() const SAL_OVERRIDE; private: void writeItemName( const String& rItemName ); @@ -1169,7 +1169,7 @@ public: bool isStorage() const; private: - virtual bool implIsValid() const; + virtual bool implIsValid() const SAL_OVERRIDE; private: StorageRef mxStrg; @@ -1197,7 +1197,7 @@ protected: void construct( const ConfigRef& rxConfig ); void construct( const ObjectBase& rParent ); - virtual bool implIsValid() const; + virtual bool implIsValid() const SAL_OVERRIDE; virtual void implDump(); @@ -1223,8 +1223,8 @@ protected: void construct( const ObjectBase& rParent, const StorageRef& rxStrg, const OUString& rSysPath ); void construct( const ObjectBase& rParent ); - virtual bool implIsValid() const; - virtual void implDump(); + virtual bool implIsValid() const SAL_OVERRIDE; + virtual void implDump() SAL_OVERRIDE; virtual void implDumpStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, @@ -1300,7 +1300,7 @@ protected: void construct( const ObjectBase& rParent, const OUString& rSysFileName ); void construct( const OutputObjectBase& rParent ); - virtual bool implIsValid() const; + virtual bool implIsValid() const SAL_OVERRIDE; @@ -1471,7 +1471,7 @@ protected: void construct( const OutputObjectBase& rParent, const BinaryInputStreamRef& rxStrm ); void construct( const InputObjectBase& rParent ); - virtual bool implIsValid() const; + virtual bool implIsValid() const SAL_OVERRIDE; @@ -1680,7 +1680,7 @@ public: protected: void dumpBinaryStream( bool bShowOffset = true ); - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; }; @@ -1702,8 +1702,8 @@ protected: const BinaryInputStreamRef& rxStrm, rtl_TextEncoding eTextEnc ); - virtual bool implIsValid() const; - virtual void implDump(); + virtual bool implIsValid() const SAL_OVERRIDE; + virtual void implDump() SAL_OVERRIDE; virtual void implDumpText( TextInputStream& rTextStrm ) = 0; @@ -1731,7 +1731,7 @@ public: rtl_TextEncoding eTextEnc ); protected: - virtual void implDumpText( TextInputStream& rTextStrm ); + virtual void implDumpText( TextInputStream& rTextStrm ) SAL_OVERRIDE; virtual void implDumpLine( const OUString& rLine, sal_uInt32 nLine ); }; @@ -1746,7 +1746,7 @@ public: const OUString& rSysFileName ); protected: - virtual void implDumpText( TextInputStream& rTextStrm ); + virtual void implDumpText( TextInputStream& rTextStrm ) SAL_OVERRIDE; }; @@ -1774,8 +1774,8 @@ protected: void setBinaryOnlyMode( bool bBinaryOnly ) { mbBinaryOnly = bBinaryOnly; } bool isBinaryOnlyMode() const { return mbBinaryOnly; } - virtual bool implIsValid() const; - virtual void implDump(); + virtual bool implIsValid() const SAL_OVERRIDE; + virtual void implDump() SAL_OVERRIDE; virtual bool implStartRecord( BinaryInputStream& rBaseStrm, sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0; virtual void implWriteExtHeader(); @@ -1817,7 +1817,7 @@ protected: const String& rRecNames, const String& rSimpleRecs = EMPTY_STRING ); - virtual bool implStartRecord( BinaryInputStream& rBaseStrm, sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize ); + virtual bool implStartRecord( BinaryInputStream& rBaseStrm, sal_Int64& ornRecPos, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) = 0; private: diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx index 014bdeb2974b..ad145a2cca07 100644 --- a/include/oox/dump/oledumper.hxx +++ b/include/oox/dump/oledumper.hxx @@ -60,7 +60,7 @@ public: explicit StdFontObject( const InputObjectBase& rParent ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; }; @@ -71,7 +71,7 @@ public: explicit StdPicObject( const InputObjectBase& rParent ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; }; @@ -91,7 +91,7 @@ public: explicit OleCompObjObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; }; @@ -103,7 +103,7 @@ public: explicit OlePropertyStreamObject( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; private: void dumpSection( const OUString& rGuid, sal_uInt32 nStartPos ); @@ -153,7 +153,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ); + const OUString& rSysFileName ) SAL_OVERRIDE; }; @@ -167,7 +167,7 @@ protected: sal_uInt32 nDataId5, sal_uInt32 nDataId6, sal_uInt16 nVersion, bool bCommonPart, bool bComplexPart ); - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; virtual void implDumpProperties() = 0; virtual void implDumpCommonExtra( sal_Int64 nEndPos ); virtual void implDumpCommonTrailing(); @@ -195,7 +195,7 @@ public: explicit ComCtlScrollBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties(); + virtual void implDumpProperties() SAL_OVERRIDE; }; @@ -206,7 +206,7 @@ public: explicit ComCtlProgressBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties(); + virtual void implDumpProperties() SAL_OVERRIDE; }; @@ -217,7 +217,7 @@ public: explicit ComCtlSliderObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties(); + virtual void implDumpProperties() SAL_OVERRIDE; }; @@ -228,7 +228,7 @@ public: explicit ComCtlUpDownObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties(); + virtual void implDumpProperties() SAL_OVERRIDE; }; @@ -239,9 +239,9 @@ public: explicit ComCtlImageListObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties(); - virtual void implDumpCommonExtra( sal_Int64 nEndPos ); - virtual void implDumpCommonTrailing(); + virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; + virtual void implDumpCommonTrailing() SAL_OVERRIDE; }; @@ -252,8 +252,8 @@ public: explicit ComCtlTabStripObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties(); - virtual void implDumpCommonExtra( sal_Int64 nEndPos ); + virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; }; @@ -264,8 +264,8 @@ public: explicit ComCtlTreeViewObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties(); - virtual void implDumpCommonExtra( sal_Int64 nEndPos ); + virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; private: sal_uInt32 mnStringFlags; @@ -279,9 +279,9 @@ public: explicit ComCtlStatusBarObject( const InputObjectBase& rParent, sal_uInt16 nVersion ); protected: - virtual void implDumpProperties(); - virtual void implDumpCommonExtra( sal_Int64 nEndPos ); - virtual void implDumpCommonTrailing(); + virtual void implDumpProperties() SAL_OVERRIDE; + virtual void implDumpCommonExtra( sal_Int64 nEndPos ) SAL_OVERRIDE; + virtual void implDumpCommonTrailing() SAL_OVERRIDE; }; @@ -304,8 +304,8 @@ protected: const String& rPropNameList, bool b64BitPropFlags = false ); - virtual bool implIsValid() const; - virtual void implDump(); + virtual bool implIsValid() const SAL_OVERRIDE; + virtual void implDump() SAL_OVERRIDE; virtual void implDumpShortProperties(); virtual void implDumpExtended(); @@ -433,7 +433,7 @@ public: explicit AxCFontNewObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); + virtual void implDumpShortProperties() SAL_OVERRIDE; }; @@ -444,7 +444,7 @@ public: explicit AxColumnInfoObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); + virtual void implDumpShortProperties() SAL_OVERRIDE; }; @@ -455,8 +455,8 @@ public: explicit AxCommandButtonObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); - virtual void implDumpExtended(); + virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpExtended() SAL_OVERRIDE; }; @@ -467,8 +467,8 @@ public: explicit AxMorphControlObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); - virtual void implDumpExtended(); + virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpExtended() SAL_OVERRIDE; private: void dumpColumnInfos(); @@ -486,8 +486,8 @@ public: explicit AxLabelObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); - virtual void implDumpExtended(); + virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpExtended() SAL_OVERRIDE; }; @@ -498,7 +498,7 @@ public: explicit AxImageObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); + virtual void implDumpShortProperties() SAL_OVERRIDE; }; @@ -509,7 +509,7 @@ public: explicit AxScrollBarObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); + virtual void implDumpShortProperties() SAL_OVERRIDE; }; @@ -520,7 +520,7 @@ public: explicit AxSpinButtonObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); + virtual void implDumpShortProperties() SAL_OVERRIDE; }; @@ -531,8 +531,8 @@ public: explicit AxTabStripObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); - virtual void implDumpExtended(); + virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpExtended() SAL_OVERRIDE; private: sal_Int32 mnTabFlagCount; @@ -555,7 +555,7 @@ public: const OUString* pProgId = 0 ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; private: void constructFormCtrlStrmObj( const OUString* pProgId ); @@ -596,7 +596,7 @@ public: explicit VbaFormClassInfoObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ); protected: - virtual void implDumpShortProperties(); + virtual void implDumpShortProperties() SAL_OVERRIDE; private: VbaFormSharedData& mrFormData; @@ -610,7 +610,7 @@ public: explicit VbaFormSiteObject( const InputObjectBase& rParent, VbaFormSharedData& rFormData ); protected: - virtual void implDumpShortProperties(); + virtual void implDumpShortProperties() SAL_OVERRIDE; private: VbaFormSharedData& mrFormData; @@ -624,7 +624,7 @@ public: explicit VbaFormDesignExtObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); + virtual void implDumpShortProperties() SAL_OVERRIDE; }; @@ -639,8 +639,8 @@ public: VbaFormSharedData& rFormData ); protected: - virtual void implDumpShortProperties(); - virtual void implDumpExtended(); + virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpExtended() SAL_OVERRIDE; private: void dumpClassInfos(); @@ -665,7 +665,7 @@ public: VbaFormSharedData& rFormData ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; private: VbaFormSharedData& mrFormData; @@ -679,7 +679,7 @@ public: explicit VbaPageObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); + virtual void implDumpShortProperties() SAL_OVERRIDE; }; @@ -690,8 +690,8 @@ public: explicit VbaMultiPageObject( const InputObjectBase& rParent ); protected: - virtual void implDumpShortProperties(); - virtual void implDumpExtended(); + virtual void implDumpShortProperties() SAL_OVERRIDE; + virtual void implDumpExtended() SAL_OVERRIDE; private: sal_Int32 mnPageCount; @@ -709,7 +709,7 @@ public: VbaFormSharedData& rFormData ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; private: VbaFormSharedData& mrFormData; @@ -730,12 +730,12 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ); + const OUString& rSysFileName ) SAL_OVERRIDE; virtual void implDumpStorage( const StorageRef& rxStrg, const OUString& rStrgPath, - const OUString& rSysPath ); + const OUString& rSysPath ) SAL_OVERRIDE; private: bool isFormStorage( const OUString& rStrgPath ) const; @@ -772,9 +772,9 @@ public: VbaSharedData& rVbaData ); protected: - virtual bool implIsValid() const; - virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ); - virtual void implDumpRecordBody(); + virtual bool implIsValid() const SAL_OVERRIDE; + virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; + virtual void implDumpRecordBody() SAL_OVERRIDE; private: OUString dumpByteString( const String& rName = EMPTY_STRING ); @@ -802,7 +802,7 @@ public: sal_Int32 nStrmOffset ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; private: VbaSharedData& mrVbaData; @@ -825,7 +825,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ); + const OUString& rSysFileName ) SAL_OVERRIDE; private: VbaSharedData& mrVbaData; @@ -847,7 +847,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ); + const OUString& rSysFileName ) SAL_OVERRIDE; private: VbaSharedData& mrVbaData; @@ -865,12 +865,12 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ); + const OUString& rSysFileName ) SAL_OVERRIDE; virtual void implDumpStorage( const StorageRef& rxStrg, const OUString& rStrgPath, - const OUString& rSysPath ); + const OUString& rSysPath ) SAL_OVERRIDE; private: VbaSharedData maVbaData; @@ -890,7 +890,7 @@ public: protected: virtual void implDumpBaseStream( const BinaryInputStreamRef& rxStrm, - const OUString& rSysFileName ); + const OUString& rSysFileName ) SAL_OVERRIDE; }; diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx index cdcf7e52dcfc..09aef138ad83 100644 --- a/include/oox/dump/pptxdumper.hxx +++ b/include/oox/dump/pptxdumper.hxx @@ -40,7 +40,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ); + const OUString& rSysFileName ) SAL_OVERRIDE; }; @@ -56,7 +56,7 @@ public: const OUString& rSysFileName ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; }; diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx index 8f0845738d44..f597fa15ef4b 100644 --- a/include/oox/dump/xlsbdumper.hxx +++ b/include/oox/dump/xlsbdumper.hxx @@ -47,7 +47,7 @@ protected: void construct( const ObjectBase& rParent, const BinaryInputStreamRef& rxStrm, const OUString& rSysFileName ); void construct( const RecordObjectBase& rParent ); - virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ); + virtual bool implReadRecordHeader( BinaryInputStream& rBaseStrm, sal_Int64& ornRecId, sal_Int64& ornRecSize ) SAL_OVERRIDE; OUString getErrorName( sal_uInt8 nErrCode ) const; @@ -105,7 +105,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& rxStrm, const OUString& rStrgPath, const OUString& rStrmName, - const OUString& rSysFileName ); + const OUString& rSysFileName ) SAL_OVERRIDE; }; @@ -121,7 +121,7 @@ public: const OUString& rSysFileName ); protected: - virtual void implDump(); + virtual void implDump() SAL_OVERRIDE; }; diff --git a/include/oox/export/vmlexport.hxx b/include/oox/export/vmlexport.hxx index 744dbbd1bf05..420725c72199 100644 --- a/include/oox/export/vmlexport.hxx +++ b/include/oox/export/vmlexport.hxx @@ -89,7 +89,7 @@ public: sal_uInt32 AddSdrObject( const SdrObject& rObj, sal_Int16 eHOri = -1, sal_Int16 eVOri = -1, sal_Int16 eHRel = -1, sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0, const sal_Bool bOOxmlExport = false ); - virtual void AddSdrObjectVMLObject( const SdrObject& rObj); + virtual void AddSdrObjectVMLObject( const SdrObject& rObj) SAL_OVERRIDE; static bool IsWaterMarkShape(const OUString& rStr); protected: /// Add an attribute to the generated <v:shape/> element. @@ -110,17 +110,17 @@ protected: /// /// The parameter is just what we got from StartShape(). virtual void EndShape( sal_Int32 nShapeElement ); - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ); + virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ) SAL_OVERRIDE; private: - virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ); - virtual void CloseContainer(); + virtual void OpenContainer( sal_uInt16 nEscherContainer, int nRecInstance = 0 ) SAL_OVERRIDE; + virtual void CloseContainer() SAL_OVERRIDE; - virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ); - virtual void LeaveGroup(); + virtual sal_uInt32 EnterGroup( const OUString& rShapeName, const Rectangle* pBoundRect = 0 ) SAL_OVERRIDE; + virtual void LeaveGroup() SAL_OVERRIDE; - virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ); + virtual void AddShape( sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32 nShapeId = 0 ) SAL_OVERRIDE; private: /// Create an OString representing the id from a numerical id. diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx index 6ad33a3dcf8b..110c1ff8f895 100644 --- a/include/oox/helper/binaryinputstream.hxx +++ b/include/oox/helper/binaryinputstream.hxx @@ -293,19 +293,19 @@ public: /** Closes the input stream. Does also close the wrapped UNO input stream if bAutoClose has been set to true in the constructor. */ - virtual void close(); + virtual void close() SAL_OVERRIDE; /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Seeks the stream forward by the passed number of bytes. This works for non-seekable streams too. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Stream operator for all data types supported by the readValue() function. */ template< typename Type > @@ -338,15 +338,15 @@ public: /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Seeks the stream forward by the passed number of bytes. This works for non-seekable streams too. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Stream operator for all data types supported by the readValue() function. */ template< typename Type > @@ -387,31 +387,31 @@ public: /** Returns the size of the data block in the wrapped stream offered by this wrapper. */ - virtual sal_Int64 size() const; + virtual sal_Int64 size() const SAL_OVERRIDE; /** Returns the current relative stream position. */ - virtual sal_Int64 tell() const; + virtual sal_Int64 tell() const SAL_OVERRIDE; /** Seeks the stream to the passed relative position, if the wrapped stream is seekable. */ - virtual void seek( sal_Int64 nPos ); + virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; /** Closes the input stream but not the wrapped stream. */ - virtual void close(); + virtual void close() SAL_OVERRIDE; /** Reads nBytes bytes to the passed sequence. Does not read out of the data block whose size has been specified on construction. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Reads nBytes bytes to the (existing) buffer opMem. Does not read out of the data block whose size has been specified on construction. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Seeks the stream forward by the passed number of bytes. This works for non-seekable streams too. Does not seek out of the data block. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Stream operator for all data types supported by the readValue() function. */ template< typename Type > diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx index 007a7e8e7865..fe8d5e0c5d0a 100644 --- a/include/oox/helper/binaryoutputstream.hxx +++ b/include/oox/helper/binaryoutputstream.hxx @@ -126,13 +126,13 @@ public: /** Flushes and closes the output stream. Does also close the wrapped UNO output stream if bAutoClose has been set to true in the constructor. */ - void close(); + void close() SAL_OVERRIDE; /** Writes the passed data sequence. */ - virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ); + virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Write nBytes bytes from the (preallocated!) buffer pMem. */ - virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Stream operator for all data types supported by the writeValue() function. */ template< typename Type > @@ -170,10 +170,10 @@ public: explicit SequenceOutputStream( StreamDataSequence& rData ); /** Writes the passed data sequence. */ - virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ); + virtual void writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Write nBytes bytes from the (preallocated!) buffer pMem. */ - virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Stream operator for all data types supported by the writeValue() function. */ template< typename Type > diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx index 0f794ede13b0..fc7f3c39bc0e 100644 --- a/include/oox/helper/binarystreambase.hxx +++ b/include/oox/helper/binarystreambase.hxx @@ -132,13 +132,13 @@ public: virtual ~BinaryXSeekableStream(); /** Returns the size of the stream, if wrapped stream is seekable, otherwise -1. */ - virtual sal_Int64 size() const; + virtual sal_Int64 size() const SAL_OVERRIDE; /** Returns the current stream position, if wrapped stream is seekable, otherwise -1. */ - virtual sal_Int64 tell() const; + virtual sal_Int64 tell() const SAL_OVERRIDE; /** Seeks the stream to the passed position, if wrapped stream is seekable. */ - virtual void seek( sal_Int64 nPos ); + virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; /** Releases the reference to the UNO XSeekable interface. */ - virtual void close(); + virtual void close() SAL_OVERRIDE; protected: explicit BinaryXSeekableStream( @@ -162,13 +162,13 @@ class OOX_DLLPUBLIC SequenceSeekableStream : public virtual BinaryStreamBase { public: /** Returns the size of the wrapped data sequence. */ - virtual sal_Int64 size() const; + virtual sal_Int64 size() const SAL_OVERRIDE; /** Returns the current stream position. */ - virtual sal_Int64 tell() const; + virtual sal_Int64 tell() const SAL_OVERRIDE; /** Seeks the stream to the passed position. */ - virtual void seek( sal_Int64 nPos ); + virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; /** Releases the reference to the data sequence. */ - virtual void close(); + virtual void close() SAL_OVERRIDE; protected: explicit SequenceSeekableStream( const StreamDataSequence& rData ); diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx index ce08a6beccfd..e671d42deb6d 100644 --- a/include/oox/helper/progressbar.hxx +++ b/include/oox/helper/progressbar.hxx @@ -93,9 +93,9 @@ public: virtual ~ProgressBar(); /** Returns the current position of the progress bar. */ - virtual double getPosition() const; + virtual double getPosition() const SAL_OVERRIDE; /** Sets the current position of the progress bar. */ - virtual void setPosition( double fPosition ); + virtual void setPosition( double fPosition ) SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > @@ -115,14 +115,14 @@ public: const OUString& rText ); /** Returns the current position of the progress bar segment. */ - virtual double getPosition() const; + virtual double getPosition() const SAL_OVERRIDE; /** Sets the current position of the progress bar segment. */ - virtual void setPosition( double fPosition ); + virtual void setPosition( double fPosition ) SAL_OVERRIDE; /** Returns the length that is still free for creating sub segments. */ - virtual double getFreeLength() const; + virtual double getFreeLength() const SAL_OVERRIDE; /** Adds a new segment with the specified length. */ - virtual ISegmentProgressBarRef createSegment( double fLength ); + virtual ISegmentProgressBarRef createSegment( double fLength ) SAL_OVERRIDE; private: ProgressBar maProgress; diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx index e3e544bcca33..f643935bb006 100644 --- a/include/oox/helper/zipstorage.hxx +++ b/include/oox/helper/zipstorage.hxx @@ -51,28 +51,28 @@ private: const OUString& rElementName ); /** Returns true, if the object represents a valid storage. */ - virtual bool implIsStorage() const; + virtual bool implIsStorage() const SAL_OVERRIDE; /** Returns the com.sun.star.embed.XStorage interface of the current storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > - implGetXStorage() const; + implGetXStorage() const SAL_OVERRIDE; /** Returns the names of all elements of this storage. */ - virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const; + virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const SAL_OVERRIDE; /** Opens and returns the specified sub storage from the storage. */ - virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ); + virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) SAL_OVERRIDE; /** Opens and returns the specified input stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implOpenInputStream( const OUString& rElementName ); + implOpenInputStream( const OUString& rElementName ) SAL_OVERRIDE; /** Opens and returns the specified output stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > - implOpenOutputStream( const OUString& rElementName ); + implOpenOutputStream( const OUString& rElementName ) SAL_OVERRIDE; /** Commits the current storage. */ - virtual void implCommit() const; + virtual void implCommit() const SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx index f722281a5375..237cf4468f49 100644 --- a/include/oox/ole/axbinaryreader.hxx +++ b/include/oox/ole/axbinaryreader.hxx @@ -45,24 +45,24 @@ public: /** Returns the size of the data this stream represents, if the wrapped stream supports the size() operation. */ - virtual sal_Int64 size() const; + virtual sal_Int64 size() const SAL_OVERRIDE; /** Return the current relative stream position (relative to position of the wrapped stream at construction time). */ - virtual sal_Int64 tell() const; + virtual sal_Int64 tell() const SAL_OVERRIDE; /** Seeks the stream to the passed relative position, if it is behind the current position. */ - virtual void seek( sal_Int64 nPos ); + virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; /** Closes the input stream but not the wrapped stream. */ - virtual void close(); + virtual void close() SAL_OVERRIDE; /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Seeks the stream forward by the passed number of bytes. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Aligns the stream to a multiple of the passed size (relative to the position of the wrapped stream at construction time). */ @@ -176,7 +176,7 @@ private: explicit PairProperty( AxPairData& rPairData ) : mrPairData( rPairData ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ); + virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; }; /** Complex property for a string value. */ @@ -187,7 +187,7 @@ private: explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ); + virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; }; /** Complex property for an array of strings. */ @@ -197,7 +197,7 @@ private: sal_uInt32 mnSize; explicit ArrayStringProperty( AxArrayString& rArray, sal_uInt32 nSize ) : mrArray( rArray ), mnSize( nSize ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ); + virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; }; /** Complex property for a GUID value. */ @@ -207,7 +207,7 @@ private: explicit GuidProperty( OUString& rGuid ) : mrGuid( rGuid ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ); + virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; }; /** Stream property for a font structure. */ @@ -217,7 +217,7 @@ private: explicit FontProperty( AxFontData& rFontData ) : mrFontData( rFontData ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ); + virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; }; /** Stream property for a picture or mouse icon. */ @@ -227,7 +227,7 @@ private: explicit PictureProperty( StreamDataSequence& rPicData ) : mrPicData( rPicData ) {} - virtual bool readProperty( AxAlignedInputStream& rInStrm ); + virtual bool readProperty( AxAlignedInputStream& rInStrm ) SAL_OVERRIDE; }; typedef RefVector< ComplexProperty > ComplexPropVector; diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx index abb2fafbe645..62029bb2f8ac 100644 --- a/include/oox/ole/axbinarywriter.hxx +++ b/include/oox/ole/axbinarywriter.hxx @@ -33,22 +33,22 @@ public: /** Returns the size of the data this stream represents, if the wrapped stream supports the size() operation. */ - virtual sal_Int64 size() const; + virtual sal_Int64 size() const SAL_OVERRIDE; /** Return the current relative stream position (relative to position of the wrapped stream at construction time). */ - virtual sal_Int64 tell() const; + virtual sal_Int64 tell() const SAL_OVERRIDE; /** Seeks the stream to the passed relative position, if it is behind the current position. */ - virtual void seek( sal_Int64 nPos ); + virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; /** Closes the input stream but not the wrapped stream. */ - virtual void close(); + virtual void close() SAL_OVERRIDE; /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual void writeData( const StreamDataSequence& orData, size_t nAtomSize = 1 ); + virtual void writeData( const StreamDataSequence& orData, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void writeMemory( const void* pMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Aligns the stream to a multiple of the passed size (relative to the position of the wrapped stream at construction time). */ @@ -125,7 +125,7 @@ private: explicit PairProperty( AxPairData& rPairData ) : mrPairData( rPairData ) {} - virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ); + virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) SAL_OVERRIDE; }; /** Complex property for a string value. */ @@ -136,7 +136,7 @@ private: explicit StringProperty( OUString& rValue, sal_uInt32 nSize ) : mrValue( rValue ), mnSize( nSize ) {} - virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ); + virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) SAL_OVERRIDE; }; /** Stream property for a picture or mouse icon. */ @@ -146,7 +146,7 @@ private: explicit PictureProperty( StreamDataSequence& rPicData ) : mrPicData( rPicData ) {} - virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ); + virtual bool writeProperty( AxAlignedOutputStream& rOutStrm ) SAL_OVERRIDE; }; typedef RefVector< ComplexProperty > ComplexPropVector; diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 15994434e67d..397a379f7574 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -401,8 +401,8 @@ public: sal_uInt32 nDataPartId5, sal_uInt32 nDataPartId6, sal_uInt16 nVersion, bool bCommonPart, bool bComplexPart ); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; protected: virtual void importControlData( BinaryInputStream& rInStrm ) = 0; @@ -443,11 +443,11 @@ class ComCtlScrollBarModel : public ComCtlModelBase public: explicit ComCtlScrollBarModel( sal_uInt16 nVersion ); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; protected: - virtual void importControlData( BinaryInputStream& rInStrm ); + virtual void importControlData( BinaryInputStream& rInStrm ) SAL_OVERRIDE; private: sal_uInt32 mnScrollBarFlags; ///< Special flags for scroll bar model. @@ -466,11 +466,11 @@ class ComCtlProgressBarModel : public ComCtlModelBase public: explicit ComCtlProgressBarModel( sal_uInt16 nVersion ); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; protected: - virtual void importControlData( BinaryInputStream& rInStrm ); + virtual void importControlData( BinaryInputStream& rInStrm ) SAL_OVERRIDE; private: float mfMin; ///< Minimum of the value range. @@ -487,7 +487,7 @@ class OOX_DLLPUBLIC AxControlModelBase : public ControlModelBase public: explicit AxControlModelBase(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; }; @@ -498,11 +498,11 @@ class OOX_DLLPUBLIC AxFontDataModel : public AxControlModelBase public: explicit AxFontDataModel( bool bSupportsAlign = true ); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; /** Returns the font height in points. */ sal_Int16 getFontHeight() const { return maFontData.getHeightPoints(); } @@ -522,15 +522,15 @@ class OOX_DLLPUBLIC AxCommandButtonModel : public AxFontDataModel public: explicit AxCommandButtonModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); - virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; + virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; public: // direct access needed for legacy VML drawing controls StreamDataSequence maPictureData; ///< Binary picture stream. @@ -551,14 +551,14 @@ class OOX_DLLPUBLIC AxLabelModel : public AxFontDataModel public: explicit AxLabelModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; public: // direct access needed for legacy VML drawing controls OUString maCaption; ///< Visible caption of the button. @@ -579,14 +579,14 @@ class OOX_DLLPUBLIC AxImageModel : public AxControlModelBase public: explicit AxImageModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); - virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; + virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; private: StreamDataSequence maPictureData; ///< Binary picture stream. @@ -605,9 +605,9 @@ class OOX_DLLPUBLIC AxTabStripModel : public AxFontDataModel public: explicit AxTabStripModel(); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; - virtual ApiControlType getControlType() const; + virtual ApiControlType getControlType() const SAL_OVERRIDE; public: sal_uInt32 mnListIndex; @@ -626,11 +626,11 @@ class OOX_DLLPUBLIC AxMorphDataModelBase : public AxFontDataModel public: explicit AxMorphDataModelBase(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); - virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; + virtual void importPictureData( sal_Int32 nPropId, BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; public: // direct access needed for legacy VML drawing controls StreamDataSequence maPictureData; ///< Binary picture stream. @@ -663,10 +663,10 @@ class OOX_DLLPUBLIC AxToggleButtonModel : public AxMorphDataModelBase public: explicit AxToggleButtonModel(); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; }; @@ -677,10 +677,10 @@ class OOX_DLLPUBLIC AxCheckBoxModel : public AxMorphDataModelBase public: explicit AxCheckBoxModel(); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; }; @@ -694,10 +694,10 @@ public: /** Returns the group name used to goup several option buttons gogether. */ const OUString& getGroupName() const { return maGroupName; } - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; }; @@ -708,10 +708,10 @@ class OOX_DLLPUBLIC AxTextBoxModel : public AxMorphDataModelBase public: explicit AxTextBoxModel(); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; }; @@ -722,10 +722,10 @@ class OOX_DLLPUBLIC AxNumericFieldModel : public AxMorphDataModelBase public: explicit AxNumericFieldModel(); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; }; @@ -736,10 +736,10 @@ class OOX_DLLPUBLIC AxListBoxModel : public AxMorphDataModelBase public: explicit AxListBoxModel(); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; }; @@ -750,10 +750,10 @@ class OOX_DLLPUBLIC AxComboBoxModel : public AxMorphDataModelBase public: explicit AxComboBoxModel(); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; }; @@ -764,14 +764,14 @@ class OOX_DLLPUBLIC AxSpinButtonModel : public AxControlModelBase public: explicit AxSpinButtonModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; public: // direct access needed for legacy VML drawing controls sal_uInt32 mnArrowColor; ///< Button arrow color. @@ -793,14 +793,14 @@ class OOX_DLLPUBLIC AxScrollBarModel : public AxControlModelBase public: explicit AxScrollBarModel(); - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ); - virtual void exportCompObj( BinaryOutputStream& rOutStrm ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void exportBinaryModel( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; + virtual void exportCompObj( BinaryOutputStream& rOutStrm ) SAL_OVERRIDE; - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; - virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ); + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; + virtual void convertFromProperties( PropertySet& rPropSet, const ControlConverter& rConv ) SAL_OVERRIDE; public: // direct access needed for legacy VML drawing controls sal_uInt32 mnArrowColor; ///< Button arrow color. @@ -827,12 +827,12 @@ public: explicit AxContainerModelBase( bool bFontSupport = false ); /** Allows to set single properties specified by XML token identifier. */ - virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ); + virtual void importProperty( sal_Int32 nPropId, const OUString& rValue ) SAL_OVERRIDE; /** Reads the leading structure in the 'f' stream containing the model for this control. */ - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; /** Converts font settings if supported. */ - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; /** Reads the class table structure for embedded controls following the own model from the 'f' stream. */ @@ -867,8 +867,8 @@ class OOX_DLLPUBLIC AxFrameModel : public AxContainerModelBase public: explicit AxFrameModel(); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; }; class OOX_DLLPUBLIC AxPageModel : public AxContainerModelBase @@ -876,8 +876,8 @@ class OOX_DLLPUBLIC AxPageModel : public AxContainerModelBase public: explicit AxPageModel(); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; }; class OOX_DLLPUBLIC AxMultiPageModel : public AxContainerModelBase @@ -885,9 +885,9 @@ class OOX_DLLPUBLIC AxMultiPageModel : public AxContainerModelBase public: explicit AxMultiPageModel(); - virtual ApiControlType getControlType() const; + virtual ApiControlType getControlType() const SAL_OVERRIDE; virtual bool importPageAndMultiPageProperties( BinaryInputStream& rInStrm, sal_Int32 nPages ); - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; std::vector<sal_uInt32> mnIDs; sal_uInt32 mnActiveTab; sal_uInt32 mnTabStyle; @@ -902,8 +902,8 @@ class OOX_DLLPUBLIC AxUserFormModel : public AxContainerModelBase public: explicit AxUserFormModel(); - virtual ApiControlType getControlType() const; - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual ApiControlType getControlType() const SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; }; class HtmlSelectModel : public AxListBoxModel @@ -912,15 +912,15 @@ class HtmlSelectModel : public AxListBoxModel com::sun::star::uno::Sequence< sal_Int16 > msIndices; public: HtmlSelectModel(); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); - virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const; + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; + virtual void convertProperties( PropertyMap& rPropMap, const ControlConverter& rConv ) const SAL_OVERRIDE; }; class HtmlTextBoxModel : public AxTextBoxModel { public: explicit HtmlTextBoxModel(); - virtual bool importBinaryModel( BinaryInputStream& rInStrm ); + virtual bool importBinaryModel( BinaryInputStream& rInStrm ) SAL_OVERRIDE; }; diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx index 3139060f9030..0edf0dd89cad 100644 --- a/include/oox/ole/axcontrolfragment.hxx +++ b/include/oox/ole/axcontrolfragment.hxx @@ -39,7 +39,7 @@ public: ControlModelBase& rModel ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: ControlModelBase& mrModel; @@ -58,7 +58,7 @@ public: EmbeddedControl& rControl ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: EmbeddedControl& mrControl; diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx index 22223aee2785..085ef570abaa 100644 --- a/include/oox/ole/olestorage.hxx +++ b/include/oox/ole/olestorage.hxx @@ -65,7 +65,7 @@ private: void initStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& rxOutStream ); /** Returns true, if the object represents a valid storage. */ - virtual bool implIsStorage() const; + virtual bool implIsStorage() const SAL_OVERRIDE; /** Returns the com.sun.star.embed.XStorage interface of the current storage. @@ -73,24 +73,24 @@ private: This function is not implemented for binary OLE storages. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > - implGetXStorage() const; + implGetXStorage() const SAL_OVERRIDE; /** Returns the names of all elements of this storage. */ - virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const; + virtual void implGetElementNames( ::std::vector< OUString >& orElementNames ) const SAL_OVERRIDE; /** Opens and returns the specified sub storage from the storage. */ - virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ); + virtual StorageRef implOpenSubStorage( const OUString& rElementName, bool bCreateMissing ) SAL_OVERRIDE; /** Opens and returns the specified input stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - implOpenInputStream( const OUString& rElementName ); + implOpenInputStream( const OUString& rElementName ) SAL_OVERRIDE; /** Opens and returns the specified output stream from the storage. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > - implOpenOutputStream( const OUString& rElementName ); + implOpenOutputStream( const OUString& rElementName ) SAL_OVERRIDE; /** Commits the current storage. */ - virtual void implCommit() const; + virtual void implCommit() const SAL_OVERRIDE; private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx index c0adb5bda13f..330158bee707 100644 --- a/include/oox/ole/vbainputstream.hxx +++ b/include/oox/ole/vbainputstream.hxx @@ -35,22 +35,22 @@ public: explicit VbaInputStream( BinaryInputStream& rInStrm ); /** Returns -1, stream size is not determinable. */ - virtual sal_Int64 size() const; + virtual sal_Int64 size() const SAL_OVERRIDE; /** Returns -1, stream position is not tracked. */ - virtual sal_Int64 tell() const; + virtual sal_Int64 tell() const SAL_OVERRIDE; /** Does nothing, stream is not seekable. */ - virtual void seek( sal_Int64 nPos ); + virtual void seek( sal_Int64 nPos ) SAL_OVERRIDE; /** Closes the input stream but not the wrapped stream. */ - virtual void close(); + virtual void close() SAL_OVERRIDE; /** Reads nBytes bytes to the passed sequence. @return Number of bytes really read. */ - virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readData( StreamDataSequence& orData, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Reads nBytes bytes to the (existing) buffer opMem. @return Number of bytes really read. */ - virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual sal_Int32 readMemory( void* opMem, sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; /** Seeks the stream forward by the passed number of bytes. */ - virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ); + virtual void skip( sal_Int32 nBytes, size_t nAtomSize = 1 ) SAL_OVERRIDE; private: /** If no data left in chunk buffer, reads the next chunk from stream. */ diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx index 7f5da0c39730..57202805ad2b 100644 --- a/include/oox/ppt/backgroundproperties.hxx +++ b/include/oox/ppt/backgroundproperties.hxx @@ -31,7 +31,7 @@ class BackgroundPropertiesContext : public ::oox::core::FragmentHandler2 { public: BackgroundPropertiesContext( ::oox::core::FragmentHandler2& rParent, ::oox::drawingml::FillProperties& rFillProperties ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; protected: ::oox::drawingml::FillProperties& mrFillProperties; diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx index d32d331c6052..20e2971f8f44 100644 --- a/include/oox/ppt/customshowlistcontext.hxx +++ b/include/oox/ppt/customshowlistcontext.hxx @@ -43,7 +43,7 @@ namespace oox { namespace ppt { std::vector< CustomShow >& rCustomShowList ); ~CustomShowListContext( ); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; }; } } diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx index 730a0e839042..993e79b62be1 100644 --- a/include/oox/ppt/dgmimport.hxx +++ b/include/oox/ppt/dgmimport.hxx @@ -40,19 +40,19 @@ public: QuickDiagrammingImport( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // from FilterBase - virtual bool importDocument() throw(); - virtual bool exportDocument() throw(); + virtual bool importDocument() throw() SAL_OVERRIDE; + virtual bool exportDocument() throw() SAL_OVERRIDE; - virtual const ::oox::drawingml::Theme* getCurrentTheme() const; + virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; virtual sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; - virtual oox::vml::Drawing* getVmlDrawing(); - virtual oox::drawingml::chart::ChartConverter* getChartConverter(); + virtual oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; + virtual oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; private: - virtual OUString implGetImplementationName() const; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; }; } } diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx index 64131975bfd2..2b5d97d3c657 100644 --- a/include/oox/ppt/dgmlayout.hxx +++ b/include/oox/ppt/dgmlayout.hxx @@ -40,19 +40,19 @@ public: QuickDiagrammingLayout( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); // from FilterBase - virtual bool importDocument() throw(); - virtual bool exportDocument() throw(); + virtual bool importDocument() throw() SAL_OVERRIDE; + virtual bool exportDocument() throw() SAL_OVERRIDE; - virtual const ::oox::drawingml::Theme* getCurrentTheme() const; + virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; virtual sal_Int32 getSchemeClr( sal_Int32 nColorSchemeToken ) const; - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; - virtual ::oox::vml::Drawing* getVmlDrawing(); - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); + virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; private: - virtual OUString implGetImplementationName() const; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; drawingml::ThemePtr mpThemePtr; }; diff --git a/include/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx index 739ba253d5b2..09350710f043 100644 --- a/include/oox/ppt/layoutfragmenthandler.hxx +++ b/include/oox/ppt/layoutfragmenthandler.hxx @@ -32,7 +32,7 @@ public: LayoutFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pMasterPersistPtr ) throw(); virtual ~LayoutFragmentHandler() throw(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; }; } } diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx index 308a7fb60e9b..c393be6411a9 100644 --- a/include/oox/ppt/pptimport.hxx +++ b/include/oox/ppt/pptimport.hxx @@ -42,13 +42,13 @@ public: virtual ~PowerPointImport(); // from FilterBase - virtual bool importDocument() throw(); - virtual bool exportDocument() throw(); + virtual bool importDocument() throw() SAL_OVERRIDE; + virtual bool exportDocument() throw() SAL_OVERRIDE; - virtual const ::oox::drawingml::Theme* getCurrentTheme() const; - virtual ::oox::vml::Drawing* getVmlDrawing(); - virtual const oox::drawingml::table::TableStyleListPtr getTableStyles(); - virtual ::oox::drawingml::chart::ChartConverter* getChartConverter(); + virtual const ::oox::drawingml::Theme* getCurrentTheme() const SAL_OVERRIDE; + virtual ::oox::vml::Drawing* getVmlDrawing() SAL_OVERRIDE; + virtual const oox::drawingml::table::TableStyleListPtr getTableStyles() SAL_OVERRIDE; + virtual ::oox::drawingml::chart::ChartConverter* getChartConverter() SAL_OVERRIDE; void setActualSlidePersist( SlidePersistPtr pActualSlidePersist ){ mpActualSlidePersist = pActualSlidePersist; }; std::map< OUString, oox::drawingml::ThemePtr >& getThemes(){ return maThemes; }; @@ -57,7 +57,7 @@ public: std::vector< SlidePersistPtr >& getNotesPages(){ return maNotesPages; }; virtual sal_Bool SAL_CALL filter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Int32 getSchemeColor( sal_Int32 nToken ) const; @@ -66,9 +66,9 @@ public: #endif private: - virtual GraphicHelper* implCreateGraphicHelper() const; - virtual ::oox::ole::VbaProject* implCreateVbaProject() const; - virtual OUString implGetImplementationName() const; + virtual GraphicHelper* implCreateGraphicHelper() const SAL_OVERRIDE; + virtual ::oox::ole::VbaProject* implCreateVbaProject() const SAL_OVERRIDE; + virtual OUString implGetImplementationName() const SAL_OVERRIDE; private: OUString maTableStyleListPath; diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx index ffe6ae1b2530..f9c1136ed5ff 100644 --- a/include/oox/ppt/pptshape.hxx +++ b/include/oox/ppt/pptshape.hxx @@ -49,7 +49,7 @@ public: const com::sun::star::awt::Rectangle* pShapeRect = 0, ::oox::drawingml::ShapeIdMap* pShapeMap = 0 ); - virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ); + virtual void applyShapeReference( const oox::drawingml::Shape& rReferencedShape, bool bUseText = true ) SAL_OVERRIDE; void setShapeLocation( const oox::ppt::ShapeLocation eShapeLocation ) { meShapeLocation = eShapeLocation; }; ShapeLocation getShapeLocation() const { return meShapeLocation; }; diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx index a0b51ef0de1b..362b90e09a9c 100644 --- a/include/oox/ppt/presentationfragmenthandler.hxx +++ b/include/oox/ppt/presentationfragmenthandler.hxx @@ -40,8 +40,8 @@ class PresentationFragmentHandler : public ::oox::core::FragmentHandler2 public: PresentationFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath ) throw(); virtual ~PresentationFragmentHandler() throw(); - virtual void finalizeImport(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual void finalizeImport() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; protected: bool importSlide( const ::oox::core::FragmentHandlerRef& rxSlideFragmentHandler, diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx index 7fde32356fb3..ed03b1d7934b 100644 --- a/include/oox/ppt/slidefragmenthandler.hxx +++ b/include/oox/ppt/slidefragmenthandler.hxx @@ -37,9 +37,9 @@ public: SlideFragmentHandler( ::oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, SlidePersistPtr pPersistPtr, const ShapeLocation eShapeLocation ) throw(); virtual ~SlideFragmentHandler() throw(); - virtual void finalizeImport(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); + virtual void finalizeImport() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; const ::std::vector< OUString>& getCharVector() { return maCharVector; } diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx index fecdfba17ce5..bc7ca2d8ed73 100644 --- a/include/oox/ppt/slidemastertextstylescontext.hxx +++ b/include/oox/ppt/slidemastertextstylescontext.hxx @@ -32,7 +32,7 @@ class SlideMasterTextStylesContext : public oox::core::FragmentHandler2 public: SlideMasterTextStylesContext( ::oox::core::FragmentHandler2& rParent, SlidePersistPtr pSlidePersistPtr ); ~SlideMasterTextStylesContext(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; protected: SlidePersistPtr mpSlidePersistPtr; diff --git a/include/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx index fd6724d89857..d3b294f85d42 100644 --- a/include/oox/ppt/slidetimingcontext.hxx +++ b/include/oox/ppt/slidetimingcontext.hxx @@ -35,7 +35,7 @@ public: SlideTimingContext( ::oox::core::FragmentHandler2& rParent, TimeNodePtrList & aTimeNodeList ) throw(); virtual ~SlideTimingContext() throw(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: TimeNodePtrList & maTimeNodeList; diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx index e52068373c7f..9c5d840ab050 100644 --- a/include/oox/ppt/slidetransitioncontext.hxx +++ b/include/oox/ppt/slidetransitioncontext.hxx @@ -35,8 +35,8 @@ namespace oox { namespace ppt { PropertyMap & aProperties ) throw(); virtual ~SlideTransitionContext() throw(); - virtual void onEndElement(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx index a823ffc5b000..ca2e70fd7e38 100644 --- a/include/oox/ppt/soundactioncontext.hxx +++ b/include/oox/ppt/soundactioncontext.hxx @@ -33,8 +33,8 @@ public: SoundActionContext( ::oox::core::FragmentHandler2& rParent, PropertyMap & aProperties ) throw(); virtual ~SoundActionContext() throw(); - virtual void onEndElement(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual void onEndElement() SAL_OVERRIDE; + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: PropertyMap& maSlideProperties; diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx index 786b333664b2..b958f15f3a07 100644 --- a/include/oox/ppt/timenodelistcontext.hxx +++ b/include/oox/ppt/timenodelistcontext.hxx @@ -51,7 +51,7 @@ public: TimeNodeListContext( ::oox::core::FragmentHandler2& rParent, TimeNodePtrList & aList ) throw(); virtual ~TimeNodeListContext() throw(); - virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ); + virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) SAL_OVERRIDE; private: diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx index eb5bb5571567..2229426589e8 100644 --- a/include/oox/vml/vmldrawingfragment.hxx +++ b/include/oox/vml/vmldrawingfragment.hxx @@ -39,12 +39,12 @@ public: Drawing& rDrawing ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > - openFragmentStream() const; + openFragmentStream() const SAL_OVERRIDE; virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; - virtual void finalizeImport(); + virtual void finalizeImport() SAL_OVERRIDE; private: Drawing& mrDrawing; diff --git a/include/oox/vml/vmlinputstream.hxx b/include/oox/vml/vmlinputstream.hxx index af94056156b9..335858615fee 100644 --- a/include/oox/vml/vmlinputstream.hxx +++ b/include/oox/vml/vmlinputstream.hxx @@ -62,15 +62,15 @@ public: virtual ~InputStream(); virtual sal_Int32 SAL_CALL readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nBytesToRead ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& rData, sal_Int32 nMaxBytesToRead ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL available() - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL closeInput() - throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: void updateBuffer() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 51054259e504..ac3df2f400f1 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -293,7 +293,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; /** Used by both RectangleShape and ComplexShape. */ com::sun::star::uno::Reference<com::sun::star::drawing::XShape>createPictureObject( const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >& rxShapes, @@ -315,7 +315,7 @@ protected: virtual com::sun::star::uno::Reference<com::sun::star::drawing::XShape> implConvertAndInsert( const com::sun::star::uno::Reference<com::sun::star::drawing::XShapes>& rxShapes, - const com::sun::star::awt::Rectangle& rShapeRect) const; + const com::sun::star::awt::Rectangle& rShapeRect) const SAL_OVERRIDE; }; @@ -340,7 +340,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; }; /** A Line shape object. */ @@ -368,7 +368,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; }; @@ -384,7 +384,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; }; @@ -401,7 +401,7 @@ protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; }; @@ -419,19 +419,19 @@ public: const ShapeContainer& getChildren() const { return *mxChildren; } /** Final processing after import of the drawing fragment. */ - virtual void finalizeFragmentImport(); + virtual void finalizeFragmentImport() SAL_OVERRIDE; /** Returns the shape template with the passed identifier from the child shapes. */ - virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const; + virtual const ShapeType* getChildTypeById( const OUString& rShapeId ) const SAL_OVERRIDE; /** Returns the shape with the passed identifier from the child shapes. */ - virtual const ShapeBase* getChildById( const OUString& rShapeId ) const; + virtual const ShapeBase* getChildById( const OUString& rShapeId ) const SAL_OVERRIDE; protected: /** Creates the corresponding XShape and inserts it into the passed container. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > implConvertAndInsert( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes, - const ::com::sun::star::awt::Rectangle& rShapeRect ) const; + const ::com::sun::star::awt::Rectangle& rShapeRect ) const SAL_OVERRIDE; private: SAL_WNODEPRECATED_DECLARATIONS_PUSH diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx index a4b6b6eb76ce..4f178db1361a 100644 --- a/include/oox/vml/vmlshapecontext.hxx +++ b/include/oox/vml/vmlshapecontext.hxx @@ -48,7 +48,7 @@ public: Drawing& rDrawing ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: Drawing& mrDrawing; @@ -65,9 +65,9 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); - virtual void onCharacters( const OUString& rChars ); - virtual void onEndElement(); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; + virtual void onCharacters( const OUString& rChars ) SAL_OVERRIDE; + virtual void onEndElement() SAL_OVERRIDE; private: ClientData& mrClientData; @@ -101,7 +101,7 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: /** Processes the 'style' attribute. */ @@ -125,7 +125,7 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: /** Processes the 'points' attribute. */ @@ -159,7 +159,7 @@ public: const AttributeList& rAttribs ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; private: ShapeContainer& mrShapes; @@ -176,7 +176,7 @@ public: RectangleShape& rShape ); virtual ::oox::core::ContextHandlerRef - onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ); + onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs ) SAL_OVERRIDE; }; diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx index 18b86b821c63..e0cea2749346 100644 --- a/include/sfx2/DocumentMetadataAccess.hxx +++ b/include/sfx2/DocumentMetadataAccess.hxx @@ -94,37 +94,37 @@ public: // ::com::sun::star::rdf::XNode: virtual OUString SAL_CALL getStringValue() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XURI: virtual OUString SAL_CALL getNamespace() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getLocalName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XRepositorySupplier: virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XRepository > SAL_CALL getRDFRepository() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XDocumentMetadataAccess: virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable > SAL_CALL getElementByMetadataReference( const ::com::sun::star::beans::StringPair & i_rReference) - 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::rdf::XMetadatable > SAL_CALL getElementByURI(const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > & i_xURI) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IllegalArgumentException, std::exception); + ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > > SAL_CALL getMetadataGraphsWithType( const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > & i_xType) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IllegalArgumentException, std::exception); + ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI> SAL_CALL addMetadataFile(const OUString & i_rFileName, @@ -133,7 +133,7 @@ public: > & i_rTypes) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::ElementExistException, std::exception); + ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI> SAL_CALL importMetadataFile(::sal_Int16 i_Format, @@ -150,23 +150,23 @@ public: ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::container::ElementExistException, ::com::sun::star::rdf::ParseException, - ::com::sun::star::io::IOException, std::exception); + ::com::sun::star::io::IOException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMetadataFile( const ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XURI > & i_xGraphName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, std::exception); + ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addContentOrStylesFile( const OUString & i_rFileName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::ElementExistException, std::exception); + ::com::sun::star::container::ElementExistException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeContentOrStylesFile( const OUString & i_rFileName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::container::NoSuchElementException, std::exception); + ::com::sun::star::container::NoSuchElementException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadMetadataFromStorage( const ::com::sun::star::uno::Reference< @@ -177,25 +177,25 @@ public: ::com::sun::star::task::XInteractionHandler> & i_xHandler) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, std::exception); + ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeMetadataToStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & i_xStorage) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, std::exception); + ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadMetadataFromMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & i_rMedium) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, std::exception); + ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeMetadataToMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & i_rMedium) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::lang::WrappedTargetException, std::exception); + ::com::sun::star::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; private: std::auto_ptr<DocumentMetadataAccess_Impl> m_pImpl; diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx index 7b5aeb163007..e69fd3f536a6 100644 --- a/include/sfx2/Metadatable.hxx +++ b/include/sfx2/Metadatable.hxx @@ -147,23 +147,23 @@ public: // ::com::sun::star::rdf::XNode: virtual OUString SAL_CALL getStringValue() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XURI: virtual OUString SAL_CALL getLocalName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getNamespace() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::rdf::XMetadatable: virtual ::com::sun::star::beans::StringPair SAL_CALL getMetadataReference() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setMetadataReference( const ::com::sun::star::beans::StringPair & i_rReference) throw (::com::sun::star::uno::RuntimeException, - ::com::sun::star::lang::IllegalArgumentException, std::exception); + ::com::sun::star::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL ensureMetadataReference() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// get the core object corresponding to this UNO object. diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 57cbf016b7e4..247ccface11c 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -101,9 +101,9 @@ class SfxLinkItem : public SfxPoolItem { Link aLink; public: - virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const + virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE { return new SfxLinkItem( *this ); } - virtual bool operator==( const SfxPoolItem& rL) const + virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE { return ((SfxLinkItem&)rL).aLink == aLink; } SfxLinkItem( sal_uInt16 nWhichId, const Link& rValue ) : SfxPoolItem( nWhichId ) { aLink = rValue; } @@ -194,7 +194,7 @@ public: // misc. bool GetOptions(SfxItemSet &); void SetOptions(const SfxItemSet &); - virtual void Invalidate(sal_uInt16 nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; void NotifyEvent(const SfxEventHint& rEvent, bool bSynchron = true ); bool IsDowning() const; void ResetLastDir(); diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index e486242670b1..4349a5be9b07 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -105,15 +105,15 @@ protected: SfxModelessDialog( SfxBindings*, SfxChildWindow*, Window*, const OString& rID, const OUString& rUIXMLDescription ); ~SfxModelessDialog(); - virtual bool Close(); - virtual void Resize(); - virtual void Move(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: virtual void FillInfo(SfxChildWinInfo&) const; void Initialize (SfxChildWinInfo* pInfo); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; SfxBindings& GetBindings() { return *pBindings; } @@ -143,11 +143,11 @@ protected: const ResId& rResId); ~SfxFloatingWindow(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual bool Close(); - virtual void Resize(); - virtual void Move(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; SfxBindings& GetBindings() { return *pBindings; } diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 154e8b8f9dc8..03fa2c632b6b 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -282,7 +282,7 @@ public: static SfxChildWindow* CreateImpl(::Window *pParent, sal_uInt16 nId, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ static void RegisterChildWindow (sal_Bool bVisible=sal_False, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \ - virtual SfxChildWinInfo GetInfo() const + virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE #define SFX_DECL_CHILDWINDOW_WITHID(Class) \ SFX_DECL_CHILDWINDOW(Class); \ diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx index acf0d6c35b0f..52eda07573fe 100644 --- a/include/sfx2/controlwrapper.hxx +++ b/include/sfx2/controlwrapper.hxx @@ -201,7 +201,7 @@ public: /** Enables, disables, shows, or hides the control. @descr Does nothing, if the corresponding parameter is TRISTATE_INDET. */ - virtual void ModifyControl( TriState eEnable, TriState eShow ); + virtual void ModifyControl( TriState eEnable, TriState eShow ) SAL_OVERRIDE; /** Derived classes return the value the control contains. */ virtual ValueT GetControlValue() const = 0; @@ -226,11 +226,11 @@ class SFX2_DLLPUBLIC DummyWindowWrapper: public: explicit DummyWindowWrapper( Window& rWindow ); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool ) SAL_OVERRIDE; - virtual void* GetControlValue() const; - virtual void SetControlValue( void* ); + virtual void* GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( void* ) SAL_OVERRIDE; }; @@ -242,11 +242,11 @@ class SFX2_DLLPUBLIC CheckBoxWrapper: public: explicit CheckBoxWrapper( CheckBox& rCheckBox ); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual bool GetControlValue() const; - virtual void SetControlValue( bool bValue ); + virtual bool GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( bool bValue ) SAL_OVERRIDE; }; @@ -263,11 +263,11 @@ public: virtual ~ColorListBoxWrapper(); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual Color GetControlValue() const; - virtual void SetControlValue( Color aColor ); + virtual Color GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( Color aColor ) SAL_OVERRIDE; }; @@ -444,12 +444,12 @@ public: void RegisterControlWrapper( ControlWrapperBase& rWrapper ); /** Enables, disables, shows, or hides the registered controls. */ - virtual void ModifyControl( TriState eEnable, TriState eShow ); + virtual void ModifyControl( TriState eEnable, TriState eShow ) SAL_OVERRIDE; /** Returns true if all registered controls are in "don't know" state. */ - virtual bool IsControlDontKnow() const; + virtual bool IsControlDontKnow() const SAL_OVERRIDE; /** Sets all registered controls to "don't know" state. */ - virtual void SetControlDontKnow( bool bSet ); + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; private: std::auto_ptr< MultiControlWrapperHelper_Impl > mxImpl; diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 9925b5433e91..d3355e33f0e0 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -88,7 +88,7 @@ class SFX2_DLLPUBLIC SfxStatusForwarder: public SfxControllerItem protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; public: SfxStatusForwarder( sal_uInt16 nSlotId, diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 9389559d6776..a0f65b7825ff 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -170,10 +170,10 @@ public: GetCmisProperties() const; void SetCmisProperties(::com::sun::star::uno::Sequence< ::com::sun::star::document::CmisProperty > cmisProps ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; // class SfxDocumentPage ------------------------------------------------- @@ -219,8 +219,8 @@ private: protected: SfxDocumentPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -242,8 +242,8 @@ private: protected: SfxDocumentDescPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -256,7 +256,7 @@ class SFX2_DLLPUBLIC SfxDocumentInfoDialog : public SfxTabDialog private: sal_uInt16 m_nDocInfoId; protected: - virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ); + virtual void PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) SAL_OVERRIDE; public: SfxDocumentInfoDialog( Window* pParent, const SfxItemSet& ); @@ -326,7 +326,7 @@ class CustomPropertiesDurationField : public Edit CustomPropertyLine* m_pLine; com::sun::star::util::Duration m_aDuration; protected: - virtual void RequestHelp(const HelpEvent& rEvt); + virtual void RequestHelp(const HelpEvent& rEvt) SAL_OVERRIDE; public: CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ); ~CustomPropertiesDurationField(); @@ -368,7 +368,7 @@ private: public: CustomPropertiesYesNoButton( Window* pParent, const ResId& rResId ); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; inline void CheckYes() { m_aYesButton.Check(); } inline void CheckNo() { m_aNoButton.Check(); } @@ -489,7 +489,7 @@ public: GetCustomProperties() const { return m_pPropertiesWin->GetCustomProperties(); } void Init(VclBuilderContainer& rParent); - virtual void setAllocation(const Size &rAllocation); + virtual void setAllocation(const Size &rAllocation) SAL_OVERRIDE; }; // class SfxCustomPropertiesPage ----------------------------------------- @@ -506,9 +506,9 @@ private: protected: SfxCustomPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); @@ -628,9 +628,9 @@ private: protected: SfxCmisPropertiesPage( Window* pParent, const SfxItemSet& ); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx index 3560e0e2fc39..84c59666d31f 100644 --- a/include/sfx2/dinfedt.hxx +++ b/include/sfx2/dinfedt.hxx @@ -32,7 +32,7 @@ public: InfoEdit_Impl( Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ) {} - virtual void KeyInput( const KeyEvent& rKEvent ); + virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index 85d25fec608d..40dc08b3b59d 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -105,7 +105,7 @@ private: #define SFX_DECL_OBJECTFACTORY() \ public: \ static SfxObjectFactory& Factory(); \ - virtual SfxObjectFactory& GetFactory() const { return Factory(); } + virtual SfxObjectFactory& GetFactory() const SAL_OVERRIDE { return Factory(); } #define SFX_IMPL_OBJECTFACTORY(ClassName,GlobName,Flags,ShortName) \ SfxObjectFactory& ClassName::Factory() \ diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index f29988968b1f..919e30111ce9 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -57,16 +57,16 @@ protected: virtual SfxChildAlignment CheckAlignment(SfxChildAlignment,SfxChildAlignment); - virtual void Resize(); - virtual bool PrepareToggleFloatingMode(); - virtual void ToggleFloatingMode(); - virtual void StartDocking(); - virtual bool Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ); - virtual void Resizing( Size& rSize ); - virtual void Paint( const Rectangle& rRect ); - virtual bool Close(); - virtual void Move(); + virtual void Resize() SAL_OVERRIDE; + virtual bool PrepareToggleFloatingMode() SAL_OVERRIDE; + virtual void ToggleFloatingMode() SAL_OVERRIDE; + virtual void StartDocking() SAL_OVERRIDE; + virtual bool Docking( const Point& rPos, Rectangle& rRect ) SAL_OVERRIDE; + virtual void EndDocking( const Rectangle& rRect, bool bFloatMode ) SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; SAL_DLLPRIVATE SfxChildWindow* GetChildWindow_Impl() { return pMgr; } @@ -83,7 +83,7 @@ public: void Initialize (SfxChildWinInfo* pInfo); virtual void FillInfo(SfxChildWinInfo&) const; - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; void SetDockingRects(const Rectangle& rOuter, const Rectangle& rInner) { aInnerRect = rInner; aOuterRect = rOuter; } @@ -98,7 +98,7 @@ public: void SetMinOutputSizePixel( const Size& rSize ); Size GetMinOutputSizePixel() const; - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void FadeIn( bool ); void AutoShow( bool bShow = true ); DECL_LINK(TimerHdl, void *); diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx index 21d13a60884d..53aa7e62f3d0 100644 --- a/include/sfx2/docstoragemodifylistener.hxx +++ b/include/sfx2/docstoragemodifylistener.hxx @@ -64,10 +64,10 @@ namespace sfx2 void dispose(); // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified( 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; protected: virtual ~DocumentStorageModifyListener(); diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx index 3f96dedf95c8..15e230d69131 100644 --- a/include/sfx2/evntconf.hxx +++ b/include/sfx2/evntconf.hxx @@ -78,16 +78,16 @@ public: SfxEventNamesItem ( const sal_uInt16 nId ) : SfxPoolItem( nId ) {} - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; const SfxEventNamesList& GetEvents() const { return aEventsList;} void SetEvents( const SfxEventNamesList& rList ) { aEventsList = rList; } diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx index 67e04d36083e..8c3881ae2658 100644 --- a/include/sfx2/fcontnr.hxx +++ b/include/sfx2/fcontnr.hxx @@ -49,9 +49,9 @@ class SfxRefItem : public SfxPoolItem { SvRefBaseRef aRef; public: - virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const + virtual SfxPoolItem* Clone( SfxItemPool* = 0 ) const SAL_OVERRIDE { return new SfxRefItem( *this ); } - virtual bool operator==( const SfxPoolItem& rL) const + virtual bool operator==( const SfxPoolItem& rL) const SAL_OVERRIDE { return ((SfxRefItem&)rL).aRef == aRef; } SfxRefItem( sal_uInt16 nWhichId, const SvRefBaseRef& rValue ) : SfxPoolItem( nWhichId ) { aRef = rValue; } diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index 0bf2a8763397..1641bd5f41cd 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -239,12 +239,12 @@ public: SfxFrameItem( SfxFrame *p=0 ); SfxFrameItem( sal_uInt16 nWhich, SfxFrame *p ); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; bool FrameKilled() const { return &wFrame != pFrame; } @@ -260,10 +260,10 @@ public: SfxUsrAnyItem( sal_uInt16 nWhich, const ::com::sun::star::uno::Any& rAny ); ::com::sun::star::uno::Any GetValue() const { return aValue; } - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SFX2_DLLPUBLIC SfxUnoFrameItem : public SfxPoolItem @@ -278,10 +278,10 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& GetFrame() const { return m_xFrame; } - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; typedef SfxUsrAnyItem SfxUnoAnyItem; diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 7c17b1cad4b8..98b493bde8b5 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -237,15 +237,15 @@ public: virtual ~SfxFrameDescriptorItem(); - virtual bool operator ==( const SfxPoolItem& ) const; + virtual bool operator ==( const SfxPoolItem& ) const SAL_OVERRIDE; SfxFrameDescriptorItem& operator =( const SfxFrameDescriptorItem & ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; const SfxFrameProperties& GetProperties() const { return aProperties; } diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 9cd504d50b8f..091b98134e22 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -53,8 +53,8 @@ class SfxInfoBarWindow : public Window ~SfxInfoBarWindow( ); virtual const OUString& getId() const { return m_sId; } - virtual void Paint( const Rectangle& ); - virtual void Resize( ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void Resize( ) SAL_OVERRIDE; private: DECL_LINK( CloseHandler, void* ); @@ -74,7 +74,7 @@ class SfxInfoBarContainerWindow : public Window SfxInfoBarWindow* getInfoBar( const OUString& sId ); void removeInfoBar( SfxInfoBarWindow* pInfoBar ); - virtual void Resize( ); + virtual void Resize( ) SAL_OVERRIDE; }; diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx index 7dc7f5948345..f7e36c7f538b 100644 --- a/include/sfx2/itemconnect.hxx +++ b/include/sfx2/itemconnect.hxx @@ -261,11 +261,11 @@ public: protected: /** Actions according to current flags for the control. */ - virtual void ApplyFlags( const SfxItemSet& rItemSet ); + virtual void ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE; /** Resets the control according to the item contents. */ - virtual void Reset( const SfxItemSet& rItemSet ); + virtual void Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE; /** Fills the item set according to the control's state. */ - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ); + virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; ItemWrapperType maItemWrp; ControlWrapperRef mxCtrlWrp; @@ -290,9 +290,9 @@ public: ItemConnFlags nFlags = ITEMCONN_DEFAULT ); protected: - virtual void ApplyFlags( const SfxItemSet& rItemSet ); - virtual void Reset( const SfxItemSet& rItemSet ); - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ); + virtual void ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; private: sal_uInt16 mnSlot; @@ -449,9 +449,9 @@ public: void AddConnection( ItemConnectionBase* pConnection ); protected: - virtual void ApplyFlags( const SfxItemSet& rItemSet ); - virtual void Reset( const SfxItemSet& rItemSet ); - virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ); + virtual void ApplyFlags( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rItemSet ) SAL_OVERRIDE; + virtual bool FillItemSet( SfxItemSet& rDestSet, const SfxItemSet& rOldSet ) SAL_OVERRIDE; private: std::auto_ptr< ItemConnectionArrayImpl > mxImpl; diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 1b0fcfb3a517..9b0e1093eb58 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -79,13 +79,13 @@ friend class SfxStyleDialog; static SfxTabPage* Create(Window *pParent, const SfxItemSet &rAttrSet ); protected: - virtual bool FillItemSet(SfxItemSet &); - virtual void Reset(const SfxItemSet &); + virtual bool FillItemSet(SfxItemSet &) SAL_OVERRIDE; + virtual void Reset(const SfxItemSet &) SAL_OVERRIDE; using TabPage::ActivatePage; - virtual void ActivatePage(const SfxItemSet &); + virtual void ActivatePage(const SfxItemSet &) SAL_OVERRIDE; using TabPage::DeactivatePage; - virtual int DeactivatePage(SfxItemSet * = 0); + virtual int DeactivatePage(SfxItemSet * = 0) SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 3b443b570666..db322d412ccb 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -45,8 +45,8 @@ public: SfxMacroInfoItem( const SfxMacroInfoItem& ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; OUString GetComment() const { return aCommentText; } void SetComment( const OUString& r ) diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index 0ac440e245ca..97892478c0c8 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -64,7 +64,7 @@ public: virtual PopupMenu* GetPopup() const; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & ); static SfxUnoMenuControl* CreateControl( const OUString&, sal_uInt16, Menu&, const OUString& sItemText, SfxBindings&, SfxVirtualMenu* ); diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 48ab868b0f23..a6a57fcf342a 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -85,7 +85,7 @@ public: virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet ); - virtual void Invalidate(sal_uInt16 nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; /*virtual*/ bool IsChildWindowAvailable( const sal_uInt16 i_nId, const SfxViewFrame* i_pViewFrame ) const; diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx index dec3c734ac0a..9d40799f40e1 100644 --- a/include/sfx2/navigat.hxx +++ b/include/sfx2/navigat.hxx @@ -45,9 +45,9 @@ public: Window* pParent , WinBits nBits ); - virtual void Resize(); - virtual void Resizing( Size& rSize ); - virtual bool Close(); + virtual void Resize() SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx index 862e29fe4abd..86819aba688a 100644 --- a/include/sfx2/objitem.hxx +++ b/include/sfx2/objitem.hxx @@ -35,8 +35,8 @@ public: TYPEINFO_OVERRIDE(); SfxObjectItem( sal_uInt16 nWhich=0, SfxShell *pSh=0 ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; SfxShell* GetShell() const { return _pSh; } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 3374d0880ca6..c7b9ad9be1a8 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -190,7 +190,7 @@ protected: virtual ~SfxObjectShell(); virtual void ModifyChanged(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; /** declares the document to have capabilities to contain basic/dialog libraries */ @@ -225,7 +225,7 @@ public: GetCurrentComponent(); static void SetCurrentComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent ); - virtual void Invalidate(sal_uInt16 nId = 0); + virtual void Invalidate(sal_uInt16 nId = 0) SAL_OVERRIDE; SfxObjectShellFlags GetFlags( ) const ; @@ -493,7 +493,7 @@ public: // Documents, for which to format the view size - virtual SfxObjectShell* GetObjectShell(); + virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; virtual SfxFrame* GetSmartSelf( SfxFrame* pSelf, SfxMedium& rMedium ); @@ -540,16 +540,16 @@ public: SvGlobalName GetClassName() const; // comphelper::IEmbeddedHelper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const; - virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const + virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const SAL_OVERRIDE; + virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const SAL_OVERRIDE { return const_cast<SfxObjectShell*>(this)->GetStorage(); } - virtual comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const + virtual comphelper::EmbeddedObjectContainer& getEmbeddedObjectContainer() const SAL_OVERRIDE { return GetEmbeddedObjectContainer(); } - bool isEnableSetModified() const + bool isEnableSetModified() const SAL_OVERRIDE { return IsEnableSetModified(); } @@ -733,7 +733,7 @@ class AutoReloadTimer_Impl : public Timer public: AutoReloadTimer_Impl( const OUString& rURL, sal_uInt32 nTime, SfxObjectShell* pSh ); - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; }; class SFX2_DLLPUBLIC SfxObjectShellItem: public SfxPoolItem @@ -756,11 +756,11 @@ public: pObjSh( pObjShell ) {} - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; SfxObjectShell* GetObjectShell() const { return pObjSh; } diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 0f558a0b50df..789e44442fd9 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -115,7 +115,7 @@ public: void ShowMinLengthText(bool bShow); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; }; #endif // INCLUDED_SFX2_PASSWD_HXX diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 27b5d93bb15e..03bb3a32f2db 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -89,17 +89,17 @@ private: protected: using TabPage::DeactivatePage; - virtual int DeactivatePage( SfxItemSet* pSet = NULL ); + virtual int DeactivatePage( SfxItemSet* pSet = NULL ) SAL_OVERRIDE; public: SfxCommonPrintOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); ~SfxCommonPrintOptionsTabPage(); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - virtual Window* GetParentLabeledBy( const Window* pLabel ) const; - virtual Window* GetParentLabelFor( const Window* pLabel ) const; + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual Window* GetParentLabeledBy( const Window* pLabel ) const SAL_OVERRIDE; + virtual Window* GetParentLabelFor( const Window* pLabel ) const SAL_OVERRIDE; static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); }; diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx index 95ea9ea3398c..0a6b635350cb 100644 --- a/include/sfx2/prnmon.hxx +++ b/include/sfx2/prnmon.hxx @@ -47,8 +47,8 @@ public: virtual ~SfxPrintOptionsDialog(); bool Construct(); - virtual short Execute(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual short Execute() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; SfxTabPage* GetTabPage() const { return pPage; } const SfxItemSet& GetOptions() const { return *pOptions; } diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx index 9d0335d47e15..ca7dd23013c1 100644 --- a/include/sfx2/recentdocsview.hxx +++ b/include/sfx2/recentdocsview.hxx @@ -55,17 +55,17 @@ public: int mnFileTypes; - virtual void Clear(); + virtual void Clear() SAL_OVERRIDE; DECL_STATIC_LINK( RecentDocsView, ExecuteHdl_Impl, LoadRecentFile* ); protected: - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void OnItemDblClicked(ThumbnailViewItem *pItem); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; void OpenItem( const ThumbnailViewItem *pItem ); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual void LoseFocus(); + virtual void LoseFocus() SAL_OVERRIDE; bool isAcceptedFile(const OUString &rURL) const; diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx index eb9a621769a5..e074296dca46 100644 --- a/include/sfx2/recentdocsviewitem.hxx +++ b/include/sfx2/recentdocsviewitem.hxx @@ -17,10 +17,10 @@ class RecentDocsViewItem : public ThumbnailViewItem public: RecentDocsViewItem(ThumbnailView &rView, const OUString &rURL, const OUString &rTitle, const BitmapEx& rThumbnail, sal_uInt16 nId); - virtual void setEditTitle (bool edit, bool bChangeFocus = true); + virtual void setEditTitle (bool edit, bool bChangeFocus = true) SAL_OVERRIDE; /// Text to be used for the tooltip. - virtual OUString getHelpText() const; + virtual OUString getHelpText() const SAL_OVERRIDE; OUString maURL; diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index 676aa971925c..96b2017516dc 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -36,8 +36,8 @@ protected: SfxSecurityPage( Window* pParent, const SfxItemSet& ); virtual ~SfxSecurityPage(); - virtual bool FillItemSet( SfxItemSet& ); - virtual void Reset( const SfxItemSet& ); + virtual bool FillItemSet( SfxItemSet& ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& ) SAL_OVERRIDE; public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& ); diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index 561888e7d203..5de5c26e7b91 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -117,13 +117,13 @@ public: SAL_DLLPRIVATE void ReleaseShell_Impl(); SAL_DLLPRIVATE void BorderWidthsChanged_Impl(); - css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator( ) throw (css::uno::RuntimeException, std::exception); + css::uno::Reference< css::task::XStatusIndicator > SAL_CALL getStatusIndicator( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XController2 - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getComponentWindow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getViewControllerName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCreationArguments() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XController @@ -142,7 +142,7 @@ public: @onerror - */ - virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -157,7 +157,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException, std::exception ) ; + virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -172,7 +172,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw( css::uno::RuntimeException, std::exception ) ; + virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -187,7 +187,7 @@ public: @onerror - */ - css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) ; + css::uno::Any SAL_CALL getViewData() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -202,7 +202,7 @@ public: @onerror - */ - void SAL_CALL restoreViewData( const css::uno::Any& aValue ) throw( css::uno::RuntimeException, std::exception ) ; + void SAL_CALL restoreViewData( const css::uno::Any& aValue ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -217,7 +217,7 @@ public: @onerror - */ - css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw( css::uno::RuntimeException, std::exception ) ; + css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -232,7 +232,7 @@ public: @onerror - */ - css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) ; + css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; // XDispatchProvider @@ -253,7 +253,7 @@ public: virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL & aURL , const OUString & sTargetFrameName, - FrameSearchFlags eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) ; + FrameSearchFlags eSearchFlags ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -268,16 +268,16 @@ public: @onerror - */ - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& seqDescriptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; // XControllerBorder - virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException, std::exception); + virtual css::frame::BorderWidths SAL_CALL getBorder() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeBorderResizeListener( const css::uno::Reference< css::frame::XBorderResizeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::awt::Rectangle SAL_CALL queryBorderedArea( const css::awt::Rectangle& aPreliminaryRectangle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent @@ -296,7 +296,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -311,7 +311,7 @@ public: @onerror - */ - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -326,27 +326,27 @@ public: @onerror - */ - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) ; - virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual void SAL_CALL registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeKeyHandler( const css::uno::Reference< css::awt::XKeyHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseClickHandler( const css::uno::Reference< css::awt::XMouseClickHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatchInformationProvider - virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::frame::XTitle - virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getTitle( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::frame::XTitleChangeBroadcaster - virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // FIXME: TL needs this in sw/source/ui/uno/unotxdoc.cxx now; // either the _Impl name should vanish or there should be an "official" API diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 2b5b4493ee81..3094b9096239 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -229,7 +229,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short increment refcount @@ -245,7 +245,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL acquire() throw() ; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short decrement refcount @@ -261,7 +261,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual void SAL_CALL release() throw() ; + virtual void SAL_CALL release() throw() SAL_OVERRIDE ; // XTypeProvider @@ -280,7 +280,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short get implementation id @@ -296,7 +296,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; @@ -306,28 +306,28 @@ public: /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ - virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getLibraryContainer() throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getLibraryContainer() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password, const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(css::container::ElementExistException, css::uno::RuntimeException, std::exception); + throw(css::container::ElementExistException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName, const OUString& Language, const OUString& Source ) - throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); + throw( css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @seealso XStarBasicAccess */ virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName, const css::uno::Sequence< sal_Int8 >& Data ) - throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); + throw(css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -347,7 +347,7 @@ public: @onerror - */ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) ; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -363,7 +363,7 @@ public: */ virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& xParent ) throw(css::lang::NoSupportException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent @@ -382,7 +382,7 @@ public: @onerror - */ - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -397,7 +397,7 @@ public: @onerror - */ - virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -412,12 +412,12 @@ public: @onerror - */ - virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDocumentPropertiesSupplier virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL getDocumentProperties() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener @@ -436,7 +436,7 @@ public: @onerror - */ - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModel @@ -457,7 +457,7 @@ public: virtual sal_Bool SAL_CALL attachResource(const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -472,7 +472,7 @@ public: @onerror - */ - virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -487,7 +487,7 @@ public: @onerror - */ - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -502,7 +502,7 @@ public: @onerror - */ - virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -517,7 +517,7 @@ public: @onerror - */ - virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -532,7 +532,7 @@ public: @onerror - */ - virtual void SAL_CALL lockControllers() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL lockControllers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -547,7 +547,7 @@ public: @onerror - */ - virtual void SAL_CALL unlockControllers() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL unlockControllers() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -562,7 +562,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL hasControllersLocked() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasControllersLocked() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -577,7 +577,7 @@ public: @onerror - */ - virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -593,7 +593,7 @@ public: */ virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) - throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); + throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -608,36 +608,36 @@ public: @onerror - */ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XModel2 virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL getControllers() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createDefaultViewController(const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::uno::RuntimeException , css::lang::IllegalArgumentException, - css::uno::Exception, std::exception ); + css::uno::Exception, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::frame::XController2 > SAL_CALL createViewController(const OUString& ViewName , const css::uno::Sequence< css::beans::PropertyValue >& Arguments , const css::uno::Reference< css::frame::XFrame >& Frame ) throw (css::uno::RuntimeException , css::lang::IllegalArgumentException, - css::uno::Exception, std::exception ); + css::uno::Exception, std::exception ) SAL_OVERRIDE; // XModifiable2 - virtual ::sal_Bool SAL_CALL disableSetModified( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL enableSetModified( ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isSetModifiedEnabled( ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL disableSetModified( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL enableSetModified( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isSetModifiedEnabled( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -652,7 +652,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isModified() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -668,7 +668,7 @@ public: */ virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception); + throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -683,7 +683,7 @@ public: @onerror - */ - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -698,27 +698,27 @@ public: @onerror - */ - virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) throw( css::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL removeModifyListener(const css::uno::Reference< css::util::XModifyListener > & xListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; // XCloseable - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCloseBroadcaster - virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPrintJobBroadcaster - virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePrintJobListener( const css::uno::Reference< css::view::XPrintJobListener >& xListener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XPrintable @@ -737,7 +737,7 @@ public: @onerror - */ - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPrinter() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -753,7 +753,7 @@ public: */ virtual void SAL_CALL setPrinter( const css::uno::Sequence< css::beans::PropertyValue >& seqPrinter ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @descr - @@ -768,14 +768,14 @@ public: */ virtual void SAL_CALL print( const css::uno::Sequence< css::beans::PropertyValue >& seqOptions ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStorable2 virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception); + throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XStorable @@ -794,7 +794,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL hasLocation() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -809,7 +809,7 @@ public: @onerror - */ - virtual OUString SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -824,7 +824,7 @@ public: @onerror - */ - virtual sal_Bool SAL_CALL isReadonly() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadonly() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -839,7 +839,7 @@ public: @onerror - */ - virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -856,7 +856,7 @@ public: virtual void SAL_CALL storeAsURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::io::IOException, css::uno::RuntimeException, std::exception) ; + throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; /**___________________________________________________________________________________________________ @short - @@ -873,7 +873,7 @@ public: virtual void SAL_CALL storeToURL( const OUString& sURL, const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::io::IOException, css::uno::RuntimeException, std::exception); + throw (css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -898,7 +898,7 @@ public: throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::RuntimeException, - css::uno::Exception, std::exception); + css::uno::Exception, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -917,17 +917,17 @@ public: throw (css::frame::DoubleInitializationException, css::io::IOException, css::uno::RuntimeException, - css::uno::Exception, std::exception); + css::uno::Exception, std::exception) SAL_OVERRIDE; // XDocumentSubStorageSupplier virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames() - throw ( css::io::IOException, css::uno::RuntimeException, std::exception ); + throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStorageBasedDocument @@ -939,33 +939,33 @@ public: com::sun::star::frame::DoubleInitializationException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, const css::uno::Sequence< css::beans::PropertyValue >& aMediaDescriptor ) throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL switchToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage ) throw ( css::lang::IllegalArgumentException, css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() throw ( css::io::IOException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeStorageChangeListener( const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XVisualObject @@ -975,33 +975,33 @@ public: throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::awt::Size SAL_CALL getVisualAreaSize( sal_Int64 nAspect ) throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( ::sal_Int64 nAspect ) throw ( css::lang::IllegalArgumentException, css::embed::WrongStateException, css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getMapUnit( sal_Int64 nAspect ) throw ( css::uno::Exception, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XScriptProviderSupplier - virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::script::provider::XScriptProvider > SAL_CALL getScriptProvider() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XUIConfigurationManagerSupplier - virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTransferable @@ -1023,7 +1023,7 @@ public: virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) throw (css::datatransfer::UnsupportedFlavorException, css::io::IOException, - css::uno::RuntimeException, std::exception); + css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -1040,7 +1040,7 @@ public: virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -1056,7 +1056,7 @@ public: */ virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -1076,22 +1076,22 @@ public: @onerror - */ - virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEmbeddedScripts - virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getBasicLibraries() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::script::XStorageBasedLibraryContainer > SAL_CALL getDialogLibraries() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getAllowMacroExecution() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XScriptInvocationContext - virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventBroadcaster @@ -1110,7 +1110,7 @@ public: @onerror - */ - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; /**___________________________________________________________________________________________________ @short - @@ -1125,115 +1125,115 @@ public: @onerror - */ - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDocumentEventBroadcaster - virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XModule virtual void SAL_CALL setIdentifier(const OUString& sIdentifier) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XModule virtual OUString SAL_CALL getIdentifier() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XTitle virtual OUString SAL_CALL getTitle() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XTitle virtual void SAL_CALL setTitle( const OUString& sTitle ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XTitleChangeBroadcaster virtual void SAL_CALL removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.frame.XUntitledNumbers virtual ::sal_Int32 SAL_CALL leaseNumber( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css.frame.XUntitledNumbers virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css.frame.XUntitledNumbers virtual void SAL_CALL releaseNumberForComponent( const css::uno::Reference< css::uno::XInterface >& xComponent ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css.frame.XUntitledNumbers virtual OUString SAL_CALL getUntitledPrefix() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.document.XDocumentRecovery virtual ::sal_Bool SAL_CALL wasModifiedSinceLastSave() - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, - css::lang::WrappedTargetException, std::exception ); + css::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const css::uno::Sequence< css::beans::PropertyValue >& i_MediaDescriptor ) throw ( css::uno::RuntimeException, css::io::IOException, - css::lang::WrappedTargetException, std::exception ); + css::lang::WrappedTargetException, std::exception ) SAL_OVERRIDE; // css.document.XUndoManagerSupplier - virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL getUndoManager( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::rdf::XNode: virtual OUString SAL_CALL getStringValue() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::rdf::XURI: virtual OUString SAL_CALL getNamespace() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getLocalName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::rdf::XRepositorySupplier: virtual css::uno::Reference< css::rdf::XRepository > SAL_CALL getRDFRepository() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css::rdf::XDocumentMetadataAccess: virtual css::uno::Reference< css::rdf::XMetadatable > SAL_CALL getElementByMetadataReference( const css::beans::StringPair & i_rReference) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::rdf::XMetadatable > SAL_CALL getElementByURI(const css::uno::Reference< css::rdf::XURI > & i_xURI) throw (css::uno::RuntimeException, - css::lang::IllegalArgumentException, std::exception); + css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Reference< css::rdf::XURI > > SAL_CALL getMetadataGraphsWithType( const css::uno::Reference< css::rdf::XURI > & i_xType) throw (css::uno::RuntimeException, - css::lang::IllegalArgumentException, std::exception); + css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::rdf::XURI> SAL_CALL addMetadataFile(const OUString & i_rFileName, @@ -1242,7 +1242,7 @@ public: > & i_rTypes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::container::ElementExistException, std::exception); + css::container::ElementExistException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::rdf::XURI> SAL_CALL importMetadataFile(::sal_Int16 i_Format, @@ -1259,23 +1259,23 @@ public: css::datatransfer::UnsupportedFlavorException, css::container::ElementExistException, css::rdf::ParseException, - css::io::IOException, std::exception); + css::io::IOException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeMetadataFile( const css::uno::Reference< css::rdf::XURI > & i_xGraphName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::container::NoSuchElementException, std::exception); + css::container::NoSuchElementException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addContentOrStylesFile( const OUString & i_rFileName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::container::ElementExistException, std::exception); + css::container::ElementExistException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeContentOrStylesFile( const OUString & i_rFileName) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::container::NoSuchElementException, std::exception); + css::container::NoSuchElementException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadMetadataFromStorage( const css::uno::Reference< @@ -1286,53 +1286,53 @@ public: css::task::XInteractionHandler> & i_xHandler) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, std::exception); + css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeMetadataToStorage( const css::uno::Reference< css::embed::XStorage > & i_xStorage) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, std::exception); + css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadMetadataFromMedium( const css::uno::Sequence< css::beans::PropertyValue > & i_rMedium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, std::exception); + css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeMetadataToMedium( const css::uno::Sequence< css::beans::PropertyValue > & i_rMedium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, std::exception); + css::lang::WrappedTargetException, std::exception) SAL_OVERRIDE; // XCmisDocument virtual css::uno::Sequence< css::document::CmisProperty > SAL_CALL getCmisProperties() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setCmisProperties( const css::uno::Sequence< css::document::CmisProperty >& _cmisproperties ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL updateCmisProperties( const css::uno::Sequence< css::document::CmisProperty >& _cmisproperties ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::document::CmisVersion > SAL_CALL getAllVersions ( ) - throw (css::uno::RuntimeException, std::exception ); + throw (css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL checkOut( ) throw ( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL cancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL checkOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL cancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL checkIn( sal_Bool bIsMajor, const OUString & rMessage ) - throw ( css::uno::RuntimeException, std::exception ); + throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL isVersionable( ) throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL canCheckOut( ) throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL isVersionable( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL canCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException ); @@ -1354,7 +1354,7 @@ public: */ void Notify( SfxBroadcaster& aBC , - const SfxHint& aHint ) ; + const SfxHint& aHint ) SAL_OVERRIDE ; // public IMPL? @@ -1396,8 +1396,8 @@ public: void MethodEntryCheck( const bool i_mustBeInitialized ) const; ::osl::Mutex& getMutex() const { return m_aMutex; } - css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception); - void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw (css::uno::RuntimeException, std::exception); + css::uno::Reference < css::container::XIndexAccess > SAL_CALL getViewData() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + void SAL_CALL setViewData( const css::uno::Reference < css::container::XIndexAccess >& aData ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** calls all XEventListeners */ void notifyEvent( const css::document::EventObject& aEvent ) const; diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index de0b484660af..5bfa02892fbb 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -36,8 +36,8 @@ class SFX2_DLLPUBLIC SfxHelp : public Help private: SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const Window* pWindow, const OUString& rKeyword ); - SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ); - SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow ); + SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ) SAL_OVERRIDE; + SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const Window* pWindow ) SAL_OVERRIDE; SAL_DLLPRIVATE OUString GetHelpModuleName_Impl(); SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName ); @@ -48,7 +48,7 @@ public: inline void SetTicket( const OUString& rTicket ) { aTicket = rTicket; } inline void SetUser( const OUString& rUser ) { aUser = rUser; } - virtual OUString GetHelpText( const OUString&, const Window* pWindow ); + virtual OUString GetHelpText( const OUString&, const Window* pWindow ) SAL_OVERRIDE; static OUString CreateHelpURL( const OUString& aCommandURL, const OUString& rModuleName ); static OUString GetDefaultHelpModule(); diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx index 44ad0b631edd..70301be57e04 100644 --- a/include/sfx2/sfxstatuslistener.hxx +++ b/include/sfx2/sfxstatuslistener.hxx @@ -59,15 +59,15 @@ class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2< virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); // XComponent - virtual void SAL_CALL dispose() 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); - 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); + virtual void SAL_CALL 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) 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) 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; // 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; private: SfxStatusListener( const SfxStatusListener& ); diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx index cfe8d8a30bda..1a028b2e7ec8 100644 --- a/include/sfx2/sfxuno.hxx +++ b/include/sfx2/sfxuno.hxx @@ -80,9 +80,9 @@ typedef sal_Int32 FrameSearchFlags; // static xxx::impl_createInstance() #define SFX_DECL_XSERVICEINFO_NOFACTORY \ /* XServiceInfo */ \ - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ); \ - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ); \ - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ); \ + virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ \ /* Helper for XServiceInfo */ \ static css::uno::Sequence< OUString > impl_getStaticSupportedServiceNames(); \ diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 526e6385dd12..295fc6e611ab 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -313,7 +313,7 @@ inline void SfxShell::SetPool static SfxInterface* GetStaticInterface(); \ static SfxInterfaceId GetInterfaceId() {return SfxInterfaceId(nId);} \ static void RegisterInterface(SfxModule* pMod=NULL); \ - virtual SfxInterface* GetInterface() const; + virtual SfxInterface* GetInterface() const SAL_OVERRIDE; #define SFX_IMPL_INTERFACE(Class,SuperClass,NameResId) \ \ diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx index 8a5fa68409bb..40ea6da108b2 100644 --- a/include/sfx2/sidebar/ControllerItem.hxx +++ b/include/sfx2/sidebar/ControllerItem.hxx @@ -125,7 +125,7 @@ public: protected: - virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState); + virtual void StateChanged (sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; private: ItemUpdateReceiverInterface& mrItemUpdateReceiver; diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx index 54fd0537e0cb..eded1b333079 100644 --- a/include/sfx2/sidebar/SidebarPanelBase.hxx +++ b/include/sfx2/sidebar/SidebarPanelBase.hxx @@ -69,35 +69,35 @@ public: // XContextChangeEventListener virtual void SAL_CALL notifyContextChangeEvent ( const css::ui::ContextChangeEventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XUIElement virtual cssu::Reference<css::frame::XFrame> SAL_CALL getFrame (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::rtl::OUString SAL_CALL getResourceURL (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int16 SAL_CALL getType (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference<cssu::XInterface> SAL_CALL getRealInterface (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XToolPanel virtual cssu::Reference<css::accessibility::XAccessible> SAL_CALL createAccessible ( const cssu::Reference<css::accessibility::XAccessible>& rxParentAccessible) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Reference<css::awt::XWindow> SAL_CALL getWindow (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XSidebarPanel virtual css::ui::LayoutSize SAL_CALL getHeightForWidth (sal_Int32 nWidth) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getMinimalWidth () - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; protected: cssu::Reference<css::frame::XFrame> mxFrame; @@ -110,7 +110,7 @@ protected: virtual ~SidebarPanelBase (void); virtual void SAL_CALL disposing (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException) SAL_OVERRIDE; private: Window* mpControl; diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index c0e86e07733f..aa712c6b4a01 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -48,11 +48,11 @@ public: const com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& rFrame, ToolBoxItemBits nBits = 0, const Size& rRequestedSize = Size(), - sal_uInt16 nPos = TOOLBOX_APPEND); + sal_uInt16 nPos = TOOLBOX_APPEND) SAL_OVERRIDE; - virtual void Paint (const Rectangle& rRect); + virtual void Paint (const Rectangle& rRect) SAL_OVERRIDE; - virtual bool Notify (NotifyEvent& rEvent); + virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; cssu::Reference<css::frame::XToolbarController> GetControllerForItemId ( const sal_uInt16 nItemId) const; diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx index 466e20da0d56..b0dc72d03554 100644 --- a/include/sfx2/sidebar/Theme.hxx +++ b/include/sfx2/sidebar/Theme.hxx @@ -157,55 +157,55 @@ public: Theme (void); virtual ~Theme (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; static cssu::Reference<css::beans::XPropertySet> GetPropertySet (void); // beans::XPropertySet virtual cssu::Reference<css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue ( const ::rtl::OUString& rsPropertyName, const cssu::Any& rValue) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual cssu::Any SAL_CALL getPropertyValue ( const ::rtl::OUString& rsPropertyName) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& rsPropertyName, const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& rsPropertyName, const cssu::Reference<css::beans::XPropertyChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& rsPropertyName, const cssu::Reference<css::beans::XVetoableChangeListener>& rxListener) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; // beans::XPropertySetInfo virtual cssu::Sequence<css::beans::Property> SAL_CALL getProperties (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::beans::Property SAL_CALL getPropertyByName (const ::rtl::OUString& rsName) throw(css::beans::UnknownPropertyException, - cssu::RuntimeException, std::exception); + cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasPropertyByName (const ::rtl::OUString& rsName) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; private: static Theme& GetCurrentTheme(); diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 06802341ad60..91c2a28024db 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -67,33 +67,33 @@ class SFX2_DLLPUBLIC SfxStatusBarControl: public svt::StatusbarController protected: // new controller API // 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; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // 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; // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusbarController - virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL mouseButtonDown( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL mouseMove( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL mouseButtonUp( const ::com::sun::star::awt::MouseEvent& aMouseEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL command( const ::com::sun::star::awt::Point& aPos, ::sal_Int32 nCommand, ::sal_Bool bMouseEvent, - const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception); + const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL paint( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics >& xGraphics, const ::com::sun::star::awt::Rectangle& rOutputRectangle, - ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); + ::sal_Int32 nStyle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL click( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL doubleClick( const ::com::sun::star::awt::Point& aPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Old sfx2 interface virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, diff --git a/include/sfx2/styledlg.hxx b/include/sfx2/styledlg.hxx index b53e8cdb6557..366703ea9bc9 100644 --- a/include/sfx2/styledlg.hxx +++ b/include/sfx2/styledlg.hxx @@ -33,7 +33,7 @@ private: DECL_DLLPRIVATE_LINK( CancelHdl, Button * ); sal_uInt16 m_nOrganizerId; protected: - virtual const SfxItemSet* GetRefreshedSet(); + virtual const SfxItemSet* GetRefreshedSet() SAL_OVERRIDE; public: SfxStyleDialog(Window* pParent, const OString& rID, @@ -44,7 +44,7 @@ public: SfxStyleSheetBase& GetStyleSheet() { return *pStyle; } const SfxStyleSheetBase& GetStyleSheet() const { return *pStyle; } - virtual short Ok(); + virtual short Ok() SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 1b439ee30533..1e91f7dab83e 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -53,8 +53,8 @@ public: TYPEINFO_OVERRIDE(); SfxTabDialogItem( sal_uInt16 nId, const SfxItemSet& rItemSet ); SfxTabDialogItem(const SfxTabDialogItem& rAttr, SfxItemPool* pItemPool=NULL); - virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const; - virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const; + virtual SfxPoolItem* Clone(SfxItemPool* pToPool) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rStream, sal_uInt16 nVersion) const SAL_OVERRIDE; }; class SFX2_DLLPUBLIC SfxTabDialog : public TabDialog @@ -212,8 +212,8 @@ public: PushButton* GetUserButton() { return m_pUserBtn; } void RemoveResetButton(); - short Execute(); - void StartExecuteModal( const Link& rEndDialogHdl ); + short Execute() SAL_OVERRIDE; + void StartExecuteModal( const Link& rEndDialogHdl ) SAL_OVERRIDE; void Start( bool bShow = true ); const SfxItemSet* GetExampleSet() const { return pExampleSet; } diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx index 246e8cec145d..9f4e42c7ca9d 100644 --- a/include/sfx2/taskpane.hxx +++ b/include/sfx2/taskpane.hxx @@ -69,7 +69,7 @@ namespace sfx2 SFX_DECL_CHILDWINDOW( TaskPaneWrapper ); // ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE; }; @@ -145,8 +145,8 @@ namespace sfx2 protected: // Window overridables - virtual void Resize(); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; private: ::boost::scoped_ptr< ModuleTaskPane_Impl > m_pImpl; @@ -189,14 +189,14 @@ namespace sfx2 Window* i_pParent, WinBits i_nBits ); // ITaskPaneToolPanelAccess - virtual void ActivateToolPanel( const OUString& i_rPanelURL ); + virtual void ActivateToolPanel( const OUString& i_rPanelURL ) SAL_OVERRIDE; protected: // Window overridables - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; // TitledDockingWindow overridables - virtual void onLayoutDone(); + virtual void onLayoutDone() SAL_OVERRIDE; private: ModuleTaskPane m_aTaskPane; diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 49e5ca3ec9cc..5c40c48747a3 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -87,7 +87,7 @@ class SfxFrameStatusListener : public svt::FrameStatusListener // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: SfxStatusListenerInterface* m_pCallee; @@ -118,8 +118,8 @@ private: void Delete(); protected: - virtual void PopupModeEnd(); - virtual bool Close(); + virtual void PopupModeEnd() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; virtual void DeleteFloatingWindow(); sal_uInt16 GetId() const { return m_nId; } @@ -132,7 +132,7 @@ protected: // SfxStatusListenerInterface using FloatingWindow::StateChanged; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; public: SfxPopupWindow( sal_uInt16 nId, @@ -152,7 +152,7 @@ public: ~SfxPopupWindow(); virtual SfxPopupWindow* Clone() const; - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; void StartCascading(); SAL_DLLPRIVATE void SetDeleteLink_Impl( const Link& rLink ) @@ -209,48 +209,48 @@ protected: void SetPopupWindow( SfxPopupWindow* pWindow ); // 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; // XEventListener using ::cppu::OPropertySetHelper::disposing; - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // 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; // new controller API // XStatusListener virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XToolbarController virtual void SAL_CALL execute( sal_Int16 KeyModifier ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL click() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL doubleClick() - 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::awt::XWindow > SAL_CALL createPopupWindow() - 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::awt::XWindow > SAL_CALL createItemWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >& rParent ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; // XDockableWindowListener - virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL prepareToggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL toggleFloatingMode( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // helper methods void createAndPositionSubToolBar( const OUString& rSubToolBarResName ); @@ -300,9 +300,9 @@ class SfxDragButton_Impl : public FixedImage public: SfxDragButton_Impl( Window *pParent ); - virtual void Command ( const CommandEvent& rCEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Command ( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; }; class SfxDragToolBoxControl_Impl : public SfxToolBoxControl @@ -310,9 +310,9 @@ class SfxDragToolBoxControl_Impl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SfxDragToolBoxControl_Impl( sal_uInt16 nId, ToolBox& rBox ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; using SfxToolBoxControl::Select; - virtual void Select( bool bMod1 = false ); + virtual void Select( bool bMod1 = false ) SAL_OVERRIDE; }; @@ -335,14 +335,14 @@ public: virtual ~SfxRecentFilesToolBoxControl(); protected: - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; class SfxReloadToolBoxControl_Impl : public SfxToolBoxControl { protected: using SfxToolBoxControl::Select; - virtual void Select( sal_uInt16 nSelectModifier ); + virtual void Select( sal_uInt16 nSelectModifier ) SAL_OVERRIDE; public: SFX_DECL_TOOLBOX_CONTROL(); @@ -364,10 +364,10 @@ class SfxAddonsToolBoxControl_Impl : public SfxToolBoxControl bool m_bShowMenuImages; protected: - virtual void Click(); + virtual void Click() SAL_OVERRIDE; using SfxToolBoxControl::Select; - virtual void Select( bool ); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void Select( bool ) SAL_OVERRIDE; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; DECL_LINK( Activate, Menu * ); public: SFX_DECL_TOOLBOX_CONTROL(); diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx index 3be1cabe9783..646dd5e85183 100644 --- a/include/sfx2/templateabstractview.hxx +++ b/include/sfx2/templateabstractview.hxx @@ -128,9 +128,9 @@ protected: DECL_LINK(ShowRootRegionHdl, void*); - virtual void OnItemDblClicked(ThumbnailViewItem *pItem); + virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; protected: diff --git a/include/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx index e1236f5eb6ce..98623738cb8b 100644 --- a/include/sfx2/templatecontaineritem.hxx +++ b/include/sfx2/templatecontaineritem.hxx @@ -28,11 +28,11 @@ public: virtual ~TemplateContainerItem (); virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, - const ThumbnailItemAttributes *pAttrs); + const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, const long nPadding, sal_uInt32 nMaxTextLength, - const ThumbnailItemAttributes *pAttrs); + const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; bool HasMissingPreview( ); diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx index 8329e23d03eb..a6f4e336b62d 100644 --- a/include/sfx2/templatelocalview.hxx +++ b/include/sfx2/templatelocalview.hxx @@ -34,13 +34,13 @@ public: virtual ~TemplateLocalView (); // Fill view with template folders thumbnails - virtual void Populate (); + virtual void Populate () SAL_OVERRIDE; - virtual void reload (); + virtual void reload () SAL_OVERRIDE; - virtual void showRootRegion (); + virtual void showRootRegion () SAL_OVERRIDE; - virtual void showRegion (ThumbnailViewItem *pItem); + virtual void showRegion (ThumbnailViewItem *pItem) SAL_OVERRIDE; void showRegion (const OUString &rName); @@ -57,11 +57,11 @@ public: std::vector<TemplateItemProperties> getFilteredItems (const boost::function<bool (const TemplateItemProperties&) > &rFunc) const; - virtual sal_uInt16 createRegion (const OUString &rName); + virtual sal_uInt16 createRegion (const OUString &rName) SAL_OVERRIDE; - virtual bool isNestedRegionAllowed () const; + virtual bool isNestedRegionAllowed () const SAL_OVERRIDE; - virtual bool isImportAllowed () const; + virtual bool isImportAllowed () const SAL_OVERRIDE; bool removeRegion (const sal_uInt16 nItemId); @@ -91,7 +91,7 @@ public: bool isTemplateNameUnique (const sal_uInt16 nRegionItemId, const OUString &rName) const; - virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle); + virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle) SAL_OVERRIDE; private: diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx index 7cf6fbb8acf4..0b6e9d897e77 100644 --- a/include/sfx2/templateremoteview.hxx +++ b/include/sfx2/templateremoteview.hxx @@ -25,17 +25,17 @@ public: virtual ~TemplateRemoteView (); - virtual void showRootRegion (); + virtual void showRootRegion () SAL_OVERRIDE; - virtual void showRegion (ThumbnailViewItem *pItem); + virtual void showRegion (ThumbnailViewItem *pItem) SAL_OVERRIDE; bool loadRepository (TemplateRepository* pRepository, bool bRefresh); - virtual sal_uInt16 createRegion (const OUString &rName); + virtual sal_uInt16 createRegion (const OUString &rName) SAL_OVERRIDE; - virtual bool isNestedRegionAllowed () const; + virtual bool isNestedRegionAllowed () const SAL_OVERRIDE; - virtual bool isImportAllowed () const; + virtual bool isImportAllowed () const SAL_OVERRIDE; private: diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx index 0d290e36ac7b..744eedcf8273 100644 --- a/include/sfx2/templateviewitem.hxx +++ b/include/sfx2/templateviewitem.hxx @@ -38,10 +38,10 @@ public: virtual void calculateItemsPosition (const long nThumbnailHeight, const long nDisplayHeight, const long nPadding, sal_uInt32 nMaxTextLength, - const ThumbnailItemAttributes *pAttrs); + const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor, - const ThumbnailItemAttributes *pAttrs); + const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE; sal_uInt16 mnRegionId; sal_uInt16 mnDocId; diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 96a03dfdc2f0..3633d86911bf 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -52,10 +52,10 @@ friend class SfxTemplateDialog_Impl; SfxTemplateDialog_Impl* pImpl; - virtual void DataChanged( const DataChangedEvent& _rDCEvt ); - virtual void Resize(); - virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; public: SfxTemplateDialog( SfxBindings*, SfxChildWindow*, Window* ); @@ -88,10 +88,10 @@ public: virtual ~SfxTemplatePanelControl(); virtual void Update(); - virtual void DataChanged( const DataChangedEvent& _rDCEvt ); - virtual void Resize(); + virtual void DataChanged( const DataChangedEvent& _rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; virtual SfxChildAlignment CheckAlignment( SfxChildAlignment, SfxChildAlignment ); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; virtual void FreeResource (void); private: diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 7734bc9fc726..afe29c739e63 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -184,7 +184,7 @@ public: virtual ~ThumbnailView (); - virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; void AppendItem (ThumbnailViewItem *pItem); @@ -239,7 +239,7 @@ public: void setItemStateHdl (const Link &aLink) { maItemStateHdl = aLink; } - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; virtual bool renameItem(ThumbnailViewItem* pItem, const OUString& sNewTitle); @@ -247,25 +247,25 @@ public: protected: - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void Command( const CommandEvent& rCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; - virtual void LoseFocus(); + virtual void LoseFocus() SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) 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; protected: diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index cbac0878fc8b..c27948a1c2c9 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -94,14 +94,14 @@ namespace sfx2 protected: // Window overridables - virtual void Paint( const Rectangle& i_rArea ); - virtual void Resize(); - virtual void StateChanged( StateChangedType i_nType ); - virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ); - virtual void SetText( const OUString& i_rText ); + virtual void Paint( const Rectangle& i_rArea ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType i_nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& i_rDataChangedEvent ) SAL_OVERRIDE; + virtual void SetText( const OUString& i_rText ) SAL_OVERRIDE; // DockingWindow overridables - void EndDocking( const Rectangle& rRect, bool bFloatMode ); + void EndDocking( const Rectangle& rRect, bool bFloatMode ) SAL_OVERRIDE; // own overridables virtual void onLayoutDone(); diff --git a/include/sfx2/tplpitem.hxx b/include/sfx2/tplpitem.hxx index 262f34824630..01ae81f19119 100644 --- a/include/sfx2/tplpitem.hxx +++ b/include/sfx2/tplpitem.hxx @@ -39,11 +39,11 @@ public: const OUString& GetStyleName() const { return aStyle; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual sal_uInt8 GetFlagCount() const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual sal_uInt8 GetFlagCount() const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx index 001a54460b5f..26b47b615621 100644 --- a/include/sfx2/unoctitm.hxx +++ b/include/sfx2/unoctitm.hxx @@ -60,10 +60,10 @@ public: { return aCommand; } // 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; // Something else - 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; void UnBind(); void GetNewDispatch(); void ReleaseDispatch(); @@ -90,10 +90,10 @@ public: // XDispatch virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, - const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - 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 ); - 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 ); + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) 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 > & xControl, const ::com::sun::star::util::URL& aURL) 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 ) SAL_OVERRIDE; // Something else void ReleaseAll(); @@ -120,16 +120,16 @@ public: virtual void SAL_CALL dispatchWithNotification( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchResultListener >& rListener ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) - 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 > & 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; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; static const ::com::sun::star::uno::Sequence< sal_Int8 >& impl_getStaticIdentifier(); static bool IsMasterUnoCommand( const ::com::sun::star::util::URL& aURL ); @@ -170,7 +170,7 @@ public: static OUString getSlaveCommand( const ::com::sun::star::util::URL& rURL ); void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState, SfxSlotServer* pServ ); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; void setMasterSlaveCommand( bool bSet ); void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs, diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index 43cac0dcf437..9c678f401ac8 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -79,7 +79,7 @@ private: #endif protected: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; #ifndef _SFX_HXX SAL_DLLPRIVATE void KillDispatcher_Impl(); @@ -135,8 +135,8 @@ public: void ToTop(); void Enable( bool bEnable ); virtual bool Close(); - virtual void Activate( bool bUI ); - virtual void Deactivate( bool bUI ); + virtual void Activate( bool bUI ) SAL_OVERRIDE; + virtual void Deactivate( bool bUI ) SAL_OVERRIDE; // DDE-Interface virtual long DdeExecute( const OUString& rCmd ); @@ -157,7 +157,7 @@ public: SAL_DLLPRIVATE virtual const SvBorder& GetBorderPixelImpl( const SfxViewShell *pSh ) const; SAL_DLLPRIVATE virtual void InvalidateBorderImpl( const SfxViewShell *pSh ); - virtual SfxObjectShell* GetObjectShell(); + virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; sal_uInt16 GetCurViewId() const; SfxFrame& GetFrame() const; SfxViewFrame* GetTopViewFrame() const; @@ -303,9 +303,9 @@ public: pFrame( pViewFrame) {} - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; SfxViewFrame* GetFrame() const { return pFrame; } @@ -323,10 +323,10 @@ public: SfxVerbListItem( sal_uInt16 nWhichId, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& GetVerbList() const { return aVerbs; } }; diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 6fd665ab2907..e95377b46e5a 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -141,8 +141,8 @@ friend class SfxPrinterController; bool bNoNewWindow; protected: - virtual void Activate(bool IsMDIActivate); - virtual void Deactivate(bool IsMDIActivate); + virtual void Activate(bool IsMDIActivate) SAL_OVERRIDE; + virtual void Deactivate(bool IsMDIActivate) SAL_OVERRIDE; virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); @@ -150,7 +150,7 @@ protected: virtual void Move(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; public: // Iteration @@ -225,7 +225,7 @@ public: virtual void ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, bool bBrowse = false ); virtual void QueryObjAreaPixel( Rectangle& rRect ) const; - virtual SfxObjectShell* GetObjectShell(); + virtual SfxObjectShell* GetObjectShell() SAL_OVERRIDE; /** retrieves the document which shall be considered the "current document" when the frame is active The default implementation simply returns the XModel of the associated SfxObjectShell. You will rarely diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx index da0d1343e516..e36780fd32b4 100644 --- a/include/sfx2/zoomitem.hxx +++ b/include/sfx2/zoomitem.hxx @@ -58,12 +58,12 @@ public: void SetType( SvxZoomType eNewType ) { eType = eNewType; } - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index 3bebf2ed3b44..5477914d5de2 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -63,19 +63,19 @@ public: AccessibleControlShape* SAL_CALL GetLabeledByControlShape(); protected: //--- XAccessible ---------------------------------------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //--- XAccessibleComponent ------------------------------- /// forward the focus to the contained control(in alive mode) - virtual void SAL_CALL grabFocus( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL grabFocus( ) 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); - 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); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) 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) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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 OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //--- XInterface ----------------------------------------- DECLARE_XINTERFACE( ) @@ -84,54 +84,54 @@ protected: DECLARE_XTYPEPROVIDER( ) //--- XPropertyChangeListener ---------------------------- - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //--- XComponent ----------------------------------------- - 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); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //--- XModeChangeListener -------------------------------- - virtual void SAL_CALL modeChanged( const ::com::sun::star::util::ModeChangeEvent& _rSource ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modeChanged( const ::com::sun::star::util::ModeChangeEvent& _rSource ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //--- XAccessibleEventListener ---------------------------- - virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //--- document::XEventListener ---------------------------- using AccessibleShape::notifyEvent; // XVclContainerListener - virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementInserted( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /** Initialize a new shape. See the documentation of the base' constructor for the reason of this method's existence. */ - virtual void Init( ); + virtual void Init( ) SAL_OVERRIDE; /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /** Create a unique name string that contains the accessible name. The name consists of the base name and the index. */ virtual OUString CreateAccessibleName( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription( ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; #ifdef DBG_UTIL /// Set the specified state - virtual bool SetState( sal_Int16 _nState ); + virtual bool SetState( sal_Int16 _nState ) SAL_OVERRIDE; #endif // DBG_UTIL /// (safely) reads the given property from the model of the UNO control diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx index 930ad90501e3..56f48b6404c4 100644 --- a/include/svx/AccessibleGraphicShape.hxx +++ b/include/svx/AccessibleGraphicShape.hxx @@ -46,27 +46,27 @@ public: //===== XAccessibleImage ================================================ OUString SAL_CALL getAccessibleImageDescription (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getAccessibleImageHeight (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 SAL_CALL getAccessibleImageWidth (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire (void) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release (void) - throw (); + throw () SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -74,29 +74,29 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - 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 (void) - 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 (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: /** Don't use the default constructor. Use the public constructor that diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx index c1010c5b3c70..945144af6620 100644 --- a/include/svx/AccessibleOLEShape.hxx +++ b/include/svx/AccessibleOLEShape.hxx @@ -46,63 +46,63 @@ public: //===== XAccessibleAction =============================================== sal_Int32 SAL_CALL getAccessibleActionCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Bool SAL_CALL doAccessibleAction (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; OUString SAL_CALL getAccessibleActionDescription (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; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleKeyBinding> SAL_CALL getAccessibleActionKeyBinding ( 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; //===== 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire (void) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release (void) - throw (); + throw () SAL_OVERRIDE; //===== XServiceInfo ==================================================== virtual OUString SAL_CALL getImplementationName (void) - 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 (void) - 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 (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ====== XAccessibleExtendedAttributes ===================================== - virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; protected: /// Create a name string that contains the accessible name. virtual OUString CreateAccessibleBaseName () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription () - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: /** Don't use the default constructor. Use the public constructor that diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 5cf86c0a7154..cc1aa035ac8a 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -106,51 +106,51 @@ public: const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo); //Solution: Overwrite the object's current name. - virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleSelection ============================================ virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) 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 clearAccessibleSelection( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL selectAllAccessibleChildren( ) - throw ( ::com::sun::star::uno::RuntimeException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) - 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 getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) 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 deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, - ::com::sun::star::uno::RuntimeException, std::exception ); + ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ====== XAccessibleExtendedAttributes ===================================== virtual ::com::sun::star::uno::Any SAL_CALL getExtendedAttributes() - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; /// Return this object's role. - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleGroupPosition ========================================= virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getGroupPosition( const ::com::sun::star::uno::Any& rAny ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getObjectLink( const ::com::sun::star::uno::Any& accoject ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** The destructor releases its children manager and text engine if still existent. These are responsible to send appropriate events. */ @@ -181,7 +181,7 @@ public: The returned flag indicates whether the specified state has been changed (<TRUE/>), i.e. it has formerly not been set. */ - virtual bool SetState (sal_Int16 aState); + virtual bool SetState (sal_Int16 aState) SAL_OVERRIDE; /** Reset the specified state. If the state is <const>FOCUSED</const> then, additionally to the inherited functionality, the focus @@ -195,7 +195,7 @@ public: The returned flag indicates whether the specified state has been changed (<TRUE/>), i.e. it has formerly been set. */ - virtual bool ResetState (sal_Int16 aState); + virtual bool ResetState (sal_Int16 aState) SAL_OVERRIDE; /** Return the state of the specified state. Take the <const>FOCUSED</const> state from the accessible edit engine. @@ -216,7 +216,7 @@ public: /// Return the number of currently visible children. virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** Return the specified child. @param nIndex @@ -230,44 +230,44 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return the set of current states. virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet> SAL_CALL getAccessibleStateSet (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// Return this objects index among the parents children. virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleComponent ============================================ 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; virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds (void) - 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 (void) - 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 (void) - 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 (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getForeground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getBackground (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleEventBroadcaster ===================================== @@ -281,7 +281,7 @@ public: addAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /** This call is forwarded to a) the base class and b) to the accessible edit engine if it is present. @@ -294,22 +294,22 @@ public: removeAccessibleEventListener ( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& rxListener) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL acquire (void) - throw (); + throw () SAL_OVERRIDE; virtual void SAL_CALL release (void) - throw (); + throw () SAL_OVERRIDE; //===== XServiceInfo ==================================================== @@ -318,21 +318,21 @@ public: */ virtual OUString SAL_CALL getImplementationName (void) - 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 (void) - 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 (void) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== IAccessibleViewForwarderListener ================================ virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder); + const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; //===== lang::XEventListener ============================================ @@ -341,46 +341,46 @@ public: */ 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; //===== document::XEventListener ======================================== virtual void SAL_CALL notifyEvent (const ::com::sun::star::document::EventObject& rEventObject) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XUnoTunnel ======================================================== static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId() throw(); static AccessibleShape* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleHypertext ======================================================== - virtual sal_Int32 SAL_CALL getHyperLinkCount() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getHyperLinkCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleHyperlink > SAL_CALL getHyperLink( sal_Int32 nLinkIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Int32 SAL_CALL getHyperLinkIndex( sal_Int32 nCharIndex ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccesibleText ================================================== - virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);//Shen Zhen Jie changed sal_Unicode to sal_uInt32; change back to sal_Unicode - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;//Shen Zhen Jie changed sal_Unicode to sal_uInt32; change back to sal_Unicode + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getSelectedText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getText( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== Misc ======================================================== @@ -429,7 +429,7 @@ protected: /** This method is called from the component helper base class while disposing. */ - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Create a base name string that contains the accessible name. */ @@ -442,12 +442,12 @@ protected: */ virtual OUString CreateAccessibleName (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; /// Create a description string that contains the accessible description. virtual OUString CreateAccessibleDescription (void) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual OUString GetFullAccessibleName(AccessibleShape *shape) throw (::com::sun::star::uno::RuntimeException); diff --git a/include/svx/AccessibleSvxFindReplaceDialog.hxx b/include/svx/AccessibleSvxFindReplaceDialog.hxx index ee739ce9f4ba..0c213f7e45c7 100644 --- a/include/svx/AccessibleSvxFindReplaceDialog.hxx +++ b/include/svx/AccessibleSvxFindReplaceDialog.hxx @@ -28,10 +28,10 @@ class VCLXAccessibleSvxFindReplaceDialog : public VCLXAccessibleComponent public: VCLXAccessibleSvxFindReplaceDialog(VCLXWindow* pVCLXindow); virtual ~VCLXAccessibleSvxFindReplaceDialog(); - virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ); + virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) SAL_OVERRIDE; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -47,7 +47,7 @@ public: {}; private: virtual ::com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() + ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext() SAL_OVERRIDE { return new VCLXAccessibleSvxFindReplaceDialog(this); } diff --git a/include/svx/AccessibleTableShape.hxx b/include/svx/AccessibleTableShape.hxx index e7a9d831ce3d..90bdaa8dd95d 100644 --- a/include/svx/AccessibleTableShape.hxx +++ b/include/svx/AccessibleTableShape.hxx @@ -57,82 +57,82 @@ public: AccessibleTableShape( const AccessibleShapeInfo& rShapeInfo, const AccessibleShapeTreeInfo& rShapeTreeInfo ); virtual ~AccessibleTableShape( ); - virtual void Init (void); + virtual void Init (void) SAL_OVERRIDE; // 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; // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) 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); - 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); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) 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) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleTable - virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL clearAccessibleSelection( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL clearAccessibleSelection( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL selectAllAccessibleChildren( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL disposing( ); + virtual void SAL_CALL disposing( ) SAL_OVERRIDE; // 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; virtual void SAL_CALL selectionChanged (const ::com::sun::star::lang::EventObject& rEvent) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sal_Int32 mnPreviousSelectionCount; using AccessibleShape::disposing; friend class AccessibleTableHeaderShape; void getColumnAndRow( sal_Int32 nChildIndex, sal_Int32& rnColumn, sal_Int32& rnRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException ); // overwrite the SetState & ResetState to do special operation for table cell's internal text - virtual bool SetState (sal_Int16 aState); - virtual bool ResetState (sal_Int16 aState); + virtual bool SetState (sal_Int16 aState) SAL_OVERRIDE; + virtual bool ResetState (sal_Int16 aState) SAL_OVERRIDE; // The following two methods are used to set state directly on table object, instread of the internal cell or paragraph. bool SetStateDirectly (sal_Int16 aState); bool ResetStateDirectly (sal_Int16 aState); @@ -140,7 +140,7 @@ public: AccessibleCell* GetActiveAccessibleCell(); protected: - virtual OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException); + virtual OUString CreateAccessibleBaseName(void) throw (::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; sdr::table::SvxTableController* getTableController(); @@ -169,61 +169,61 @@ public: virtual ~AccessibleTableHeaderShape(); // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext( ) 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); - 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); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) 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) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) 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) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) 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) 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 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 void SAL_CALL grabFocus( ) 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 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; + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleTable - virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleRowCount() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleColumnCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleRowHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleTable > SAL_CALL getAccessibleColumnHeaders( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleRows( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL getSelectedAccessibleColumns( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleCaption( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleSummary( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; //===== XAccessibleTableSelection ============================================ virtual sal_Bool SAL_CALL selectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL selectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL unselectRow( sal_Int32 row ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL unselectColumn( sal_Int32 column ) - throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) ; + throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ; private: SVX_DLLPRIVATE explicit AccessibleTableHeaderShape( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible>& rxParent ); diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx index a6ce3dd2cc48..18f75525e98d 100644 --- a/include/svx/AffineMatrixItem.hxx +++ b/include/svx/AffineMatrixItem.hxx @@ -39,13 +39,13 @@ public: AffineMatrixItem(const AffineMatrixItem&); virtual ~AffineMatrixItem(); - virtual bool operator==(const SfxPoolItem&) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_AFFINEMATRIXITEM_HXX diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index 19ade70d3481..74a9caa3c9b0 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -191,7 +191,7 @@ public: void RemoveFocus (void); virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder); + const IAccessibleViewForwarder* pViewForwarder) SAL_OVERRIDE; protected: ChildrenManagerImpl* mpImpl; diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx index 40aae99f363d..07c515c79bae 100644 --- a/include/svx/ParseContext.hxx +++ b/include/svx/ParseContext.hxx @@ -41,18 +41,18 @@ namespace svxform virtual ~OSystemParseContext(); // retrieves language specific error messages - virtual OUString getErrorMessage(ErrorCode _eCodes) const; + virtual OUString getErrorMessage(ErrorCode _eCodes) const SAL_OVERRIDE; // retrieves language specific keyword strings (only ASCII allowed) - virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const; + virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const SAL_OVERRIDE; // finds out, if we have an international keyword (only ASCII allowed) - virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const; + virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const SAL_OVERRIDE; /** get's a locale instance which should be used when parsing in the context specified by this instance <p>if this is not overridden by derived classes, it returns the static default locale.</p> */ - virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const; + virtual ::com::sun::star::lang::Locale getPreferredLocale( ) const SAL_OVERRIDE; }; diff --git a/include/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx index be4960c74923..9833516c1726 100644 --- a/include/svx/SmartTagCtl.hxx +++ b/include/svx/SmartTagCtl.hxx @@ -63,13 +63,13 @@ private: void FillMenu(); DECL_LINK( MenuSelect, PopupMenu * ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; public: SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& ); ~SvxSmartTagsControl(); - virtual PopupMenu* GetPopup() const; + virtual PopupMenu* GetPopup() const SAL_OVERRIDE; SFX_DECL_MENU_CONTROL(); }; diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx index e5f8ea066003..598acf8cad79 100644 --- a/include/svx/SmartTagItem.hxx +++ b/include/svx/SmartTagItem.hxx @@ -64,12 +64,12 @@ public: const OUString& rRangeText ); // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; // leer - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; // leer - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; // leer + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; } const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; } diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx index 455f7a8f6644..6586d59e23d8 100644 --- a/include/svx/SmartTagMgr.hxx +++ b/include/svx/SmartTagMgr.hxx @@ -218,13 +218,13 @@ public: const OUString GetApplicationName() const { return maApplicationName; } // ::com::sun::star::lang::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; // ::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); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XChangesListener - virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index a51955066883..5f06b22d1929 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -36,7 +36,7 @@ public: SvxColorValueSet(Window* pParent, WinBits nWinStyle = WB_ITEMBORDER); SvxColorValueSet(Window* pParent, const ResId& rResId); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; sal_uInt32 getMaxRowCount() const; sal_uInt32 getEntryEdgeLength() const; diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index b2aab411008c..fd532b6e32a7 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -45,15 +45,15 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; inline SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation) { @@ -88,15 +88,15 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; - virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; sal_Int16 GetLeftMargin() const {return nLeftMargin; } void SetLeftMargin(sal_Int16 nLeft); diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 4e6c4163bcba..29003e2bc74c 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -43,7 +43,7 @@ private: protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; public: SvxBmpMaskSelectItem( sal_uInt16 nId, SvxBmpMask& rMask, @@ -120,7 +120,7 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow Image maImgPipette; - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; #ifdef BMPMASK_PRIVATE @@ -164,7 +164,7 @@ public: void onSelect( MaskSet* pSet ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void ApplyStyle(); private: diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index c55684e979b0..813c7e4bebdf 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -77,22 +77,22 @@ public: void ReleaseAccessible(); sal_Int32 getMaxCharCount() const; - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; protected: - virtual void Paint( const Rectangle& ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + + + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index e1e98b30a8dd..08986983d9f4 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -40,7 +40,7 @@ private: virtual SvTreeListEntry* InsertEntry( const OUString& rText, SvTreeListEntry* pParent, bool bChildrenOnDemand, sal_uIntPtr nPos, void* pUserData, - SvLBoxButtonKind eButtonKind ); + SvLBoxButtonKind eButtonKind ) SAL_OVERRIDE; public: SvxCheckListBox( Window* pParent, WinBits nWinStyle = 0 ); @@ -68,8 +68,8 @@ public: void* SetEntryData ( sal_uLong nPos, void* pNewData ); void* GetEntryData ( sal_uLong nPos ) const; - virtual void MouseButtonDown ( const MouseEvent& rMEvt ); - virtual void KeyInput ( const KeyEvent& rKEvt ); + virtual void MouseButtonDown ( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput ( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 2f15a0436756..63c57d6cffb3 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -172,10 +172,10 @@ public: sal_uInt16 nId ); SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - sal_uInt16 GetValueCount() const { return CHSTYLE_COUNT; } + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHSTYLE_COUNT; } SvxChartStyle GetValue() const { return (SvxChartStyle)SfxEnumItem::GetValue(); } }; @@ -190,13 +190,13 @@ public: sal_uInt16 nId ); SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - sal_uInt16 GetValueCount() const { return CHREGRESS_COUNT; } + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHREGRESS_COUNT; } SvxChartRegress GetValue() const { return (SvxChartRegress)SfxEnumItem::GetValue(); } - sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; + sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; @@ -208,10 +208,10 @@ public: SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - sal_uInt16 GetValueCount() const { return CHDESCR_COUNT; } + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHDESCR_COUNT; } SvxChartDataDescr GetValue() const { return (SvxChartDataDescr)SfxEnumItem::GetValue(); } }; @@ -227,13 +227,13 @@ public: SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; } + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHTXTORDER_COUNT; } SvxChartTextOrder GetValue() const { return (SvxChartTextOrder)SfxEnumItem::GetValue(); } }; @@ -247,10 +247,10 @@ public: SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; } + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHTXTORDER_COUNT; } SvxChartTextOrient GetValue() const { return (SvxChartTextOrient)SfxEnumItem::GetValue(); } }; @@ -266,14 +266,14 @@ public: SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - sal_uInt16 GetValueCount() const { return CHERROR_COUNT; } + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHERROR_COUNT; } SvxChartKindError GetValue() const { return (SvxChartKindError)SfxEnumItem::GetValue(); } - sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; + sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; @@ -287,14 +287,14 @@ public: SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - sal_uInt16 GetValueCount() const { return CHINDICATE_COUNT; } + sal_uInt16 GetValueCount() const SAL_OVERRIDE { return CHINDICATE_COUNT; } SvxChartIndicate GetValue() const { return (SvxChartIndicate)SfxEnumItem::GetValue(); } - sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; + sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; @@ -308,19 +308,19 @@ public: SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId ); SvxDoubleItem(const SvxDoubleItem& rItem); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0) const; + OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; - virtual bool operator == (const SfxPoolItem&) const; - virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const; - virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual bool operator == (const SfxPoolItem&) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual double GetMin() const; virtual double GetMax() const; diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx index eccf2b90213e..813fafb3285e 100644 --- a/include/svx/clipboardctl.hxx +++ b/include/svx/clipboardctl.hxx @@ -45,11 +45,11 @@ public: SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxClipBoardControl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx index 5e0cd6a9689d..63daf82b7bb3 100644 --- a/include/svx/clipfmtitem.hxx +++ b/include/svx/clipfmtitem.hxx @@ -30,8 +30,8 @@ class SVX_DLLPUBLIC SvxClipboardFmtItem : public SfxPoolItem SvxClipboardFmtItem_Impl* pImpl; protected: - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -39,8 +39,8 @@ public: SvxClipboardFmtItem( const SvxClipboardFmtItem& ); virtual ~SvxClipboardFmtItem(); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX ); void AddClipbrdFormat( sal_uIntPtr nId, const OUString& rName, diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index 631a1c9fd24a..a2b01ef38c83 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -48,12 +48,12 @@ protected: void DoDrag(); // ValueSet - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Command(const CommandEvent& rCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rCEvt ) SAL_OVERRIDE; // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPtPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPtPixel ) SAL_OVERRIDE; DECL_STATIC_LINK(SvxColorValueSet_docking, ExecDragHdl, void*); @@ -92,12 +92,12 @@ private: the focus to the color value set so that it can be controlled with the keyboard. */ - virtual void GetFocus (void); + virtual void GetFocus (void) SAL_OVERRIDE; protected: - virtual bool Close(); - virtual void Resize(); - virtual void Resizing( Size& rSize ); + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; public: SvxColorDockingWindow( SfxBindings* pBindings, @@ -106,12 +106,12 @@ public: const ResId& rResId ); ~SvxColorDockingWindow(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight ) { nLeftSlot = nLeft; nRightSlot = nRight; } - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; #endif diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index 01662eb92bd7..d8a8924253f5 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -47,10 +47,10 @@ public: SvxXConnectionPreview( Window* pParent, WinBits nStyle); virtual ~SvxXConnectionPreview(); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual Size GetOptimalSize() const; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; void SetAttributes( const SfxItemSet& rInAttrs ); sal_uInt16 GetLineDeltaAnz(); @@ -58,7 +58,7 @@ public: void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index d1eef56d2fe7..1a8ecd45417c 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -53,7 +53,7 @@ class SvxContourDlgItem : public SfxControllerItem protected: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; public: diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 95f4124dd89c..703a75c1fd2a 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -76,9 +76,9 @@ public: ~SvLBoxColorString(); virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; - SvLBoxItem* Create() const; + SvLBoxItem* Create() const SAL_OVERRIDE; }; class SVX_DLLPUBLIC SvxRedlinTable : public SvSimpleTable @@ -105,8 +105,8 @@ private: protected: - virtual sal_Int32 ColCompare(SvTreeListEntry*,SvTreeListEntry*); - virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind); + virtual sal_Int32 ColCompare(SvTreeListEntry*,SvTreeListEntry*) SAL_OVERRIDE; + virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) SAL_OVERRIDE; @@ -143,7 +143,7 @@ public: SvTreeListEntry* pParent=NULL,sal_uIntPtr nPos=TREELIST_APPEND); - virtual SvTreeListEntry* CreateEntry() const; + virtual SvTreeListEntry* CreateEntry() const SAL_OVERRIDE; void SetColCompareHdl(const Link& rLink ) { aColCompareLink = rLink; } const Link& GetColCompareHdl() const { return aColCompareLink; } @@ -204,7 +204,7 @@ protected: public: SvxTPFilter( Window * pParent); - virtual void DeactivatePage(); + virtual void DeactivatePage() SAL_OVERRIDE; void SetRedlinTable(SvxRedlinTable*); Date GetFirstDate() const; @@ -352,8 +352,8 @@ public: void SetUndoClickHdl( const Link& rLink ) { UndoClickLk = rLink; } const Link& GetUndoAllClickHdl() const { return UndoClickLk; } - virtual void ActivatePage(); - virtual void DeactivatePage(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual void DeactivatePage() SAL_OVERRIDE; }; diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx index 9f07b6325bc2..378717fac0df 100644 --- a/include/svx/cube3d.hxx +++ b/include/svx/cube3d.hxx @@ -54,17 +54,17 @@ private: protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize); E3dCubeObj(); - virtual sal_uInt16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; - virtual E3dCubeObj* Clone() const; + virtual E3dCubeObj* Clone() const SAL_OVERRIDE; // Set local parameters with geometry recreation void SetCubePos(const basegfx::B3DPoint& rNew); @@ -79,8 +79,8 @@ public: sal_uInt16 GetSideFlags() { return nSideFlags; } // TakeObjName...() is for the display in the UI, for example "3 frames selected". - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_CUBE3D_HXX diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx index eb56fb0b76c6..b04335d9d0be 100644 --- a/include/svx/dbaexchange.hxx +++ b/include/svx/dbaexchange.hxx @@ -146,8 +146,8 @@ namespace svx protected: // TransferableHelper overridables - 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; static sal_uInt32 getDescriptorFormatId(); @@ -224,9 +224,9 @@ namespace svx extractObjectDescriptor(const TransferableDataHelper& _rData); protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; protected: const ODataAccessDescriptor& getDescriptor() const { return m_aDescriptor; } @@ -274,9 +274,9 @@ namespace svx static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > extractDescriptor(const TransferableDataHelper& _rData); protected: - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void ObjectReleased(); + virtual void AddSupportedFormats() SAL_OVERRIDE; + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; static sal_uInt32 getDescriptorFormatId(); }; diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx index 957b739b98b8..a5b9c11730da 100644 --- a/include/svx/dbaobjectex.hxx +++ b/include/svx/dbaobjectex.hxx @@ -62,8 +62,8 @@ namespace svx protected: // TransferableHelper overridables - 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; static sal_uInt32 getDescriptorFormatId(bool _bExtractForm); }; diff --git a/include/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx index 000cb405e0be..bb31411538fd 100644 --- a/include/svx/dbcharsethelper.hxx +++ b/include/svx/dbcharsethelper.hxx @@ -36,7 +36,7 @@ namespace svxform mutable ::rtl::Reference< ::connectivity::simple::IDataAccessCharSet > m_xCharsetHelper; protected: - virtual bool ensureLoaded() const; + virtual bool ensureLoaded() const SAL_OVERRIDE; public: ODataAccessCharsetHelper( ); diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx index 58ebe1dfa745..5a5542ba2cfe 100644 --- a/include/svx/dbtoolsclient.hxx +++ b/include/svx/dbtoolsclient.hxx @@ -68,7 +68,7 @@ namespace svxform mutable ::rtl::Reference< ::connectivity::simple::IDataAccessTools > m_xDataAccessTools; protected: - virtual bool ensureLoaded() const; + virtual bool ensureLoaded() const SAL_OVERRIDE; public: OStaticDataAccessTools(); diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 9c9b92bcab8d..e6b1c23eef84 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -84,19 +84,19 @@ public: virtual ~DialControl(); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void LoseFocus(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; - virtual Size GetOptimalSize() const; - virtual void Resize(); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; /** Returns true, if the control is not in "don't care" state. */ bool HasRotation() const; @@ -174,11 +174,11 @@ class SVX_DLLPUBLIC DialControlWrapper : public sfx::SingleControlWrapper< DialC public: explicit DialControlWrapper( DialControl& rDial ); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual sal_Int32 GetControlValue() const; - virtual void SetControlValue( sal_Int32 nValue ); + virtual sal_Int32 GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( sal_Int32 nValue ) SAL_OVERRIDE; }; diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index dddd4b8f4a00..c102022aa621 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -59,9 +59,9 @@ public: Svx3DPreviewControl(Window* pParent, WinBits nStyle = 0); ~Svx3DPreviewControl(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; void Reset(); virtual void SetObjectType(sal_uInt16 nType); @@ -114,12 +114,12 @@ public: Svx3DLightControl(Window* pParent, WinBits nStyle = 0); ~Svx3DLightControl(); - virtual void Paint(const Rectangle& rRect); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Resize(); + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; - virtual void SetObjectType(sal_uInt16 nType); + virtual void SetObjectType(sal_uInt16 nType) SAL_OVERRIDE; // register user callback void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; } @@ -140,7 +140,7 @@ public: void GetRotation(double& rRotX, double& rRotY, double& rRotZ); void SelectLight(sal_uInt32 nLightNumber); - virtual void Set3DAttributes(const SfxItemSet& rAttr); + virtual void Set3DAttributes(const SfxItemSet& rAttr) SAL_OVERRIDE; sal_uInt32 GetSelectedLight() { return maSelectedLight; } // light data access @@ -170,7 +170,7 @@ public: ~SvxLightCtl3D(); // react to size changes - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void NewLayout(); // check the selection for validity @@ -183,11 +183,11 @@ public: void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; } void SetUserSelectionChangeCallback(Link aNew) { maUserSelectionChangeCallback = aNew; } - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 455ddfc65ba5..2d09ad61f28f 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -94,8 +94,8 @@ protected: void SetFocusRect( const Rectangle* pRect = NULL ); // pRect == NULL -> calculate rectangle in method Point SetActualRPWithoutInvalidate( RECT_POINT eNewRP ); // returns the last point - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const; public: @@ -105,13 +105,13 @@ public: sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT); virtual ~SvxRectCtl(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKeyEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void Reset(); RECT_POINT GetActualRP() const; @@ -124,7 +124,7 @@ public: Rectangle CalculateFocusRectangle( void ) const; Rectangle CalculateFocusRectangle( RECT_POINT eRectPoint ) const; - 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; RECT_POINT GetApproxRPFromPixPt( const ::com::sun::star::awt::Point& rPixelPoint ) const; @@ -184,10 +184,10 @@ public: ~SvxPixelCtl(); - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetXBitmap( const BitmapEx& rBitmapEx ); @@ -206,7 +206,7 @@ public: void Reset(); SvxPixelCtlAccessible* m_pAccess; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccess; - 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; long GetSquares() const { return nSquares ; } long GetWidth() const { return aRectSize.getWidth() ; } long GetHeight() const { return aRectSize.getHeight() ; } @@ -218,9 +218,9 @@ public: Point IndexToPoint(long nIndex) const ; long GetFoucsPosIndex() const ; //Keyboard function for key input and focus handling function - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; }; /************************************************************************/ @@ -379,8 +379,8 @@ public: virtual ~SvxPreviewBase(); // change support - virtual void StateChanged(StateChangedType nStateChange); - virtual void DataChanged(const DataChangedEvent& rDCEvt); + virtual void StateChanged(StateChangedType nStateChange) SAL_OVERRIDE; + virtual void DataChanged(const DataChangedEvent& rDCEvt) SAL_OVERRIDE; // dada read access SdrModel& getModel() const { return *mpModel; } @@ -414,9 +414,9 @@ public: void SetSymbol( Graphic* p, const Size& s ); void ResizeSymbol( const Size& s ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; /************************************************************************* @@ -436,8 +436,8 @@ public: void SetAttributes(const SfxItemSet& rItemSet); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; }; /************************************************************************* @@ -463,7 +463,7 @@ public: void SetShadowAttributes(const SfxItemSet& rItemSet); void SetShadowPosition(const Point& rPos); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_DLGCTRL_HXX diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx index 2601174fb418..11a3d2ca548e 100644 --- a/include/svx/drawitem.hxx +++ b/include/svx/drawitem.hxx @@ -43,12 +43,12 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XColorListRef GetColorList() const { return pColorList; } void SetColorList( const XColorListRef &pTable ) { pColorList = pTable; } @@ -73,12 +73,12 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XGradientListRef GetGradientList() const { return pGradientList; } void SetGradientList( XGradientListRef pList ) { @@ -103,12 +103,12 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XHatchListRef GetHatchList() const { return pHatchList; } void SetHatchList( XHatchListRef pList ) { @@ -134,12 +134,12 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XBitmapListRef GetBitmapList() const { return pBitmapList; } void SetBitmapList( XBitmapListRef pList ) { @@ -165,12 +165,12 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XDashListRef GetDashList() const { return pDashList; } }; @@ -193,12 +193,12 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE; XLineEndListRef GetLineEndList() const { return pLineEndList; } void SetLineEndList( XLineEndListRef pList ) { diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index ee258515cda7..b425583a268f 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -40,13 +40,13 @@ public: SvxB3DVectorItem( const SvxB3DVectorItem& ); ~SvxB3DVectorItem(); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const basegfx::B3DVector& GetValue() const { return aVal; } void SetValue( const basegfx::B3DVector& rNewVal ) { @@ -54,7 +54,7 @@ public: aVal = rNewVal; } - virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; + virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx index 96ebbd0cb9ee..ad8075e28c16 100644 --- a/include/svx/e3dundo.hxx +++ b/include/svx/e3dundo.hxx @@ -46,7 +46,7 @@ class E3dUndoAction : public SdrUndoAction virtual ~E3dUndoAction (); - virtual bool CanRepeat(SfxRepeatTarget&) const; + virtual bool CanRepeat(SfxRepeatTarget&) const SAL_OVERRIDE; }; /************************************************************************\ @@ -73,8 +73,8 @@ class E3dRotateUndoAction : public E3dUndoAction virtual ~E3dRotateUndoAction (); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; @@ -101,9 +101,9 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction virtual ~E3dAttributesUndoAction(); - virtual bool CanRepeat(SfxRepeatTarget& rView) const; - virtual void Undo(); - virtual void Redo(); + virtual bool CanRepeat(SfxRepeatTarget& rView) const SAL_OVERRIDE; + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; virtual void Repeat(); }; diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx index 10aa7d50d263..844d94ecd5ea 100644 --- a/include/svx/extrud3d.hxx +++ b/include/svx/extrud3d.hxx @@ -39,8 +39,8 @@ private: basegfx::B2DPolyPolygon maExtrudePolygon; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; void SetDefaultAttributes(E3dDefaultAttributes& rDefault); public: @@ -81,20 +81,20 @@ public: bool GetCloseBack() const { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); } - virtual sal_uInt16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; - virtual E3dExtrudeObj* Clone() const; + virtual E3dExtrudeObj* Clone() const SAL_OVERRIDE; // TakeObjName...() is for the display in the UI (for example "3 frames selected") - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; // set/get local parameters with geometry regeneration void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew); const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; } - virtual bool IsBreakObjPossible(); - virtual SdrAttrObj* GetBreakObj(); + virtual bool IsBreakObjPossible() SAL_OVERRIDE; + virtual SdrAttrObj* GetBreakObj() SAL_OVERRIDE; }; #endif // INCLUDED_SVX_EXTRUD3D_HXX diff --git a/include/svx/extrusioncolorcontrol.hxx b/include/svx/extrusioncolorcontrol.hxx index 56a634a5ed53..c205a69096f1 100644 --- a/include/svx/extrusioncolorcontrol.hxx +++ b/include/svx/extrusioncolorcontrol.hxx @@ -38,9 +38,9 @@ public: ~ExtrusionColorControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; } diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index fe3b82b83b78..d42dc13d222b 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -63,9 +63,9 @@ public: ~SvxFillToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; void Update( const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; }; @@ -84,12 +84,12 @@ private: DECL_LINK( DelayHdl, void * ); DECL_LINK( SelectFillTypeHdl, ListBox * ); DECL_LINK( SelectFillAttrHdl, ListBox * ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: FillControl( Window* pParent, WinBits nStyle = 0 ); ~FillControl(); - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; }; #endif // INCLUDED_SVX_FILLCTRL_HXX diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 8b117aa5e574..3dfdd8ebe9c9 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -234,7 +234,7 @@ private: SVX_DLLPRIVATE void SetUILightState( ImageButton& aBtn, bool bState ); protected: - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; public: Svx3DWin( SfxBindings* pBindings, SfxChildWindow *pCW, @@ -261,7 +261,7 @@ class Svx3DCtrlItem : public SfxControllerItem { protected: virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; public: Svx3DCtrlItem( sal_uInt16, SfxBindings* ); @@ -279,7 +279,7 @@ class SvxConvertTo3DItem : public SfxControllerItem bool bState; protected: - virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState); + virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; public: SvxConvertTo3DItem(sal_uInt16 nId, SfxBindings* pBindings); diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx index 132bb1e232ab..31f3856c4942 100644 --- a/include/svx/fmdmod.hxx +++ b/include/svx/fmdmod.hxx @@ -30,9 +30,9 @@ public: virtual ~SvxFmMSFactory() {} - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception ); - 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 ); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::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 ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_FMDMOD_HXX diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx index e91a393a1bec..86ed1fce828d 100644 --- a/include/svx/fmdpage.hxx +++ b/include/svx/fmdpage.hxx @@ -35,12 +35,12 @@ protected: // Creating a SdrObject based on a Description. Cann be used by derived classes to // support own ::com::sun::star::drawing::Shapes (for example Controls) virtual SdrObject *_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ) - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; // The following method is called when a SvxShape object should be created. // Derived classes can create a derivation or an object aggregating SvxShape. virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > _CreateShape( SdrObject *pObj ) const - throw (std::exception); + throw (std::exception) SAL_OVERRIDE; public: SvxFmDrawPage( SdrPage* pPage ); @@ -49,19 +49,19 @@ public: // UNO connection DECLARE_UNO3_AGG_DEFAULTS(SvxFmDrawPage, SvxDrawPage); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) 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::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) 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; - 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< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XFormsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XFormsSupplier2 - virtual sal_Bool SAL_CALL hasForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL hasForms(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_FMDPAGE_HXX diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index a170424a9de5..26241fe26977 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -53,9 +53,9 @@ public: } protected: - virtual void Command( const CommandEvent& rCEvt ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void Select(); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; /** the value returned by GetItemPos is meaningless for the grid model if there are hidden columns, so use GetModelColumnPos instead @@ -75,8 +75,8 @@ protected: virtual void PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMenu& rMenu, sal_uInt16 nExecutionResult); // DropTargetHelper - 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; /** selects the column at the selection supplier. @param nColumnId @@ -111,7 +111,7 @@ public: WinBits nBits); // Window - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertyChangeListener void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt); @@ -138,7 +138,7 @@ public: @return The name of the specified object. */ - virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; /** return the description of the specified object. @param eObjType @@ -148,33 +148,33 @@ public: @return The description of the specified object. */ - virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const; + virtual OUString GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition = -1) const SAL_OVERRIDE; protected: - virtual void Command(const CommandEvent& rEvt); - - virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent); - virtual long QueryMinimumRowHeight(); - virtual void RowHeightChanged(); - virtual void ColumnResized(sal_uInt16 nId); - virtual void ColumnMoved(sal_uInt16 nId); - virtual void DeleteSelectedRows(); + virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; + + virtual BrowserHeader* imp_CreateHeaderBar(BrowseBox* pParent) SAL_OVERRIDE; + virtual long QueryMinimumRowHeight() SAL_OVERRIDE; + virtual void RowHeightChanged() SAL_OVERRIDE; + virtual void ColumnResized(sal_uInt16 nId) SAL_OVERRIDE; + virtual void ColumnMoved(sal_uInt16 nId) SAL_OVERRIDE; + virtual void DeleteSelectedRows() SAL_OVERRIDE; virtual void SetDesignMode(bool bMode) SAL_OVERRIDE; - virtual void CellModified(); - virtual void HideColumn(sal_uInt16 nId); - virtual void ShowColumn(sal_uInt16 nId); + virtual void CellModified() SAL_OVERRIDE; + virtual void HideColumn(sal_uInt16 nId) SAL_OVERRIDE; + virtual void ShowColumn(sal_uInt16 nId) SAL_OVERRIDE; bool IsInColumnMove() const {return m_bInColumnMove;} - virtual void BeginCursorAction(); - virtual void EndCursorAction(); - virtual void Select(); + virtual void BeginCursorAction() SAL_OVERRIDE; + virtual void EndCursorAction() SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; // Initialize columns // a.) only by column description virtual void InitColumnsByModels(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& xColumns); // b.) during alivemode by database fields - virtual void InitColumnsByFields(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xFields); + virtual void InitColumnsByFields(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xFields) SAL_OVERRIDE; // some kind of impl version (for one single column) of our version of InitColumnsByFields void InitColumnByField( diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index a0666dea8da7..a89bdf445b16 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -65,8 +65,8 @@ protected: public: OWeakSubObject(::cppu::OWeakObject& rParent) : m_rParent(rParent) { } - virtual void SAL_CALL acquire() throw() { m_rParent.acquire(); } - virtual void SAL_CALL release() throw() { m_rParent.release(); } + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { m_rParent.acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { m_rParent.release(); } }; @@ -79,13 +79,13 @@ class FmXModifyMultiplexer :public OWeakSubObject public: FmXModifyMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); DECLARE_UNO3_DEFAULTS(FmXModifyMultiplexer,OWeakSubObject); - 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 queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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; // ::com::sun::star::util::XModifyListener - virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL modified(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -103,14 +103,14 @@ public: FmXUpdateMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); DECLARE_UNO3_DEFAULTS(FmXUpdateMultiplexer,OWeakSubObject); - 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 queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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; // ::com::sun::star::form::XUpdateListener - virtual sal_Bool SAL_CALL approveUpdate(const ::com::sun::star::lang::EventObject &) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL updated(const ::com::sun::star::lang::EventObject &) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL approveUpdate(const ::com::sun::star::lang::EventObject &) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL updated(const ::com::sun::star::lang::EventObject &) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -128,13 +128,13 @@ public: FmXSelectionMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); DECLARE_UNO3_DEFAULTS(FmXSelectionMultiplexer, OWeakSubObject); - 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 queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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; // ::com::sun::star::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; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -152,13 +152,13 @@ public: FmXGridControlMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex ); DECLARE_UNO3_DEFAULTS( FmXGridControlMultiplexer, OWeakSubObject ); - 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 queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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; // ::com::sun::star::view::XSelectionChangeListener - virtual void SAL_CALL columnChanged( const ::com::sun::star::lang::EventObject& _event ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL columnChanged( const ::com::sun::star::lang::EventObject& _event ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -175,15 +175,15 @@ class FmXContainerMultiplexer : public OWeakSubObject, public: FmXContainerMultiplexer( ::cppu::OWeakObject& rSource, ::osl::Mutex& rMutex); DECLARE_UNO3_DEFAULTS(FmXContainerMultiplexer,OWeakSubObject); - 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 queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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; // ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // resolve ambiguity : both OWeakObject and OInterfaceContainerHelper have these memory operators void * SAL_CALL operator new( size_t size ) throw() { return OWeakSubObject::operator new(size); } @@ -227,86 +227,86 @@ public: // UNO connection DECLARE_UNO3_AGG_DEFAULTS(FmXGridControl, UnoControl); - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; // ::com::sun::star::lang::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; // ::com::sun::star::lang::XServiceInfo - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception); - virtual OUString SAL_CALL getImplementationName() throw(std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw(std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XControl - virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL createPeer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit >& _rToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >& Parent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& Model) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XView - virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::form::XBoundComponent - virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL commit() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL commit() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::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; // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::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 _rIndex) 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 _rIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::form::XGridControl - virtual void SAL_CALL addGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::form::XGrid (base of XGridControl) - virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::form::XGridFieldDataSupplier (base of XGridControl) - virtual ::com::sun::star::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UnoControl - virtual OUString GetComponentServiceName(); + virtual OUString GetComponentServiceName() SAL_OVERRIDE; // ::com::sun::star::util::XModifyBroadcaster - virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) 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 >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XModeSelector - virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XContainer - virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException, std::exception); - 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 >& aDescripts) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) 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 >& aDescripts) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL releaseDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL registerDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL releaseDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::view::XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); - 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); + virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL 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) 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) SAL_OVERRIDE; protected: virtual FmXGridPeer* imp_CreatePeer(Window* pParent); @@ -380,95 +380,95 @@ public: // UNO connection DECLARE_UNO3_DEFAULTS(FmXGridPeer, VCLXWindow); - 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 queryInterface(const ::com::sun::star::uno::Type& _rType) 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); - 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; // ::com::sun::star::lang::XUnoTunnel static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelImplementationId() throw(); static FmXGridPeer* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxIFace ) throw(); - sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception); + sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rIdentifier ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::form::XGridPeer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& aColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColumns( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >& aColumns ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::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; // ::com::sun::star::lang::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; // ::com::sun::star::form::XBoundComponent - virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL commit() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL commit() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::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; // ::com::sun::star::container::XEnumerationAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::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 _rIndex) 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 _rIndex) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::form::XLoadListener - virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL loaded(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unloaded(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reloading(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reloaded(const ::com::sun::star::lang::EventObject& aEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::sdbc::XRowSetListener - virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL cursorMoved(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rowChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL rowSetChanged(const ::com::sun::star::lang::EventObject& event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XContainerListener - virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL elementInserted(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementRemoved(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL elementReplaced(const ::com::sun::star::container::ContainerEvent& Event) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // VCLXWindow - virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > - CreateAccessibleContext(); + CreateAccessibleContext() SAL_OVERRIDE; // ::com::sun::star::form::XGridControl - virtual void SAL_CALL addGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeGridControlListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XGridControlListener >& _listener ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::form::XGrid (base of XGridControl) - virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getCurrentColumnPosition() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setCurrentColumnPosition(sal_Int16 nPos) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::form::XGridFieldDataSupplier (base of XGridControl) - virtual ::com::sun::star::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< sal_Bool > SAL_CALL queryFieldDataType( const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL queryFieldData( sal_Int32 nRow, const ::com::sun::star::uno::Type& xType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::sdb::XRowSetSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getRowSet() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRowSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xDataSource) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > SAL_CALL getRowSet() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRowSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& xDataSource) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XModifyBroadcaster - virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addModifyListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& l) 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 >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // UnoControl - virtual void SAL_CALL SAL_CALL setDesignMode(sal_Bool bOn) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isDesignMode() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL SAL_CALL setDesignMode(sal_Bool bOn) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isDesignMode() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::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; void CellModified(); @@ -478,41 +478,41 @@ public: void stopCursorListening(); // ::com::sun::star::util::XModeSelector - virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMode(const OUString& Mode) throw(::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getMode() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedModes() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsMode(const OUString& Mode) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::container::XContainer - virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& l) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void columnVisible(DbGridColumn* pColumn); void columnHidden(DbGridColumn* pColumn); // ::com::sun::star::awt::XView - virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException, std::exception); - 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 >& aDescripts) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) 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 >& aDescripts) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::frame::XDispatchProviderInterception - virtual void SAL_CALL registerDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL releaseDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL registerDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL releaseDispatchProviderInterceptor(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterceptor >& xInterceptor) throw(::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::form::XResetListener - virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL resetted(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL approveReset(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL resetted(const ::com::sun::star::lang::EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::view::XSelectionSupplier - virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - 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); - 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); + virtual sal_Bool SAL_CALL select( const ::com::sun::star::uno::Any& aSelection ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL 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) 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) SAL_OVERRIDE; protected: virtual FmGridControl* imp_CreateControl(Window* pParent, WinBits nStyle); diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx index b74fdcb11ba4..128579b4fc7e 100644 --- a/include/svx/fmmodel.hxx +++ b/include/svx/fmmodel.hxx @@ -56,12 +56,12 @@ public: virtual ~FmFormModel(); - virtual SdrPage* AllocPage(bool bMasterPage); - virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); - virtual SdrPage* RemovePage(sal_uInt16 nPgNum); - virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); - virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); - virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum); + virtual SdrPage* AllocPage(bool bMasterPage) SAL_OVERRIDE; + virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE; + virtual SdrPage* RemovePage(sal_uInt16 nPgNum) SAL_OVERRIDE; + virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) SAL_OVERRIDE; + virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF) SAL_OVERRIDE; + virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum) SAL_OVERRIDE; virtual SdrLayerID GetControlExportLayerId( const SdrObject& rObj ) const; SfxObjectShell* GetObjectShell() const { return m_pObjShell; } diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index 1ba4bf0d4ce4..acbd8ad5a98c 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -51,15 +51,15 @@ public: FmFormPage(const FmFormPage& rPage); ~FmFormPage(); - virtual void SetModel(SdrModel* pNewModel); + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; - virtual SdrPage* Clone() const; + virtual SdrPage* Clone() const SAL_OVERRIDE; using SdrPage::Clone; virtual void InsertObject(SdrObject* pObj, sal_uLong nPos = CONTAINER_APPEND, - const SdrInsertReason* pReason=NULL); + const SdrInsertReason* pReason=NULL) SAL_OVERRIDE; - virtual SdrObject* RemoveObject(sal_uLong nObjNum); + virtual SdrObject* RemoveObject(sal_uLong nObjNum) SAL_OVERRIDE; // access to all forms const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForms>& GetForms( bool _bForceCreate = true ) const; diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 92306858b64f..222c71f36747 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -108,7 +108,7 @@ public: virtual void Execute( SfxRequest& ); virtual void GetState( SfxItemSet& ); - virtual bool HasUIFeature( sal_uInt32 nFeature ); + virtual bool HasUIFeature( sal_uInt32 nFeature ) SAL_OVERRIDE; void ExecuteTextAttribute( SfxRequest& ); void GetTextAttributeState( SfxItemSet& ); @@ -129,8 +129,8 @@ public: void ForgetActiveControl(); void SetControlActivationHandler( const Link& _rHdl ); - virtual void Activate(bool bMDI); - virtual void Deactivate(bool bMDI); + virtual void Activate(bool bMDI) SAL_OVERRIDE; + virtual void Deactivate(bool bMDI) SAL_OVERRIDE; // helper methods for implementing XFormLayerAccess SdrUnoObj* GetFormControl( diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index 8b2358610dbe..00d030ab3c1d 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -47,8 +47,8 @@ class FmSearchThread : public ::osl::Thread FmSearchEngine* m_pEngine; Link m_aTerminationHdl; - virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; public: FmSearchThread(FmSearchEngine* pEngine) : m_pEngine(pEngine) { } @@ -101,10 +101,10 @@ public: // virtual sal_Bool queryInterface(::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rOut); // ::com::sun::star::lang::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; // ::com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; void DisConnect(); @@ -138,21 +138,21 @@ namespace svxform { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent > m_xText; public: SimpleTextWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >& _xText); - virtual OUString getCurrentText() const; + virtual OUString getCurrentText() const SAL_OVERRIDE; }; class ListBoxWrapper : public ControlTextWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox > m_xBox; public: ListBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XListBox >& _xBox); - virtual OUString getCurrentText() const; + virtual OUString getCurrentText() const SAL_OVERRIDE; }; class CheckBoxWrapper : public ControlTextWrapper { ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox > m_xBox; public: CheckBoxWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XCheckBox >& _xBox); - virtual OUString getCurrentText() const; + virtual OUString getCurrentText() const SAL_OVERRIDE; }; } diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx index 6a274ca1f9fc..d4e707084f72 100644 --- a/include/svx/fmtools.hxx +++ b/include/svx/fmtools.hxx @@ -201,7 +201,7 @@ public: FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _rxObject, sal_Int16 _nId = -1); // ::com::sun::star::lang::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; void dispose(); }; diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx index 884b88211bd7..bb579635a679 100644 --- a/include/svx/fmview.hxx +++ b/include/svx/fmview.hxx @@ -82,9 +82,9 @@ public: */ SdrObject* CreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc ); - virtual void MarkListHasChanged(); - virtual void AddWindowToPaintView(OutputDevice* pNewWin); - virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin); + virtual void MarkListHasChanged() SAL_OVERRIDE; + virtual void AddWindowToPaintView(OutputDevice* pNewWin) SAL_OVERRIDE; + virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin) SAL_OVERRIDE; static void createControlLabelPair( OutputDevice* _pOutDev, @@ -103,15 +103,15 @@ public: SdrUnoObj*& _rpControl ); - virtual SdrPageView* ShowSdrPage(SdrPage* pPage); - virtual void HideSdrPage(); + virtual SdrPageView* ShowSdrPage(SdrPage* pPage) SAL_OVERRIDE; + virtual void HideSdrPage() SAL_OVERRIDE; // for copying complete form structures, not only control models - virtual SdrModel* GetMarkedObjModel() const; + virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE; using E3dView::Paste; - virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0) SAL_OVERRIDE; - virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ); + virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) SAL_OVERRIDE; /** grab the focus to the first form control on the view @param _bForceSync @@ -125,7 +125,7 @@ public: GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // SdrView - sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); + sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" FmFormPage* GetCurPage(); @@ -146,8 +146,8 @@ public: virtual void InsertControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); virtual void RemoveControlContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& xCC); - virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut); - virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); + virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut) SAL_OVERRIDE; + virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer) SAL_OVERRIDE; SVX_DLLPRIVATE const OutputDevice* GetActualOutDev() const {return pActualOutDev;} SVX_DLLPRIVATE bool checkUnMarkAll(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xSource); diff --git a/include/svx/fntctl.hxx b/include/svx/fntctl.hxx index 4484a231cc75..5e2c2bd73eb0 100644 --- a/include/svx/fntctl.hxx +++ b/include/svx/fntctl.hxx @@ -39,14 +39,14 @@ private: SVX_DLLPRIVATE void FillMenu(); DECL_LINK( MenuSelect, FontNameMenu * ); SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; public: SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& ); ~SvxFontMenuControl(); - virtual PopupMenu* GetPopup() const; + virtual PopupMenu* GetPopup() const SAL_OVERRIDE; SFX_DECL_MENU_CONTROL(); }; diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index b431c418a123..aaa73142dd7f 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -50,8 +50,8 @@ public: SvxFontPrevWindow(Window* pParent, WinBits nStyle); virtual ~SvxFontPrevWindow(); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void Init( const SfxItemSet& rSet ); @@ -65,7 +65,7 @@ public: void ResetColor(); void SetBackColor( const Color& rColor ); void UseResourceText( bool bUse = true ); - void Paint( const Rectangle& ); + void Paint( const Rectangle& ) SAL_OVERRIDE; bool IsTwoLines() const; void SetTwoLines(bool bSet); @@ -87,7 +87,7 @@ public: void SetFromItemSet( const SfxItemSet &rSet, bool bPreviewBackgroundToCharacter = false ); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_FNTCTRL_HXX diff --git a/include/svx/fntszctl.hxx b/include/svx/fntszctl.hxx index 3d5b6a1a2248..b9bfad768d81 100644 --- a/include/svx/fntszctl.hxx +++ b/include/svx/fntszctl.hxx @@ -40,13 +40,13 @@ private: protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; public: SvxFontSizeMenuControl( sal_uInt16 nId, Menu&, SfxBindings& ); ~SvxFontSizeMenuControl(); - virtual PopupMenu* GetPopup() const; + virtual PopupMenu* GetPopup() const SAL_OVERRIDE; SFX_DECL_MENU_CONTROL(); }; diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx index bee24dfec836..d0d6b9028751 100644 --- a/include/svx/fontlb.hxx +++ b/include/svx/fontlb.hxx @@ -46,13 +46,13 @@ public: virtual ~SvLBoxFontString(); /** Creates a new empty list box item. */ - virtual SvLBoxItem* Create() const; + virtual SvLBoxItem* Create() const SAL_OVERRIDE; - void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ); + void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* ) SAL_OVERRIDE; /** Paints this entry to the specified position, using the own font settings. */ virtual void Paint( - const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry); + const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; }; @@ -96,7 +96,7 @@ protected: const OUString& rEntryText, const Image& rCollImg, const Image& rExpImg, - SvLBoxButtonKind eButtonKind); + SvLBoxButtonKind eButtonKind) SAL_OVERRIDE; }; diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 57e34cc113ff..c44550ae5d1f 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -60,7 +60,7 @@ class SvxFontWorkControllerItem : public SfxControllerItem protected: virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState); + const SfxPoolItem* pState) SAL_OVERRIDE; public: SvxFontWorkControllerItem(sal_uInt16 nId, SvxFontWorkDialog&, SfxBindings&); @@ -147,13 +147,13 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow void SetShadowXVal_Impl(const XFormTextShadowXValItem*); void SetShadowYVal_Impl(const XFormTextShadowYValItem*); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void ApplyImageList(); protected: virtual void Zoom(); virtual SfxChildAlignment CheckAlignment( SfxChildAlignment eActAlign, - SfxChildAlignment eAlign ); + SfxChildAlignment eAlign ) SAL_OVERRIDE; public: SvxFontWorkDialog( SfxBindings *pBindinx, diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index a5b63bada0c6..ba4a2f2e096c 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -58,8 +58,8 @@ public: ~FontWorkShapeTypeControl(); virtual void Select( sal_Bool bMod1 = sal_False ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx index b603c8876356..38c6dba622ce 100644 --- a/include/svx/formatpaintbrushctrl.hxx +++ b/include/svx/formatpaintbrushctrl.hxx @@ -44,12 +44,12 @@ public: FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~FormatPaintBrushToolBoxControl(); - virtual void DoubleClick(); - virtual void Click(); + virtual void DoubleClick() SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; virtual void Select( sal_Bool bMod1 = sal_False ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; private: DECL_LINK( WaitDoubleClickHdl, void* ); void impl_executePaintBrush(); diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index ff61dd196664..a738659aa54a 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -74,11 +74,11 @@ class SVX_DLLPUBLIC FrameDirListBoxWrapper : public sfx::SingleControlWrapper< F public: explicit FrameDirListBoxWrapper( FrameDirListBox& rListBox ); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual SvxFrameDirection GetControlValue() const; - virtual void SetControlValue( SvxFrameDirection eValue ); + virtual SvxFrameDirection GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( SvxFrameDirection eValue ) SAL_OVERRIDE; }; /** Wrapper for usage of a SvxFrameDirectionItem in item connections. */ diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 9c0db3010855..4a3f0ffeb8be 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -161,7 +161,7 @@ public: // accessibility ---------------------------------------------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessible(); + CreateAccessible() SAL_OVERRIDE; /** Returns the accessibility child object of the specified frame border (if enabled). */ ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > @@ -180,14 +180,14 @@ public: protected: - virtual void Paint( const Rectangle& rRect ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; private: std::auto_ptr< FrameSelectorImpl > mxImpl; diff --git a/include/svx/galbrws.hxx b/include/svx/galbrws.hxx index 8ee5db519559..f4753f6614d3 100644 --- a/include/svx/galbrws.hxx +++ b/include/svx/galbrws.hxx @@ -58,9 +58,9 @@ private: /// bitfield void InitSettings(); - virtual bool Close(); - virtual void Resize(); - virtual void GetFocus(); + virtual bool Close() SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; DECL_LINK( SplitHdl, void* ); diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index b18c677dddd5..5b5fff429ef5 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -52,20 +52,20 @@ private: SVX_DLLPRIVATE void InitSettings(); // Window - SVX_DLLPRIVATE virtual void Paint(const Rectangle& rRect); - SVX_DLLPRIVATE virtual Size GetOptimalSize() const; - SVX_DLLPRIVATE virtual void MouseButtonDown(const MouseEvent& rMEvt); - SVX_DLLPRIVATE virtual void Command(const CommandEvent& rCEvt); - SVX_DLLPRIVATE virtual void KeyInput( const KeyEvent& rKEvt ); - SVX_DLLPRIVATE virtual void DataChanged( const DataChangedEvent& rDCEvt ); + SVX_DLLPRIVATE virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual Size GetOptimalSize() const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual void Command(const CommandEvent& rCEvt) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // DropTargetHelper - SVX_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - SVX_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + SVX_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; // DragSourceHelper - SVX_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + SVX_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; DECL_LINK( MenuSelectHdl, Menu* ); @@ -91,20 +91,20 @@ private: void InitSettings(); // ValueSet - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; // Window - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) 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; // DropTargetHelper - 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; // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; public: @@ -126,20 +126,20 @@ private: void InitSettings(); // BrowseBox - virtual bool SeekRow( long nRow ); - virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; - virtual void DoubleClick( const BrowserMouseEvent& rEvt ); - virtual void Select(); - virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual bool SeekRow( long nRow ) SAL_OVERRIDE; + virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const SAL_OVERRIDE; + virtual void DoubleClick( const BrowserMouseEvent& rEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) SAL_OVERRIDE; + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; // Window - virtual void Command( const CommandEvent& rCEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; // DragSourceHelper - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; public: @@ -156,11 +156,11 @@ 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; // from IAccessibleTableProvider - virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); - virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint); + virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex) SAL_OVERRIDE; + virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_GALCTRL_HXX diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index e6a586f0163f..684b5dd26f56 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -60,14 +60,14 @@ public: const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic > GetGraphic() const { return m_xGraphic; } // pure virtual methods from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; // bridge to UNO - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; // not implemented - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 5d0860623dd7..f8f86ed0c62b 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -114,7 +114,7 @@ public: virtual ~SgaIMapInfo() {}; - virtual SdrObjUserData* Clone( SdrObject* ) const + virtual SdrObjUserData* Clone( SdrObject* ) const SAL_OVERRIDE { SgaIMapInfo* pInfo = new SgaIMapInfo; pInfo->aImageMap = aImageMap; @@ -175,11 +175,11 @@ protected: void InitData( bool bLazy ); // TransferableHelper - virtual void AddSupportedFormats(); - virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual void DragFinished( sal_Int8 nDropAction ); - virtual void ObjectReleased(); + 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 ) SAL_OVERRIDE; + virtual void DragFinished( sal_Int8 nDropAction ) SAL_OVERRIDE; + virtual void ObjectReleased() SAL_OVERRIDE; void CopyToClipboard( Window* pWindow ); void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index deea8b6d9c93..98b8807ef140 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -35,8 +35,8 @@ public: TYPEINFO_OVERRIDE(); TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; }; @@ -52,9 +52,9 @@ public: SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxGrafFilterToolBoxControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; @@ -67,8 +67,8 @@ public: SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxGrafToolBoxControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; }; @@ -159,8 +159,8 @@ public: SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxGrafModeToolBoxControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; }; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 41d214e7f349..738d0eada4b9 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -63,12 +63,12 @@ protected: SdrModel* pModel; SdrView* pView; - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void KeyInput(const KeyEvent& rKEvt); - virtual void MouseButtonDown(const MouseEvent& rMEvt); - virtual void MouseButtonUp(const MouseEvent& rMEvt); - virtual void MouseMove(const MouseEvent& rMEvt); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKEvt) SAL_OVERRIDE; + virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE; + virtual void MouseMove(const MouseEvent& rMEvt) SAL_OVERRIDE; virtual void InitSdrModel(); @@ -119,7 +119,7 @@ public: void SetUpdateLink( const Link& rLink ) { aUpdateLink = rLink; } const Link& GetUpdateLink() const { return aUpdateLink; } - 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; }; @@ -132,7 +132,7 @@ public: GraphCtrlUserCall( GraphCtrl& rGraphWin ) : rWin( rGraphWin ) {}; virtual ~GraphCtrlUserCall() {}; - virtual void Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect ); + virtual void Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect ) SAL_OVERRIDE; }; class GraphCtrlView : public SdrView @@ -141,7 +141,7 @@ class GraphCtrlView : public SdrView protected: - virtual void MarkListHasChanged() + virtual void MarkListHasChanged() SAL_OVERRIDE { SdrView::MarkListHasChanged(); rGraphCtrl.MarkListHasChanged(); diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx index cf1a6f7e3422..7564bf2731ff 100644 --- a/include/svx/grfcrop.hxx +++ b/include/svx/grfcrop.hxx @@ -37,18 +37,18 @@ public: virtual ~SvxGrfCrop(); // "pure virtual methods" from SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper* pIntl = 0 ) const; + const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - sal_uInt8 nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; void SetLeft( sal_Int32 nVal ) { nLeft = nVal; } void SetRight( sal_Int32 nVal ) { nRight = nVal; } diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 998abd5e4e00..18a4e2ba804a 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -144,8 +144,8 @@ public: public: AbsolutePos(Window* pParent, WinBits nStyle = 0); - virtual void KeyInput(const KeyEvent& rEvt); - virtual void LoseFocus(); + virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; + virtual void LoseFocus() SAL_OVERRIDE; }; friend class NavigationBar::AbsolutePos; @@ -192,9 +192,9 @@ public: sal_uInt16 GetDefaultWidth() const {return m_nDefaultWidth;} protected: - virtual void Resize(); - virtual void Paint(const Rectangle& rRect); - virtual void StateChanged( StateChangedType nType ); + virtual void Resize() SAL_OVERRIDE; + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; private: DECL_LINK(OnClick, Button*); @@ -299,34 +299,34 @@ protected: bool m_bUpdating : 1; // are any updates being executed right now? protected: - virtual bool SeekRow(long nRow); - virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows); - virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const; - virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const; - virtual RowStatus GetRowStatus(long nRow) const; - virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); - virtual void CursorMoved(); - virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); - virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); - virtual void Command(const CommandEvent& rEvt); - virtual bool PreNotify(NotifyEvent& rEvt); - virtual void KeyInput(const KeyEvent& rEvt); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void Select(); - - virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); - - virtual void CellModified(); - virtual bool SaveModified(); - virtual bool IsModified() const; - - virtual sal_uInt16 AppendColumn(const OUString& rName, sal_uInt16 nWidth = 0, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = (sal_uInt16)-1); + virtual bool SeekRow(long nRow) SAL_OVERRIDE; + virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows) SAL_OVERRIDE; + virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const SAL_OVERRIDE; + virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const SAL_OVERRIDE; + virtual RowStatus GetRowStatus(long nRow) const SAL_OVERRIDE; + virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol) SAL_OVERRIDE; + virtual void CursorMoved() SAL_OVERRIDE; + virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY) SAL_OVERRIDE; + virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) SAL_OVERRIDE; + virtual void Command(const CommandEvent& rEvt) SAL_OVERRIDE; + virtual bool PreNotify(NotifyEvent& rEvt) SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rEvt) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; + + virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol) SAL_OVERRIDE; + + virtual void CellModified() SAL_OVERRIDE; + virtual bool SaveModified() SAL_OVERRIDE; + virtual bool IsModified() const SAL_OVERRIDE; + + virtual sal_uInt16 AppendColumn(const OUString& rName, sal_uInt16 nWidth = 0, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = (sal_uInt16)-1) SAL_OVERRIDE; virtual void RemoveColumn(sal_uInt16 nId); virtual DbGridColumn* CreateColumn(sal_uInt16 nId) const; - virtual void ColumnMoved(sal_uInt16 nId); - virtual bool SaveRow(); - virtual bool IsTabAllowed(bool bForward) const; + virtual void ColumnMoved(sal_uInt16 nId) SAL_OVERRIDE; + virtual bool SaveRow() SAL_OVERRIDE; + virtual bool IsTabAllowed(bool bForward) const SAL_OVERRIDE; /// hide a column virtual void HideColumn(sal_uInt16 nId); @@ -359,7 +359,7 @@ protected: virtual void onColumnChange(); // DragSourceHelper overridables - virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); + virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ) SAL_OVERRIDE; void executeRowContextMenu( long _nRow, const Point& _rPreferredPos ); @@ -371,9 +371,9 @@ public: virtual ~DbGridControl(); - virtual void Init(); + virtual void Init() SAL_OVERRIDE; virtual void InitColumnsByFields(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xFields) = 0; - virtual void RemoveRows(); + virtual void RemoveRows() SAL_OVERRIDE; /** GetCellText returns the text at the given position @param _nRow @@ -383,7 +383,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; void RemoveRows(bool bNewCursor); @@ -395,7 +395,7 @@ public: // the options can restrict but not extend the update abilities virtual void setDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet >& rCursor, sal_uInt16 nOpts = OPT_INSERT | OPT_UPDATE | OPT_DELETE); - virtual void Dispatch(sal_uInt16 nId); + virtual void Dispatch(sal_uInt16 nId) SAL_OVERRIDE; CursorWrapper* getDataSource() const {return m_pDataCursor;} const DbGridColumns& GetColumns() const {return m_aColumns;} @@ -528,7 +528,7 @@ public: @return The count of additional controls of the control area. */ - virtual sal_Int32 GetAccessibleControlCount() const; + virtual sal_Int32 GetAccessibleControlCount() const SAL_OVERRIDE; /** Creates the accessible object of an additional control. @param _nIndex @@ -538,7 +538,7 @@ public: */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessibleControl( sal_Int32 _nIndex ); + CreateAccessibleControl( sal_Int32 _nIndex ) SAL_OVERRIDE; // IAccessibleTableProvider /** Creates the accessible object of a data table cell. @@ -547,7 +547,7 @@ public: @return The XAccessible interface of the specified cell. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > - CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ); + CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ) SAL_OVERRIDE; protected: void RecalcRows(long nNewTopRow, sal_uInt16 nLinesOnScreen, bool bUpdateCursor); @@ -585,7 +585,7 @@ protected: // calls AdjustRows or AdjustDataSource, synchron if the caller is running in the solar thread, else asynchron protected: - virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); + virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol) SAL_OVERRIDE; void Construct(); void ImplInitWindow( const InitWindowFacet _eInitWhat ); DECL_LINK(OnDelete, void*); diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index e3e5938b8487..b6827e1e8aff 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -44,8 +44,8 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage public: - virtual bool FillItemSet( SfxItemSet& rOutSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rOutSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; virtual ~SvxHFPage(); @@ -54,8 +54,8 @@ public: void EnableDynamicSpacing(); protected: - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet = 0 ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; SvxHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ); diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index e5c55f1029f0..a448aa120844 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -64,10 +64,10 @@ public: inline SvxHyperlinkItem& operator=( const SvxHyperlinkItem &rItem ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const OUString& GetName() const { return sName; } void SetName(const OUString& rName) { sName = rName; } @@ -92,8 +92,8 @@ public: void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; } sal_uInt16 GetMacroEvents() const { return nMacroEvents; } - virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; - virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVer ) const; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVer ) const SAL_OVERRIDE; }; diff --git a/include/svx/hyperdlg.hxx b/include/svx/hyperdlg.hxx index fff6dc22cbe1..4baa8e9807e0 100644 --- a/include/svx/hyperdlg.hxx +++ b/include/svx/hyperdlg.hxx @@ -41,7 +41,7 @@ public: SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper); - virtual bool QueryClose(); + virtual bool QueryClose() SAL_OVERRIDE; }; #endif // INCLUDED_SVX_HYPERDLG_HXX diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 6c671456f3b3..d581593a641f 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -66,7 +66,7 @@ class SvxIMapDlgItem : public SfxControllerItem protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; public: @@ -98,8 +98,8 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow void* pCheckObj; SvxIMapDlgItem aIMapItem; - virtual void Resize(); - virtual bool Close(); + virtual void Resize() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; DECL_LINK( TbxClickHdl, ToolBox* ); DECL_LINK( InfoHdl, IMapWindow* ); @@ -136,9 +136,9 @@ public: void UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap = NULL, const TargetList* pTargetList = NULL, void* pEditingObj = NULL ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void ApplyImageList(); }; diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx index e9fffc41ee9c..4344072a1716 100644 --- a/include/svx/insctrl.hxx +++ b/include/svx/insctrl.hxx @@ -28,9 +28,9 @@ class SVX_DLLPUBLIC SvxInsertStatusBarControl : public SfxStatusBarControl { public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Click(); - virtual void Paint( const UserDrawEvent& rEvt ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index f1b804e5176a..9084a62166de 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -54,10 +54,10 @@ public: void FillControl(); protected: - virtual void Select(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Select() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; @@ -86,10 +86,10 @@ public: void Update( const XLineColorItem* pItem ); protected: - virtual void Select(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Select() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; @@ -108,13 +108,13 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField void ReleaseFocus_Impl(); protected: - virtual void Modify(); - virtual void Down(); - virtual void Up(); // just to be sure + virtual void Modify() SAL_OVERRIDE; + virtual void Down() SAL_OVERRIDE; + virtual void Up() SAL_OVERRIDE; // just to be sure - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: SvxMetricField( Window* pParent, @@ -139,8 +139,8 @@ public: bool IsRelease() { return bRelease;} protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; private: sal_uInt16 nCurPos; @@ -161,9 +161,9 @@ public: bool IsRelease() { return bRelease;} protected: - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Select(); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; private: sal_uInt16 nCurPos; diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx index 9aad4789ad87..6eb38545b4fa 100644 --- a/include/svx/lathe3d.hxx +++ b/include/svx/lathe3d.hxx @@ -41,8 +41,8 @@ private: basegfx::B2DPolyPolygon maPolyPoly2D; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; void SetDefaultAttributes(E3dDefaultAttributes& rDefault); public: @@ -90,23 +90,23 @@ private: bool GetCloseBack() const { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); } - virtual sal_uInt16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; - virtual E3dLatheObj* Clone() const; + virtual E3dLatheObj* Clone() const SAL_OVERRIDE; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; // TakeObjName...() is for the display in the UI, for example "3 frames selected". - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; // set/get local parameters with geometry recreation void SetPolyPoly2D(const basegfx::B2DPolyPolygon& rNew); const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; } // break up - virtual bool IsBreakObjPossible(); - virtual SdrAttrObj* GetBreakObj(); + virtual bool IsBreakObjPossible() SAL_OVERRIDE; + virtual SdrAttrObj* GetBreakObj() SAL_OVERRIDE; }; #endif // INCLUDED_SVX_LATHE3D_HXX diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx index aab7505c4a09..1477e5a06020 100644 --- a/include/svx/layctrl.hxx +++ b/include/svx/layctrl.hxx @@ -30,12 +30,12 @@ private: bool bEnabled; public: - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - virtual SfxPopupWindow* CreatePopupWindowCascading(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindowCascading() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); @@ -49,9 +49,9 @@ class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl { bool bEnabled; public: - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - virtual SfxPopupWindow* CreatePopupWindowCascading(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindowCascading() SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); @@ -60,7 +60,7 @@ public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx index ef7aec6b409c..30a21b37f71a 100644 --- a/include/svx/lboxctrl.hxx +++ b/include/svx/lboxctrl.hxx @@ -45,11 +45,11 @@ public: SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxListBoxControl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; @@ -67,9 +67,9 @@ public: virtual ~SvxUndoRedoControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; #endif diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 9581386c2de5..114accbba131 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -51,9 +51,9 @@ public: ~SvxLineStyleToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; void Update( const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; }; @@ -69,8 +69,8 @@ public: ~SvxLineWidthToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; }; @@ -86,9 +86,9 @@ public: ~SvxLineColorToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; void Update( const SfxPoolItem* pState ); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; }; @@ -116,16 +116,16 @@ private: void implInit(); protected: - virtual void Resizing( Size& rSize ); - virtual void Resize(); - virtual bool Close(); - virtual void PopupModeEnd(); + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; + virtual void PopupModeEnd() SAL_OVERRIDE; /** This function is called when the window gets the focus. It grabs the focus to the line ends value set so that it can be controlled with the keyboard. */ - virtual void GetFocus (void); + virtual void GetFocus (void) SAL_OVERRIDE; public: SvxLineEndWindow( sal_uInt16 nId, @@ -140,8 +140,8 @@ public: void StartSelection(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindow* Clone() const; + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindow* Clone() const SAL_OVERRIDE; }; @@ -156,9 +156,9 @@ public: ~SvxLineEndToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index 3bd049a76ed0..f9efa90b3f49 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -44,14 +44,14 @@ public: SvxXMeasurePreview(Window* pParent, WinBits nStyle); ~SvxXMeasurePreview(); - virtual void Paint(const Rectangle& rRect); - virtual void Resize(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual Size GetOptimalSize() const; + virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetAttributes( const SfxItemSet& rInAttrs ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; #endif diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx index 9990d8cff472..ca1129128b1f 100644 --- a/include/svx/modctrl.hxx +++ b/include/svx/modctrl.hxx @@ -34,9 +34,9 @@ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl { public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rUsrEvt ); - virtual void DoubleClick(); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rUsrEvt ) SAL_OVERRIDE; + virtual void DoubleClick() SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index c82c65ce05ab..f9e9ae6bf9ea 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -252,12 +252,12 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase BulletsTypeMgr(); BulletsTypeMgr(const BulletsTypeMgr& aTypeMgr); virtual ~BulletsTypeMgr() {} - virtual void Init(); - virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); - virtual bool IsCustomized(sal_uInt16 nIndex); + virtual void Init() SAL_OVERRIDE; + virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) SAL_OVERRIDE; + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) SAL_OVERRIDE; + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) SAL_OVERRIDE; + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) SAL_OVERRIDE; + virtual bool IsCustomized(sal_uInt16 nIndex) SAL_OVERRIDE; sal_Unicode GetBulChar(sal_uInt16 nIndex); Font GetBulCharFont(sal_uInt16 nIndex); static BulletsTypeMgr& GetInstance(); @@ -274,12 +274,12 @@ class SVX_DLLPUBLIC GraphyicBulletsTypeMgr: public NBOTypeMgrBase GraphyicBulletsTypeMgr(); GraphyicBulletsTypeMgr(const GraphyicBulletsTypeMgr& aTypeMgr); virtual ~GraphyicBulletsTypeMgr(); - virtual void Init(); - virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); - virtual bool IsCustomized(sal_uInt16 nIndex); + virtual void Init() SAL_OVERRIDE; + virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) SAL_OVERRIDE; + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) SAL_OVERRIDE; + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) SAL_OVERRIDE; + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) SAL_OVERRIDE; + virtual bool IsCustomized(sal_uInt16 nIndex) SAL_OVERRIDE; OUString GetGrfName(sal_uInt16 nIndex); static GraphyicBulletsTypeMgr& GetInstance(); }; @@ -295,12 +295,12 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase MixBulletsTypeMgr(); MixBulletsTypeMgr(const MixBulletsTypeMgr& aTypeMgr); virtual ~MixBulletsTypeMgr() {} - virtual void Init(); - virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); - virtual bool IsCustomized(sal_uInt16 nIndex); + virtual void Init() SAL_OVERRIDE; + virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) SAL_OVERRIDE; + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) SAL_OVERRIDE; + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) SAL_OVERRIDE; + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) SAL_OVERRIDE; + virtual bool IsCustomized(sal_uInt16 nIndex) SAL_OVERRIDE; static MixBulletsTypeMgr& GetInstance(); }; @@ -313,12 +313,12 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase NumberingTypeMgr(); NumberingTypeMgr(const NumberingTypeMgr& aTypeMgr); virtual ~NumberingTypeMgr(); - virtual void Init(); - virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); - virtual bool IsCustomized(sal_uInt16 nIndex); + virtual void Init() SAL_OVERRIDE; + virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) SAL_OVERRIDE; + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) SAL_OVERRIDE; + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) SAL_OVERRIDE; + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) SAL_OVERRIDE; + virtual bool IsCustomized(sal_uInt16 nIndex) SAL_OVERRIDE; static NumberingTypeMgr& GetInstance(); }; @@ -331,12 +331,12 @@ class SVX_DLLPUBLIC OutlineTypeMgr: public NBOTypeMgrBase OutlineTypeMgr(); OutlineTypeMgr(const OutlineTypeMgr& aTypeMgr); virtual ~OutlineTypeMgr() {} - virtual void Init(); - virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0); - virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF); - virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false); - virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false); - virtual bool IsCustomized(sal_uInt16 nIndex); + virtual void Init() SAL_OVERRIDE; + virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 mLevel,sal_uInt16 nFromIndex=0) SAL_OVERRIDE; + virtual bool RelplaceNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF) SAL_OVERRIDE; + virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) SAL_OVERRIDE; + virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) SAL_OVERRIDE; + virtual bool IsCustomized(sal_uInt16 nIndex) SAL_OVERRIDE; static OutlineTypeMgr& GetInstance(); }; }} diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index 820f466d1988..f0db983277cd 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -49,15 +49,15 @@ public: SvxNumberInfoItem( const SvxNumberInfoItem& ); ~SvxNumberInfoItem(); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; SvNumberFormatter* GetNumberFormatter() const { return pFormatter; } const OUString& GetValueString() const { return aStringVal; } diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index a9db528dbc08..0bd5efb9f559 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -70,7 +70,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet void init(sal_uInt16 nType); ~SvxNumValueSet(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; void SetHTMLMode(bool bSet) {bHTMLMode = bSet;} void SetNumberingSettings( @@ -108,7 +108,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet SvxBmpNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); ~SvxBmpNumValueSet(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; }; diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 049f632dce4c..259f4f4dbda5 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -84,10 +84,10 @@ public: SVX_DLLPUBLIC E3dObjList(const E3dObjList& rSrcList); SVX_DLLPUBLIC virtual ~E3dObjList(); - virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); - virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); - virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum); - virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum); + virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL) SAL_OVERRIDE; + virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL) SAL_OVERRIDE; + virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum) SAL_OVERRIDE; + virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum) SAL_OVERRIDE; }; /************************************************************************* @@ -107,7 +107,7 @@ private: friend class E3dDragMethod; protected: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; E3dObjList maSubList; // child objects @@ -137,24 +137,24 @@ protected: public: TYPEINFO_OVERRIDE(); - virtual void RecalcSnapRect(); - virtual void SetRectsDirty(bool bNotMyself = false); + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual void SetRectsDirty(bool bNotMyself = false) SAL_OVERRIDE; virtual ~E3dObject(); - virtual sal_uInt32 GetObjInventor() const; - virtual sal_uInt16 GetObjIdentifier() const; + virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; - virtual void NbcSetLayer(SdrLayerID nLayer); + virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE; - virtual void SetObjList(SdrObjList* pNewObjList); - virtual void SetPage(SdrPage* pNewPage); - virtual void SetModel(SdrModel* pNewModel); - virtual void NbcMove(const Size& rSize); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual SdrObjList* GetSubList() const; + virtual void SetObjList(SdrObjList* pNewObjList) SAL_OVERRIDE; + virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + virtual void NbcMove(const Size& rSize) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual SdrObjList* GetSubList() const SAL_OVERRIDE; // Insert 3D object into the group; transfer to other owner! virtual void Insert3DObj(E3dObject* p3DObj); @@ -178,21 +178,21 @@ public: // which is vertical to the screen, plus a shift of the scene. // This means that also the scene (E3dScene) must define this // routine as virtual in its class. - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; // get wireframe polygon for local object. No transform is applied. basegfx::B3DPolyPolygon CreateWireframe() const; // TakeObjName...() is for the display in the UI, for example "3 frames selected". - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; sal_uInt16 GetLogicalGroup() { return 0; } - virtual E3dObject* Clone() const; + virtual E3dObject* Clone() const SAL_OVERRIDE; E3dObject& operator=( const E3dObject& rObj ); - virtual SdrObjGeoData *NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData *NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; // get/set the selection bool GetSelected() const { return mbIsSelected; } @@ -223,7 +223,7 @@ private: friend class sdr::properties::E3dSphereProperties; protected: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; // material of the object Color aMaterialAmbientColor; @@ -245,9 +245,9 @@ public : E3dCompoundObject(E3dDefaultAttributes& rDefault); virtual ~E3dCompoundObject(); - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual sal_uInt32 GetHdlCount() const; - virtual void AddToHdlList(SdrHdlList& rHdlList) const; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual void AddToHdlList(SdrHdlList& rHdlList) const SAL_OVERRIDE; // DoubleSided: sal_True/FALSE bool GetDoubleSided() const @@ -298,15 +298,15 @@ public : bool GetReducedLineGeometry() const { return ((const Svx3DReducedLineGeometryItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)).GetValue(); } - virtual sal_uInt16 GetObjIdentifier() const; - virtual void RecalcSnapRect(); + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; // set/get parameters for geometry creation bool GetCreateNormals() const { return bCreateNormals; } bool GetCreateTexture() const { return bCreateTexture; } - virtual E3dCompoundObject* Clone() const; + virtual E3dCompoundObject* Clone() const SAL_OVERRIDE; // material of the object const Color& GetMaterialAmbientColor() const { return aMaterialAmbientColor; } diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx index 385e125a3c80..cc648b9cc134 100644 --- a/include/svx/ofaitem.hxx +++ b/include/svx/ofaitem.hxx @@ -34,8 +34,8 @@ public: OfaPtrItem( sal_uInt16 nWhich, void *pPtr ); OfaPtrItem( const OfaPtrItem& ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; void* GetValue() const { return pPtr; } void SetValue( void* pNewPtr ) { pPtr = pNewPtr; } @@ -55,11 +55,11 @@ public: OfaRefItem( const OfaRefItem& rItem ) : SfxPoolItem( rItem.Which() ), mxRef( rItem.mxRef ) {} - virtual bool operator==( const SfxPoolItem& rItem ) const + virtual bool operator==( const SfxPoolItem& rItem ) const SAL_OVERRIDE { return mxRef == ((OfaRefItem<reference_type> &)rItem).mxRef; } - virtual SfxPoolItem*Clone( SfxItemPool* /*pPool = 0*/ ) const + virtual SfxPoolItem*Clone( SfxItemPool* /*pPool = 0*/ ) const SAL_OVERRIDE { return new OfaRefItem( *this ); } diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 7128d1e4172f..15c3e666ef8d 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -82,13 +82,13 @@ public: SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){}; SvxGridItem( const SvxGridItem& pTestItem ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; @@ -104,11 +104,11 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); + virtual bool FillItemSet( SfxItemSet& rSet ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& rSet ) SAL_OVERRIDE; - virtual void ActivatePage( const SfxItemSet& rSet ); - virtual int DeactivatePage( SfxItemSet* pSet ); + virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE; + virtual int DeactivatePage( SfxItemSet* pSet ) SAL_OVERRIDE; private: CheckBox* pCbxUseGridsnap; diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx index 44e69a0d9293..7401b9153c6c 100644 --- a/include/svx/orienthelper.hxx +++ b/include/svx/orienthelper.hxx @@ -100,11 +100,11 @@ class SVX_DLLPUBLIC OrientStackedWrapper : public sfx::SingleControlWrapper< Ori public: explicit OrientStackedWrapper( OrientationHelper& rOrientHlp ); - virtual bool IsControlDontKnow() const; - virtual void SetControlDontKnow( bool bSet ); + virtual bool IsControlDontKnow() const SAL_OVERRIDE; + virtual void SetControlDontKnow( bool bSet ) SAL_OVERRIDE; - virtual bool GetControlValue() const; - virtual void SetControlValue( bool bValue ); + virtual bool GetControlValue() const SAL_OVERRIDE; + virtual void SetControlValue( bool bValue ) SAL_OVERRIDE; }; diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index 2d253328a4de..ebec43cf2d75 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -71,7 +71,7 @@ private: OUString aRightText; protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void DrawPage( const Point& rPoint, const bool bSecond, @@ -154,7 +154,7 @@ public: void ResetBackground(); - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_PAGECTRL_HXX diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx index adbbbbd8005f..7600c750a18a 100644 --- a/include/svx/pageitem.hxx +++ b/include/svx/pageitem.hxx @@ -72,18 +72,18 @@ public: SvxPageItem( const sal_uInt16 nId ); SvxPageItem( const SvxPageItem& rItem ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool operator==( const SfxPoolItem& ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; - virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; // orientation sal_uInt16 GetPageUsage() const { return eUse; } @@ -114,15 +114,15 @@ public: SvxSetItem( const SvxSetItem& rItem ); SvxSetItem( const sal_uInt16 nId, SfxItemSet* pSet ); - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index db1c498af86a..a67f6f07eeb4 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -62,8 +62,8 @@ private: Rectangle Lines[9]; protected: - virtual void Paint( const Rectangle& rRect ); - virtual Size GetOptimalSize() const; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void DrawParagraph( bool bAll ); @@ -79,7 +79,7 @@ public: void SetLastLine( SvxAdjust eNew ) { eLastLine = eNew; } void SetLineSpace( SvxPrevLineSpace eNew, sal_uInt16 nNew = 0 ) { eLine = eNew; nLineVal = nNew; } - void SetText( const OUString& rStr ) { aText = rStr; } + void SetText( const OUString& rStr ) SAL_OVERRIDE { aText = rStr; } void SetSize( Size aNew ) { aSize = aNew; } short GetFirstLineOfst() const { return nFirstLineOfst; } @@ -91,7 +91,7 @@ public: SvxPrevLineSpace GetLineEnum() const { return eLine; } sal_uInt16 GetLineValue() const { return nLineVal; } - OUString GetText() const { return aText; } + OUString GetText() const SAL_OVERRIDE { return aText; } Size GetSize() const { return aSize; } void Draw( bool bAll ) { DrawParagraph( bAll ); } diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx index 06a174067625..7ab73fef2450 100644 --- a/include/svx/polygn3d.hxx +++ b/include/svx/polygn3d.hxx @@ -36,7 +36,7 @@ private: SVX_DLLPRIVATE void CreateDefaultTexture(); protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; public: void SetPolyPolygon3D(const basegfx::B3DPolyPolygon& rNewPolyPoly3D); @@ -57,10 +57,10 @@ public: const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; } const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; } - virtual sal_uInt16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; - virtual E3dPolygonObj* Clone() const; + virtual E3dPolygonObj* Clone() const SAL_OVERRIDE; // LineOnly? bool GetLineOnly() { return bLineOnly; } diff --git a/include/svx/polysc3d.hxx b/include/svx/polysc3d.hxx index c7f76371fae0..8ff3fae3eac0 100644 --- a/include/svx/polysc3d.hxx +++ b/include/svx/polysc3d.hxx @@ -36,8 +36,8 @@ public: E3dPolyScene(); E3dPolyScene(E3dDefaultAttributes& rDefault); - virtual sal_uInt16 GetObjIdentifier() const; - virtual E3dPolyScene* Clone() const; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual E3dPolyScene* Clone() const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_POLYSC3D_HXX diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx index ac4c8c1e5eb5..8328b7cbe380 100644 --- a/include/svx/postattr.hxx +++ b/include/svx/postattr.hxx @@ -41,9 +41,9 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; inline SvxPostItAuthorItem& operator=( const SvxPostItAuthorItem& rAuthor ) { @@ -72,9 +72,9 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; inline SvxPostItDateItem& operator=( const SvxPostItDateItem& rDate ) { @@ -104,9 +104,9 @@ public: virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; inline SvxPostItTextItem& operator=( const SvxPostItTextItem& rText ) { diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx index 19956fdfe571..827a06a882c5 100644 --- a/include/svx/pszctrl.hxx +++ b/include/svx/pszctrl.hxx @@ -40,9 +40,9 @@ public: SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SvxPosSizeStatusBarControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; }; diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx index f841bbf3d3b0..9b9d72619f27 100644 --- a/include/svx/relfld.hxx +++ b/include/svx/relfld.hxx @@ -36,7 +36,7 @@ private: bool bNegativeEnabled; protected: - void Modify(); + void Modify() SAL_OVERRIDE; public: SvxRelativeField( Window* pParent, WinBits nBits); diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 276542747c8c..69082b8b247a 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -43,17 +43,17 @@ public: SvxRotateModeItem( const SvxRotateModeItem& rItem ); ~SvxRotateModeItem(); - virtual sal_uInt16 GetValueCount() const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual OUString GetValueText( sal_uInt16 nVal ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString& rText, const IntlWrapper * = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + OUString& rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index e6dc19bd990b..c9daaaa85811 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -43,7 +43,7 @@ class SvxRubyDialog; class RubyPreview : public Window { protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; SvxRubyDialog* m_pParentDlg; public: @@ -52,7 +52,7 @@ public: { m_pParentDlg = pParentDlg; } - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow @@ -69,8 +69,8 @@ class RubyEdit : public Edit { Link aScrollHdl; Link aJumpHdl; - virtual void GetFocus(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void GetFocus() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: RubyEdit(Window* pParent, const ResId& rResId) : Edit(pParent, rResId) @@ -143,7 +143,7 @@ class SvxRubyDialog : public SfxModelessDialog void AssertOneEntry(); void Update(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; long GetLastPos() const {return nLastPos;} void SetLastPos(long nSet) {nLastPos = nSet;} @@ -157,15 +157,15 @@ class SvxRubyDialog : public SfxModelessDialog void UpdateColors( void ); protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: SvxRubyDialog(SfxBindings *pBindings, SfxChildWindow *pCW, Window* pParent); virtual ~SvxRubyDialog(); - virtual void Activate(); - virtual void Deactivate(); + virtual void Activate() SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; }; #endif // INCLUDED_SVX_RUBYDIALOG_HXX diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index a3705fecf66d..b4c6515eecdc 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -210,15 +210,15 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener void UpdateParaContents_Impl(long lDiff, UpdateType = MOVE_ALL); protected: - virtual void Command( const CommandEvent& rCEvt ); - virtual void Click(); - virtual long StartDrag(); - virtual void Drag(); - virtual void EndDrag(); - virtual void ExtraDown(); - virtual void MouseMove( const MouseEvent& rMEvt ); - - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; + virtual long StartDrag() SAL_OVERRIDE; + virtual void Drag() SAL_OVERRIDE; + virtual void EndDrag() SAL_OVERRIDE; + virtual void ExtraDown() SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; virtual void Update(); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 6e5d0b5fd022..8f689d190257 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -31,17 +31,17 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem protected: - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; private: SVX_DLLPRIVATE const SvxLongLRSpaceItem& operator=(const SvxLongLRSpaceItem &); // n.i. @@ -65,17 +65,17 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem protected: - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; private: SVX_DLLPRIVATE const SvxLongULSpaceItem& operator=(const SvxLongULSpaceItem &); // n.i. @@ -98,17 +98,17 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem long lWidth; long lHeight; protected: - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual OUString GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; private: SVX_DLLPRIVATE const SvxPagePosSizeItem& operator=(const SvxPagePosSizeItem &); // n.i. @@ -159,7 +159,7 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem sal_uInt8 bOrtho; // evenly spread columns protected: - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; @@ -167,11 +167,11 @@ protected: SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString &rText, - const IntlWrapper * = 0 ) const; + const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -217,17 +217,17 @@ private: bool bLimits; /* boundary limit control by the application */ protected: - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual OUString GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; private: SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i. diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx index 23856f27cba7..eb19807f19fb 100644 --- a/include/svx/scene3d.hxx +++ b/include/svx/scene3d.hxx @@ -63,8 +63,8 @@ private: friend class sdr::properties::E3dSceneProperties; protected: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; // transformations B3dCamera aCameraSet; @@ -75,12 +75,12 @@ protected: // Flag to determine if only selected objects should be drawn bool bDrawOnlySelected : 1; - virtual void NewObjectInserted(const E3dObject* p3DObj); - virtual void StructureChanged(); + virtual void NewObjectInserted(const E3dObject* p3DObj) SAL_OVERRIDE; + virtual void StructureChanged() SAL_OVERRIDE; void RebuildLists(); - virtual void Notify(SfxBroadcaster &rBC, const SfxHint &rHint); + virtual void Notify(SfxBroadcaster &rBC, const SfxHint &rHint) SAL_OVERRIDE; protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); @@ -93,12 +93,12 @@ public: E3dScene(E3dDefaultAttributes& rDefault); virtual ~E3dScene(); - virtual void SetBoundRectDirty(); + virtual void SetBoundRectDirty() SAL_OVERRIDE; // access to cleanup of depth mapper void Cleanup3DDepthMapper() { ImpCleanup3DDepthMapper(); } - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; sal_uInt32 RemapOrdNum(sal_uInt32 nOrdNum) const; @@ -187,51 +187,51 @@ public: // set flag to draw only selected void SetDrawOnlySelected(bool bNew) { bDrawOnlySelected = bNew; } bool GetDrawOnlySelected() const { return bDrawOnlySelected; } - virtual sal_uInt16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcMove(const Size& rSize); + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcMove(const Size& rSize) SAL_OVERRIDE; virtual void NbcResize(const Point& rRef, const Fraction& rXFact, - const Fraction& rYFact); - virtual void RecalcSnapRect(); + const Fraction& rYFact) SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; - virtual E3dScene* GetScene() const; + virtual E3dScene* GetScene() const SAL_OVERRIDE; void SetCamera(const Camera3D& rNewCamera); const Camera3D& GetCamera() const { return aCamera; } void removeAllNonSelectedObjects(); - virtual E3dScene* Clone() const; + virtual E3dScene* Clone() const SAL_OVERRIDE; E3dScene& operator=(const E3dScene&); - virtual SdrObjGeoData *NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData *NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; - virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix); - virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix); + virtual void NbcSetTransform(const basegfx::B3DHomMatrix& rMatrix) SAL_OVERRIDE; + virtual void SetTransform(const basegfx::B3DHomMatrix& rMatrix) SAL_OVERRIDE; - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; void RotateScene(const Point& rRef, long nWink, double sn, double cs); // TakeObjName...() is for the display in the UI, for example "3 frames selected". - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; // get transformations B3dCamera& GetCameraSet() { return aCameraSet; } // break up - virtual bool IsBreakObjPossible(); + virtual bool IsBreakObjPossible() SAL_OVERRIDE; // polygon which is built during creation - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; // create moves - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); // true=Xor muss repainted werden - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; // true=Xor muss repainted werden + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SCENE3D_HXX diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx index c3eb49a0baa4..f333a1c9218a 100644 --- a/include/svx/sdangitm.hxx +++ b/include/svx/sdangitm.hxx @@ -32,15 +32,15 @@ public: SdrAngleItem(): SfxInt32Item() {} SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {} SdrAngleItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * - pIntlWrapper = 0) const; + pIntlWrapper = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index 778fb09f0fa0..0ea1eaba7ded 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -48,17 +48,17 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem SdrCustomShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion ); SVX_DLLPUBLIC ~SdrCustomShapeAdjustmentItem(); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = 0) const; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const; - virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; + + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; sal_uInt32 GetCount() const { return aAdjustmentValueList.size(); }; SVX_DLLPUBLIC const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const; diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 6fddcc05364c..992a0f397238 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -78,19 +78,19 @@ private: SdrCustomShapeGeometryItem( SvStream& rIn, sal_uInt16 nVersion ); ~SdrCustomShapeGeometryItem(); - virtual bool operator==( const SfxPoolItem& ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = 0) const; + OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; - virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const; - virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const SAL_OVERRIDE; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx index aba6846b789d..6bf82aa78943 100644 --- a/include/svx/sdgcoitm.hxx +++ b/include/svx/sdgcoitm.hxx @@ -37,8 +37,8 @@ public: SdrGrafRedItem( short nRedPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFRED, nRedPercent ) {} SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; }; @@ -54,8 +54,8 @@ public: SdrGrafGreenItem( short nGreenPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, nGreenPercent ) {} SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; }; @@ -71,8 +71,8 @@ public: SdrGrafBlueItem( short nBluePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, nBluePercent ) {} SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SDGCOITM_HXX diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx index bc0364ecc12b..fa59ed67c389 100644 --- a/include/svx/sdgcpitm.hxx +++ b/include/svx/sdgcpitm.hxx @@ -38,9 +38,9 @@ public: sal_uInt16 nWhichId = SDRATTR_GRAFCROP ) : SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, nWhichId ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SDGCPITM_HXX diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx index 3e0d24644794..b9be6315b0da 100644 --- a/include/svx/sdggaitm.hxx +++ b/include/svx/sdggaitm.hxx @@ -37,11 +37,11 @@ public: SdrGrafGamma100Item( sal_uIntPtr nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SDGGAITM_HXX diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx index a22b78126a77..8a1672d27f03 100644 --- a/include/svx/sdginitm.hxx +++ b/include/svx/sdginitm.hxx @@ -37,8 +37,8 @@ public: SdrGrafInvertItem( bool bInvert = false ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SDGINITM_HXX diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx index aa073498129f..20676668f2d7 100644 --- a/include/svx/sdgluitm.hxx +++ b/include/svx/sdgluitm.hxx @@ -37,8 +37,8 @@ public: SdrGrafLuminanceItem( short nLuminancePercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, nLuminancePercent ) {} SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; }; @@ -54,8 +54,8 @@ public: SdrGrafContrastItem( short nContrastPercent = 0 ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, nContrastPercent ) {} SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SDGLUITM_HXX diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx index 1bdb3d505a1b..52fc3396c1d7 100644 --- a/include/svx/sdgmoitm.hxx +++ b/include/svx/sdgmoitm.hxx @@ -38,16 +38,16 @@ public: SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {} SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); } - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString& rText, const IntlWrapper * = 0) const; + OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx index 88372f8544ff..3bc476930436 100644 --- a/include/svx/sdgtritm.hxx +++ b/include/svx/sdgtritm.hxx @@ -36,8 +36,8 @@ public: SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SDGTRITM_HXX diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx index 0a956f56980d..843c279f7add 100644 --- a/include/svx/sdmetitm.hxx +++ b/include/svx/sdmetitm.hxx @@ -34,15 +34,15 @@ public: SdrMetricItem(): SfxInt32Item() {} SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0): SfxInt32Item(nId,nVal) {} SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool HasMetrics() const; - virtual bool ScaleMetrics(long nMul, long nDiv); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; + virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString& rText, const IntlWrapper * = 0) const; + OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx index 6245237df99e..f22efee95453 100644 --- a/include/svx/sdooitm.hxx +++ b/include/svx/sdooitm.hxx @@ -34,12 +34,12 @@ public: SdrOnOffItem(): SfxBoolItem() {} SdrOnOffItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {} SdrOnOffItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual OUString GetValueTextByVal(sal_Bool bVal) const; + virtual OUString GetValueTextByVal(sal_Bool bVal) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx index 3e0dd6564493..d90e76a67552 100644 --- a/include/svx/sdprcitm.hxx +++ b/include/svx/sdprcitm.hxx @@ -35,10 +35,10 @@ public: SdrPercentItem(): SfxUInt16Item() {} SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {} SdrPercentItem(sal_uInt16 nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; @@ -53,10 +53,10 @@ public: SdrSignedPercentItem(): SfxInt16Item() {} SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {} SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {} - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const; + virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx index 847f855069ca..636315f1446f 100644 --- a/include/svx/sdr/animation/animationstate.hxx +++ b/include/svx/sdr/animation/animationstate.hxx @@ -63,7 +63,7 @@ namespace sdr virtual ~PrimitiveAnimation(); // execute event, from base class Event - virtual void Trigger(sal_uInt32 nTime); + virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; }; } // end of namespace animation } // end of namespace sdr diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 90f13245ba31..4a7b177e1cd0 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -116,7 +116,7 @@ namespace sdr SVX_DLLPUBLIC virtual ~Scheduler(); // From baseclass Timer, the timeout call - SVX_DLLPUBLIC virtual void Timeout(); + SVX_DLLPUBLIC virtual void Timeout() SAL_OVERRIDE; // get time sal_uInt32 GetTime(); diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 39ac83044e53..7489cfffe131 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -73,8 +73,8 @@ namespace sdr const SdrPage* mpProcessedPage; // Hierarchy access methods - virtual sal_uInt32 GetPaintObjectCount() const; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const; + virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; public: // basic constructor/destructor @@ -85,19 +85,19 @@ namespace sdr virtual ~ObjectContactOfObjListPainter(); // Process the whole displaying - virtual void ProcessDisplay(DisplayInfo& rDisplayInfo); + virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE; // VirtualDevice? Default is false - virtual bool isOutputToVirtualDevice() const; + virtual bool isOutputToVirtualDevice() const SAL_OVERRIDE; // recording MetaFile? Default is false - virtual bool isOutputToRecordingMetaFile() const; + virtual bool isOutputToRecordingMetaFile() const SAL_OVERRIDE; // pdf export? Default is false - virtual bool isOutputToPDFFile() const; + virtual bool isOutputToPDFFile() const SAL_OVERRIDE; // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. - virtual OutputDevice* TryToGetOutputDevice() const; + virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -118,8 +118,8 @@ namespace sdr SdrPageWeakRef mxStartPage; // Hierarchy access methods - virtual sal_uInt32 GetPaintObjectCount() const; - virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const; + virtual sal_uInt32 GetPaintObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetPaintObjectViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; public: // basic constructor @@ -133,7 +133,7 @@ namespace sdr const SdrPage* GetStartPage() const { return mxStartPage.get(); } // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. - virtual OutputDevice* TryToGetOutputDevice() const; + virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx index a11770d7d74b..0b1bf34a384d 100644 --- a/include/svx/sdr/contact/objectcontactofpageview.hxx +++ b/include/svx/sdr/contact/objectcontactofpageview.hxx @@ -59,75 +59,75 @@ namespace sdr // got invalidated by an ActionCanged() call. An active view needs to remember // this and take action on it. Default implementation directly calls back // triggerLazyInvalidate() which promptly handles the request - virtual void setLazyInvalidate(ViewObjectContact& rVOC); + virtual void setLazyInvalidate(ViewObjectContact& rVOC) SAL_OVERRIDE; // call this to support evtl. preparations for repaint - virtual void PrepareProcessDisplay(); + virtual void PrepareProcessDisplay() SAL_OVERRIDE; // From baseclass Timer, the timeout call triggered by te LazyInvalidate mechanism - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; // Process the whole displaying - virtual void ProcessDisplay(DisplayInfo& rDisplayInfo); + virtual void ProcessDisplay(DisplayInfo& rDisplayInfo) SAL_OVERRIDE; // test if visualizing of entered groups is switched on at all - virtual bool DoVisualizeEnteredGroup() const; + virtual bool DoVisualizeEnteredGroup() const SAL_OVERRIDE; // get active group's (the entered group) ViewContact - virtual const ViewContact* getActiveViewContact() const; + virtual const ViewContact* getActiveViewContact() const SAL_OVERRIDE; // Invalidate given rectangle at the window/output which is represented by // this ObjectContact. - virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const; + virtual void InvalidatePartOfView(const basegfx::B2DRange& rRange) const SAL_OVERRIDE; // Get info if given Rectangle is visible in this view - virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const; + virtual bool IsAreaVisible(const basegfx::B2DRange& rRange) const SAL_OVERRIDE; // Get info about the need to visualize GluePoints. The default // is that it is not necessary. - virtual bool AreGluePointsVisible() const; + virtual bool AreGluePointsVisible() const SAL_OVERRIDE; // check if text animation is allowed. - virtual bool IsTextAnimationAllowed() const; + virtual bool IsTextAnimationAllowed() const SAL_OVERRIDE; // check if graphic animation is allowed. - virtual bool IsGraphicAnimationAllowed() const; + virtual bool IsGraphicAnimationAllowed() const SAL_OVERRIDE; // check if asynchronious graphis loading is allowed. Default is sal_False. - virtual bool IsAsynchronGraphicsLoadingAllowed() const; + virtual bool IsAsynchronGraphicsLoadingAllowed() const SAL_OVERRIDE; // check if buffering of MasterPages is allowed. Default is sal_False. - virtual bool IsMasterPageBufferingAllowed() const; + virtual bool IsMasterPageBufferingAllowed() const SAL_OVERRIDE; // print? Default is false - virtual bool isOutputToPrinter() const; + virtual bool isOutputToPrinter() const SAL_OVERRIDE; // window? Default is true - virtual bool isOutputToWindow() const; + virtual bool isOutputToWindow() const SAL_OVERRIDE; // VirtualDevice? Default is false - virtual bool isOutputToVirtualDevice() const; + virtual bool isOutputToVirtualDevice() const SAL_OVERRIDE; // recording MetaFile? Default is false - virtual bool isOutputToRecordingMetaFile() const; + virtual bool isOutputToRecordingMetaFile() const SAL_OVERRIDE; // pdf export? Default is false - virtual bool isOutputToPDFFile() const; + virtual bool isOutputToPDFFile() const SAL_OVERRIDE; // gray display mode - virtual bool isDrawModeGray() const; + virtual bool isDrawModeGray() const SAL_OVERRIDE; // gray display mode - virtual bool isDrawModeBlackWhite() const; + virtual bool isDrawModeBlackWhite() const SAL_OVERRIDE; // high contrast display mode - virtual bool isDrawModeHighContrast() const; + virtual bool isDrawModeHighContrast() const SAL_OVERRIDE; // overloaded access to SdrPageView - virtual SdrPageView* TryToGetSdrPageView() const; + virtual SdrPageView* TryToGetSdrPageView() const SAL_OVERRIDE; // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. - virtual OutputDevice* TryToGetOutputDevice() const; + virtual OutputDevice* TryToGetOutputDevice() const SAL_OVERRIDE; /** sets all UNO controls which are associated with this ObjectContact to design or alive mode. diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index 9a0610b1debe..d46a8e5f44fe 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -52,7 +52,7 @@ namespace sdr protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // basic constructor, used from E3dObject. @@ -86,7 +86,7 @@ namespace sdr // This method is responsible for creating the graphical visualisation data derived ONLY from // the model data. The default implementation will try to create a 3D to 2D embedding (will work // when scene is known) which can then be used for 2D processing concerning ranges - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: // access to the local primitive without the object's local 3D transform. This is e.g. needed diff --git a/include/svx/sdr/contact/viewcontactofe3dcube.hxx b/include/svx/sdr/contact/viewcontactofe3dcube.hxx index 4aa9b34013cc..323df6d10a00 100644 --- a/include/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dcube.hxx @@ -49,7 +49,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx index 8ae3a8cebe09..4e7647167a92 100644 --- a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx @@ -49,7 +49,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx index cfcb59e02369..572837f069e0 100644 --- a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx @@ -49,7 +49,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx index 49c750e332a5..e0ee21118602 100644 --- a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx @@ -49,7 +49,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx index db21a6c8c849..bd48cbdaf227 100644 --- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx @@ -48,7 +48,7 @@ namespace sdr // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. Default is to create // a standard ViewObjectContact containing the given ObjectContact and *this - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // basic constructor, used from SdrObject. @@ -61,7 +61,7 @@ namespace sdr } // React on changes of the object of this ViewContact - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; // access to ViewInformation3D and ObjectTransformation const drawinglayer::geometry::ViewInformation3D& getViewInformation3D(const ::basegfx::B3DRange& rContentRange) const; @@ -102,7 +102,7 @@ namespace sdr // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx index 3059bea07b24..01e0d4204948 100644 --- a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx @@ -49,7 +49,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data which is // stored in the local primitive list. Default creates a yellow replacement rectangle. - virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const; + virtual drawinglayer::primitive3d::Primitive3DSequence createViewIndependentPrimitive3DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofgraphic.hxx b/include/svx/sdr/contact/viewcontactofgraphic.hxx index 519dede43d8a..b6f25e0650b3 100644 --- a/include/svx/sdr/contact/viewcontactofgraphic.hxx +++ b/include/svx/sdr/contact/viewcontactofgraphic.hxx @@ -50,7 +50,7 @@ namespace sdr protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // access to SdrObject @@ -73,7 +73,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofgroup.hxx b/include/svx/sdr/contact/viewcontactofgroup.hxx index da388004f837..4ed308ca4eb0 100644 --- a/include/svx/sdr/contact/viewcontactofgroup.hxx +++ b/include/svx/sdr/contact/viewcontactofgroup.hxx @@ -39,7 +39,7 @@ namespace sdr // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. Default is to create // a standard ViewObjectContact containing the given ObjectContact and *this - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; // internal access to SdrObject SdrObjGroup& GetSdrObjGroup() const @@ -55,7 +55,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx index b52926738b99..e2f62c4b50e3 100644 --- a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx @@ -44,10 +44,10 @@ namespace sdr sdr::MasterPageDescriptor& mrMasterPageDescriptor; // Create a Object-Specific ViewObjectContact - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: // basic constructor @@ -63,9 +63,9 @@ namespace sdr } // Access to possible sub-hierarchy and parent - virtual sal_uInt32 GetObjectCount() const; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const; - virtual ViewContact* GetParentContact() const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + virtual ViewContact* GetParentContact() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofopenglobj.hxx b/include/svx/sdr/contact/viewcontactofopenglobj.hxx index 6b48e665f884..550813857422 100644 --- a/include/svx/sdr/contact/viewcontactofopenglobj.hxx +++ b/include/svx/sdr/contact/viewcontactofopenglobj.hxx @@ -24,9 +24,9 @@ public: virtual ~ViewContactOfOpenGLObj(); protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // namespace contact diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx index d2d1505060ca..60fc63d505d3 100644 --- a/include/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx @@ -40,17 +40,17 @@ namespace sdr protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; // create graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: // basic constructor, used from SdrObject. explicit ViewContactOfPageObj(SdrPageObj& rPageObj); virtual ~ViewContactOfPageObj(); // #WIP# React on changes of the object of this ViewContact - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; // access to SdrObject SdrPageObj& GetPageObj() const diff --git a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx index 2100d827d7dd..d201b8957fb5 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx @@ -50,7 +50,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx index 5e5c68d3caaf..919b438436e6 100644 --- a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx @@ -50,7 +50,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx index a83b48257e49..496f34a99450 100644 --- a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx @@ -50,7 +50,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx index 7fc3e8f532a4..4981e1970945 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx @@ -50,7 +50,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index a51edca45ad1..67e5294aa973 100644 --- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx @@ -63,7 +63,7 @@ namespace sdr // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; // get notified if some properties have changed virtual void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); @@ -71,7 +71,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx index 9b1d2b0c5e49..bbf2c99df40d 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx @@ -51,7 +51,7 @@ namespace sdr // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // access to SdrObject @@ -65,26 +65,26 @@ namespace sdr virtual ~ViewContactOfSdrObj(); // Access to possible sub-hierarchy - virtual sal_uInt32 GetObjectCount() const; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const; - virtual ViewContact* GetParentContact() const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; + virtual ViewContact* GetParentContact() const SAL_OVERRIDE; // React on changes of the object of this ViewContact - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; // overload for acessing the SdrObject - virtual SdrObject* TryToGetSdrObject() const; + virtual SdrObject* TryToGetSdrObject() const SAL_OVERRIDE; // primitive stuff // add Gluepoints (if available) - virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createGluePointPrimitive2DSequence() const SAL_OVERRIDE; // allow embedding if needed (e.g. for SdrObjects, evtl. Name, Title and description get added). This // is a helper normally used from getViewIndependentPrimitive2DSequence(), but there is one exception // for 3D scenes - virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const; + virtual drawinglayer::primitive2d::Primitive2DSequence embedToObjectSpecificInformation(const drawinglayer::primitive2d::Primitive2DSequence& rSource) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx index f4845e8411f9..60142ff65db7 100644 --- a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx @@ -53,7 +53,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx index 56b5d4007abf..cd8e2903dec8 100644 --- a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx @@ -44,7 +44,7 @@ namespace sdr protected: // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // access to SdrOle2Obj @@ -67,12 +67,12 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceWithParameters() const; // #i123539# get rid of buffered chart content (if there) on change - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data, just wraps to call createPrimitive2DSequenceWithParameters(false) - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrpage.hxx b/include/svx/sdr/contact/viewcontactofsdrpage.hxx index 29a86a31c826..3be8aec6952b 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpage.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrpage.hxx @@ -46,7 +46,7 @@ namespace sdr explicit ViewContactOfPageSubObject(ViewContactOfSdrPage& rParentViewContactOfSdrPage); virtual ~ViewContactOfPageSubObject(); - virtual ViewContact* GetParentContact() const; + virtual ViewContact* GetParentContact() const SAL_OVERRIDE; const SdrPage& getPage() const; }; } // end of namespace contact @@ -61,8 +61,8 @@ namespace sdr class ViewContactOfPageBackground : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfPageBackground(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -80,8 +80,8 @@ namespace sdr class ViewContactOfPageShadow : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfPageShadow(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -99,8 +99,8 @@ namespace sdr class ViewContactOfPageFill : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfPageFill(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -118,8 +118,8 @@ namespace sdr class ViewContactOfMasterPage : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfMasterPage(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -137,8 +137,8 @@ namespace sdr class ViewContactOfOuterPageBorder : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfOuterPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -156,8 +156,8 @@ namespace sdr class ViewContactOfInnerPageBorder : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfInnerPageBorder(ViewContactOfSdrPage& rParentViewContactOfSdrPage); @@ -175,15 +175,15 @@ namespace sdr class ViewContactOfPageHierarchy : public ViewContactOfPageSubObject { protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: explicit ViewContactOfPageHierarchy(ViewContactOfSdrPage& rParentViewContactOfSdrPage); virtual ~ViewContactOfPageHierarchy(); - virtual sal_uInt32 GetObjectCount() const; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -200,8 +200,8 @@ namespace sdr // bitfield bool mbFront : 1; - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: ViewContactOfGrid(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront); @@ -224,8 +224,8 @@ namespace sdr // bitfield bool mbFront : 1; - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; public: ViewContactOfHelplines(ViewContactOfSdrPage& rParentViewContactOfSdrPage, bool bFront); @@ -265,7 +265,7 @@ namespace sdr // Create a Object-Specific ViewObjectContact, set ViewContact and // ObjectContact. Always needs to return something. Default is to create // a standard ViewObjectContact containing the given ObjectContact and *this - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact(ObjectContact& rObjectContact) SAL_OVERRIDE; public: // access to SdrObject @@ -279,19 +279,19 @@ namespace sdr virtual ~ViewContactOfSdrPage(); // Access to possible sub-hierarchy - virtual sal_uInt32 GetObjectCount() const; - virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; + virtual ViewContact& GetViewContact(sal_uInt32 nIndex) const SAL_OVERRIDE; // React on changes of the object of this ViewContact - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; // overload for acessing the SdrPage - virtual SdrPage* TryToGetSdrPage() const; + virtual SdrPage* TryToGetSdrPage() const SAL_OVERRIDE; protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx index 0a7b75ad5f74..daa37db432ee 100644 --- a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx @@ -50,7 +50,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx index 51fae3e1b1dc..88ddf4615d6b 100644 --- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx @@ -50,7 +50,7 @@ namespace sdr protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewcontactofunocontrol.hxx b/include/svx/sdr/contact/viewcontactofunocontrol.hxx index 7c180cfa81a3..84378f2ce8cc 100644 --- a/include/svx/sdr/contact/viewcontactofunocontrol.hxx +++ b/include/svx/sdr/contact/viewcontactofunocontrol.hxx @@ -70,7 +70,7 @@ namespace sdr { namespace contact { getTemporaryControlForWindow( const Window& _rWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _inout_ControlContainer ) const; protected: - virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ); + virtual ViewObjectContact& CreateObjectSpecificViewObjectContact( ObjectContact& _rObjectContact ) SAL_OVERRIDE; private: ViewContactOfUnoControl(); // never implemented @@ -80,7 +80,7 @@ namespace sdr { namespace contact { protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx index 8ec989e9f8e9..dd8eb218e5a6 100644 --- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx @@ -45,12 +45,12 @@ namespace sdr virtual ~ViewContactOfVirtObj(); // Access to possible sub-hierarchy - virtual sal_uInt32 GetObjectCount() const; + virtual sal_uInt32 GetObjectCount() const SAL_OVERRIDE; protected: // This method is responsible for creating the graphical visualisation data // ONLY based on model data - virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence createViewIndependentPrimitive2DSequence() const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx index 49997367aee6..306798bcc416 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx @@ -53,7 +53,7 @@ namespace sdr // also overload the 2d method to deliver a 2d object with embedd3d 3d and the 3d transformation which is able to // answer the get2DRange question accordingly - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfE3d(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx index be505f326b57..b25e161dd613 100644 --- a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // 2d primitive creator - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: // basic constructor. @@ -42,7 +42,7 @@ namespace sdr // process this primitive: Eventually also recursively travel an existing hierarchy, // e.g. for group objects, scenes or pages. This method will test geometrical visibility. - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx index 7072b9bbaab5..7c1a6709f9c8 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx @@ -57,7 +57,7 @@ namespace sdr SdrGrafObj& getSdrGrafObj(); // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfGraphic(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx index 2419c4c3b9f8..556aa37e12cc 100644 --- a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx @@ -39,10 +39,10 @@ namespace sdr virtual ~ViewObjectContactOfGroup(); // This method recursively paints the draw hierarchy. - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; private: - virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const; + virtual bool isPrimitiveVisibleOnAnyLayer(const SetOfByte& aLayers) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 7d7bab75110f..2cae0aa7833a 100644 --- a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx @@ -44,8 +44,8 @@ namespace sdr // access to MasterPageDescriptor sdr::MasterPageDescriptor& GetMasterPageDescriptor() const; - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 2e489e758edf..1074ce651f03 100644 --- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx @@ -47,7 +47,7 @@ namespace sdr // This method is responsible for creating the graphical visualisation data which is // stored/cached in the local primitive. // This method will not handle included hierarchies and not check geometric visibility. - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageObj(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index fdf64e887dc1..45cd0d993036 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx @@ -50,7 +50,7 @@ namespace sdr ViewObjectContactOfSdrObj(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfSdrObj(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; /** retrieves the device which a PageView belongs to, starting from its ObjectContactOfPageView diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 5b03e267c5c6..01acfabbb507 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx @@ -38,7 +38,7 @@ namespace sdr const SdrOle2Obj& getSdrOle2Object() const; // This method is responsible for creating the graphical visualisation data - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfSdrOle2Obj(ObjectContact& rObjectContact, ViewContact& rViewContact); diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx index 3a81301bb2b3..59ffc2b513d0 100644 --- a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx @@ -42,8 +42,8 @@ namespace sdr ViewObjectContactOfPageSubObject(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageSubObject(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; - virtual bool isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; + virtual bool isPrimitiveGhosted(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -57,13 +57,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageBackground : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageBackground(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageBackground(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -81,7 +81,7 @@ namespace sdr ViewObjectContactOfMasterPage(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfMasterPage(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -95,13 +95,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageFill : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageFill(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageFill(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -118,7 +118,7 @@ namespace sdr ViewObjectContactOfPageShadow(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageShadow(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -135,7 +135,7 @@ namespace sdr ViewObjectContactOfOuterPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfOuterPageBorder(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -152,7 +152,7 @@ namespace sdr ViewObjectContactOfInnerPageBorder(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfInnerPageBorder(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -169,7 +169,7 @@ namespace sdr ViewObjectContactOfPageHierarchy(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageHierarchy(); - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -183,13 +183,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageGrid : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageGrid(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageGrid(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -203,13 +203,13 @@ namespace sdr class SVX_DLLPUBLIC ViewObjectContactOfPageHelplines : public ViewObjectContactOfPageSubObject { protected: - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; public: ViewObjectContactOfPageHelplines(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfPageHelplines(); - virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; + virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr @@ -226,7 +226,7 @@ namespace sdr ViewObjectContactOfSdrPage(ObjectContact& rObjectContact, ViewContact& rViewContact); virtual ~ViewObjectContactOfSdrPage(); - virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequenceHierarchy(DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; }; } // end of namespace contact } // end of namespace sdr diff --git a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index 8194d1c91c73..23f9daa1adaf 100644 --- a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -81,7 +81,7 @@ namespace sdr { namespace contact { /** React on changes of the object of this ViewContact */ - virtual void ActionChanged(); + virtual void ActionChanged() SAL_OVERRIDE; /** to be called when any aspect of the control which requires view updates changed */ @@ -92,10 +92,10 @@ namespace sdr { namespace contact { ~ViewObjectContactOfUnoControl(); // support for Primitive2D - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; // visibility check - virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const; + virtual bool isPrimitiveVisible( const DisplayInfo& _rDisplayInfo ) const SAL_OVERRIDE; /// to be called when any aspect of the control which requires view updates changed void impl_onControlChangedOrModified(); @@ -119,7 +119,7 @@ namespace sdr { namespace contact { UnoControlPrintOrPreviewContact( const UnoControlPrintOrPreviewContact& ); // never implemented UnoControlPrintOrPreviewContact& operator=( const UnoControlPrintOrPreviewContact& ); // never implemented - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const; + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo ) const SAL_OVERRIDE; }; diff --git a/include/svx/sdr/event/eventhandler.hxx b/include/svx/sdr/event/eventhandler.hxx index 3ab923e9ee94..36b27a1a3d1e 100644 --- a/include/svx/sdr/event/eventhandler.hxx +++ b/include/svx/sdr/event/eventhandler.hxx @@ -117,7 +117,7 @@ namespace sdr virtual ~TimerEventHandler(); // The timer when it is triggered; from class Timer - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; // reset the timer void Restart(); diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index 57605a4e165e..539f074c6b64 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -54,7 +54,7 @@ namespace sdr bool mbOverlayState : 1; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayAnimatedBitmapEx( @@ -83,7 +83,7 @@ namespace sdr // execute event from base class ::sdr::animation::Event. Default // implementation does nothing and does not create a new event. - virtual void Trigger(sal_uInt32 nTime); + virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; // get shearX and rotation double getShearX() const { return mfShearX; } diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx index 13feeec1eb1b..bd8a779183da 100644 --- a/include/svx/sdr/overlay/overlaybitmapex.hxx +++ b/include/svx/sdr/overlay/overlaybitmapex.hxx @@ -44,7 +44,7 @@ namespace sdr double mfShearX; double mfRotation; - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayBitmapEx( diff --git a/include/svx/sdr/overlay/overlaycrosshair.hxx b/include/svx/sdr/overlay/overlaycrosshair.hxx index 10625aa8c198..e9a70a7e234d 100644 --- a/include/svx/sdr/overlay/overlaycrosshair.hxx +++ b/include/svx/sdr/overlay/overlaycrosshair.hxx @@ -32,14 +32,14 @@ namespace sdr { protected: // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: explicit OverlayCrosshairStriped(const basegfx::B2DPoint& rBasePos); virtual ~OverlayCrosshairStriped(); // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayhelpline.hxx b/include/svx/sdr/overlay/overlayhelpline.hxx index 3eff8fee6aa9..2e3bc1640ae7 100644 --- a/include/svx/sdr/overlay/overlayhelpline.hxx +++ b/include/svx/sdr/overlay/overlayhelpline.hxx @@ -36,7 +36,7 @@ namespace sdr SdrHelpLineKind meKind; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: explicit OverlayHelplineStriped( @@ -48,7 +48,7 @@ namespace sdr SdrHelpLineKind getKind() const { return meKind; } // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayline.hxx b/include/svx/sdr/overlay/overlayline.hxx index 4561a2bafe75..65b7bb58fc54 100644 --- a/include/svx/sdr/overlay/overlayline.hxx +++ b/include/svx/sdr/overlay/overlayline.hxx @@ -35,7 +35,7 @@ namespace sdr basegfx::B2DPoint maSecondPosition; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayLineStriped( @@ -47,7 +47,7 @@ namespace sdr const basegfx::B2DPoint& getSecondPosition() const { return maSecondPosition; } // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index a2ab50d79122..b5c7c7bbe585 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -138,8 +138,8 @@ namespace sdr void InsertEvent(sdr::animation::Event* pNew) { Scheduler::InsertEvent(pNew); } - virtual oslInterlockedCount SAL_CALL acquire(); - virtual oslInterlockedCount SAL_CALL release(); + virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx index 6e219193f62c..2db2cf1da96f 100644 --- a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx +++ b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx @@ -71,19 +71,19 @@ namespace sdr bool bRefreshWithPreRendering = false); // complete redraw - virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const; + virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const SAL_OVERRIDE; // flush. Do buffered updates. - virtual void flush(); + virtual void flush() SAL_OVERRIDE; // #i68597# part of content gets copied, react on it - virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize); + virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize) SAL_OVERRIDE; // restore part of background. Implemented form buffered versions only. - virtual void restoreBackground(const Region& rRegion) const; + virtual void restoreBackground(const Region& rRegion) const SAL_OVERRIDE; // invalidate the given range at local OutputDevice - virtual void invalidateRange(const basegfx::B2DRange& rRange); + virtual void invalidateRange(const basegfx::B2DRange& rRange) SAL_OVERRIDE; // access to RefreshWithPreRendering Flag bool DoRefreshWithPreRendering() const { return mbRefreshWithPreRendering; } diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx index e4effa946efa..130c3406d50d 100644 --- a/include/svx/sdr/overlay/overlayobject.hxx +++ b/include/svx/sdr/overlay/overlayobject.hxx @@ -151,7 +151,7 @@ namespace sdr // execute event from base class ::sdr::animation::Event. Default // implementation does nothing and does not create a new event. - virtual void Trigger(sal_uInt32 nTime); + virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; // acces to AllowsAnimation flag bool allowsAnimation() const { return mbAllowsAnimation; } diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx index 75c334b974c5..baf5ced3b878 100644 --- a/include/svx/sdr/overlay/overlayobjectcell.hxx +++ b/include/svx/sdr/overlay/overlayobjectcell.hxx @@ -45,7 +45,7 @@ namespace sdr RangeVector maRectangles; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayObjectCell( CellOverlayType eType, const Color& rColor, const RangeVector& rRects); diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx index c5f3d08376de..b51477b2969c 100644 --- a/include/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx @@ -37,7 +37,7 @@ namespace sdr basegfx::B2DPolyPolygon maLinePolyPolygon; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: explicit OverlayPolyPolygonStripedAndFilled( @@ -49,7 +49,7 @@ namespace sdr void setLinePolyPolygon(const basegfx::B2DPolyPolygon& rNew); // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index f888e480a0cf..e500bf89ca8e 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -37,7 +37,7 @@ namespace sdr const drawinglayer::primitive2d::Primitive2DSequence maSequence; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; private: // internal helper to create a drawinglayer::geometry::ViewInformation2D diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/include/svx/sdr/overlay/overlayrectangle.hxx index cdb49c174274..7279a11bea0e 100644 --- a/include/svx/sdr/overlay/overlayrectangle.hxx +++ b/include/svx/sdr/overlay/overlayrectangle.hxx @@ -47,7 +47,7 @@ namespace sdr bool mbOverlayState : 1; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayRectangle( @@ -72,7 +72,7 @@ namespace sdr // execute event from base class ::sdr::animation::Event. Default // implementation does nothing and does not create a new event. - virtual void Trigger(sal_uInt32 nTime); + virtual void Trigger(sal_uInt32 nTime) SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx index 0f7399a84762..2d7748e8d013 100644 --- a/include/svx/sdr/overlay/overlayrollingrectangle.hxx +++ b/include/svx/sdr/overlay/overlayrollingrectangle.hxx @@ -42,7 +42,7 @@ namespace sdr bool mbShowBounds : 1; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayRollingRectangleStriped( @@ -63,7 +63,7 @@ namespace sdr bool getShowBounds() const { return mbShowBounds; } // react on stripe definition change - virtual void stripeDefinitionHasChanged(); + virtual void stripeDefinitionHasChanged() SAL_OVERRIDE; }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index c4ab9a345ff5..1e4c136d7c00 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -56,7 +56,7 @@ namespace sdr bool mbBorder : 1; // geometry creation for OverlayObject, can use local *Last* values - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlaySelection( @@ -72,7 +72,7 @@ namespace sdr bool getBorder() const { return mbBorder; } // overloaded to check conditions for last createOverlayObjectPrimitive2DSequence - virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const; + virtual drawinglayer::primitive2d::Primitive2DSequence getOverlayObjectPrimitive2DSequence() const SAL_OVERRIDE; // data write access void setRanges(const std::vector< basegfx::B2DRange >& rNew); diff --git a/include/svx/sdr/overlay/overlaytools.hxx b/include/svx/sdr/overlay/overlaytools.hxx index 85b0c0b1732e..3dab6a607f75 100644 --- a/include/svx/sdr/overlay/overlaytools.hxx +++ b/include/svx/sdr/overlay/overlaytools.hxx @@ -51,7 +51,7 @@ namespace drawinglayer double mfRotation; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayBitmapExPrimitive( @@ -71,7 +71,7 @@ namespace drawinglayer double getRotation() const { return mfRotation; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; @@ -96,7 +96,7 @@ namespace drawinglayer double mfDiscreteDashLength; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayCrosshairPrimitive( @@ -112,7 +112,7 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; @@ -144,7 +144,7 @@ namespace drawinglayer double mfRotation; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayRectanglePrimitive( @@ -164,7 +164,7 @@ namespace drawinglayer double getRotation() const { return mfRotation; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; @@ -200,7 +200,7 @@ namespace drawinglayer double mfDiscreteDashLength; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayHelplineStripedPrimitive( @@ -218,7 +218,7 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; @@ -245,7 +245,7 @@ namespace drawinglayer double mfDiscreteDashLength; protected: - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; public: OverlayRollingRectanglePrimitive( @@ -261,7 +261,7 @@ namespace drawinglayer double getDiscreteDashLength() const { return mfDiscreteDashLength; } // compare operator - virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; + virtual bool operator==( const BasePrimitive2D& rPrimitive ) const SAL_OVERRIDE; DeclPrimitive2DIDBlock() }; diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx index 4f7b29b95c31..30b7dd02b4e7 100644 --- a/include/svx/sdr/overlay/overlaytriangle.hxx +++ b/include/svx/sdr/overlay/overlaytriangle.hxx @@ -36,7 +36,7 @@ namespace sdr basegfx::B2DPoint maThirdPosition; // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence(); + virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence() SAL_OVERRIDE; public: OverlayTriangle( diff --git a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx index dc2840109bec..02d11c4ebf72 100644 --- a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx @@ -45,7 +45,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrCaptionPrimitive2D( @@ -56,7 +56,7 @@ namespace drawinglayer double fCornerRadiusY = 0.0); // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // data access const ::basegfx::B2DHomMatrix& getTransform() const { return maTransform; } diff --git a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 45c382517711..36591ed8bde7 100644 --- a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx @@ -41,7 +41,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrConnectorPrimitive2D( @@ -53,7 +53,7 @@ namespace drawinglayer const ::basegfx::B2DPolygon& getUnitPolygon() const { return maUnitPolygon; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index 4ef0090978a2..ccdc4a2c9265 100644 --- a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx @@ -54,7 +54,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrCustomShapePrimitive2D( @@ -74,7 +74,7 @@ namespace drawinglayer bool isForceTextClipToTextRange() const { return mbForceTextClipToTextRange; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx index 4d133cb57931..39f7c16bfd58 100644 --- a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx @@ -41,7 +41,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrEllipsePrimitive2D( @@ -53,7 +53,7 @@ namespace drawinglayer const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -79,7 +79,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrEllipseSegmentPrimitive2D( @@ -97,7 +97,7 @@ namespace drawinglayer bool getCloseUsingCenter() const { return mbCloseUsingCenter; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx index fafa633a843f..b1a9bd564236 100644 --- a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx @@ -44,7 +44,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrGrafPrimitive2D( @@ -61,7 +61,7 @@ namespace drawinglayer bool isTransparent() const; // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 39783b1e487e..67177c7c814d 100644 --- a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx @@ -76,7 +76,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrMeasurePrimitive2D( @@ -110,7 +110,7 @@ namespace drawinglayer bool getTextAutoAngle() const { return mbTextAutoAngle; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx index cbab4e6b7534..888d1c770d80 100644 --- a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx @@ -52,10 +52,10 @@ namespace drawinglayer const attribute::SdrLineFillShadowTextAttribute& getSdrLFSTAttribute() const { return maSdrLFSTAttribute; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // local decomposition. - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx index 3215c6f375d7..c2394e827e83 100644 --- a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx @@ -48,7 +48,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrOleContentPrimitive2D( @@ -58,10 +58,10 @@ namespace drawinglayer ); // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // The default implementation will use getDecomposition results to create the range - virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const; + virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; // data access const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; } diff --git a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx index d5bf6d35769a..ce8bd26de582 100644 --- a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx @@ -43,7 +43,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrPathPrimitive2D( @@ -57,7 +57,7 @@ namespace drawinglayer const basegfx::B2DPolyPolygon& getUnitPolyPolygon() const { return maUnitPolyPolygon; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx index 4082b446ab51..0c7453377d81 100644 --- a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx @@ -47,7 +47,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrRectanglePrimitive2D( @@ -66,7 +66,7 @@ namespace drawinglayer bool getForceFillForHitTest() const { return mbForceFillForHitTest; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index 45a48d771d58..650002181201 100644 --- a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -90,11 +90,11 @@ namespace drawinglayer const OutlinerParaObject& getOutlinerParaObject() const { return maOutlinerParaObject; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // own get2DDecomposition to take aspect of decomposition with or without spell checker // into account - virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; + virtual Primitive2DSequence get2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const SAL_OVERRIDE; // transformed clone operator virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const = 0; @@ -119,7 +119,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrContourTextPrimitive2D( @@ -133,10 +133,10 @@ namespace drawinglayer const basegfx::B2DHomMatrix& getObjectTransform() const { return maObjectTransform; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -161,7 +161,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrPathTextPrimitive2D( @@ -175,10 +175,10 @@ namespace drawinglayer const attribute::SdrFormTextAttribute& getSdrFormTextAttribute() const { return maSdrFormTextAttribute; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -211,7 +211,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrBlockTextPrimitive2D( @@ -237,10 +237,10 @@ namespace drawinglayer bool getClipOnBounds() const { return mbClipOnBounds; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -265,7 +265,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrStretchTextPrimitive2D( @@ -279,10 +279,10 @@ namespace drawinglayer bool isFixedCellHeight() const { return mbFixedCellHeight; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() @@ -306,7 +306,7 @@ namespace drawinglayer protected: // local decomposition. - virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const; + virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const SAL_OVERRIDE; public: SdrAutoFitTextPrimitive2D( @@ -320,10 +320,10 @@ namespace drawinglayer bool getWordWrap() const { return mbWordWrap; } // compare operator - virtual bool operator==(const BasePrimitive2D& rPrimitive) const; + virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; // transformed clone operator - virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const; + virtual SdrTextPrimitive2D* createTransformedClone(const ::basegfx::B2DHomMatrix& rTransform) const SAL_OVERRIDE; // provide unique ID DeclPrimitive2DIDBlock() diff --git a/include/svx/sdr/properties/attributeproperties.hxx b/include/svx/sdr/properties/attributeproperties.hxx index 00957837b3ca..a14b63407ebc 100644 --- a/include/svx/sdr/properties/attributeproperties.hxx +++ b/include/svx/sdr/properties/attributeproperties.hxx @@ -44,13 +44,13 @@ namespace sdr SfxStyleSheet* mpStyleSheet; // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& pPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& pPool) SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -60,31 +60,31 @@ namespace sdr AttributeProperties(const AttributeProperties& rProps, SdrObject& rObj); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // destructor virtual ~AttributeProperties(); // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; // Set new model. - virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel); + virtual void SetModel(SdrModel* pOldModel, SdrModel* pNewModel) SAL_OVERRIDE; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes(); + virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; // This is the Notify(...) from 2nd base class SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; - virtual bool isUsedByModel() const; + virtual bool isUsedByModel() const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/captionproperties.hxx b/include/svx/sdr/properties/captionproperties.hxx index 609546741c79..b93653b36cf7 100644 --- a/include/svx/sdr/properties/captionproperties.hxx +++ b/include/svx/sdr/properties/captionproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~CaptionProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/circleproperties.hxx b/include/svx/sdr/properties/circleproperties.hxx index 63b95089a073..4a8087d81d55 100644 --- a/include/svx/sdr/properties/circleproperties.hxx +++ b/include/svx/sdr/properties/circleproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~CircleProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/connectorproperties.hxx b/include/svx/sdr/properties/connectorproperties.hxx index 3b86c026d161..d05391aebb7b 100644 --- a/include/svx/sdr/properties/connectorproperties.hxx +++ b/include/svx/sdr/properties/connectorproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,10 +48,10 @@ namespace sdr virtual ~ConnectorProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx index f28c90f9a893..95d725ec647e 100644 --- a/include/svx/sdr/properties/customshapeproperties.hxx +++ b/include/svx/sdr/properties/customshapeproperties.hxx @@ -35,36 +35,36 @@ namespace sdr protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; // react on Item change - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem) SAL_OVERRIDE; // Called after ItemChange() is done for all items. Allows local reactions on // specific item changes - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; public: // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; // basic constructor explicit CustomShapeProperties(SdrObject& rObj); @@ -76,10 +76,10 @@ namespace sdr virtual ~CustomShapeProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // This is the notifyer from SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx index 0ed222cea03e..97fca16cb310 100644 --- a/include/svx/sdr/properties/defaultproperties.hxx +++ b/include/svx/sdr/properties/defaultproperties.hxx @@ -36,19 +36,19 @@ namespace sdr SfxItemSet* mpItemSet; // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -61,32 +61,32 @@ namespace sdr virtual ~DefaultProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem); + virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem); + virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet); + virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created. @@ -94,7 +94,7 @@ namespace sdr virtual void ForceDefaultAttributes(); // Scale the included ItemSet. - virtual void Scale(const Fraction& rScale); + virtual void Scale(const Fraction& rScale) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dcompoundproperties.hxx b/include/svx/sdr/properties/e3dcompoundproperties.hxx index 8480e75791bf..aac77ad6a970 100644 --- a/include/svx/sdr/properties/e3dcompoundproperties.hxx +++ b/include/svx/sdr/properties/e3dcompoundproperties.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -46,20 +46,20 @@ namespace sdr virtual ~E3dCompoundProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // Get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overloaded e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SFX_ITEM_DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const; + virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false); + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dextrudeproperties.hxx b/include/svx/sdr/properties/e3dextrudeproperties.hxx index b5d64068a9f5..dac3f8e173ea 100644 --- a/include/svx/sdr/properties/e3dextrudeproperties.hxx +++ b/include/svx/sdr/properties/e3dextrudeproperties.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -46,7 +46,7 @@ namespace sdr virtual ~E3dExtrudeProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dlatheproperties.hxx b/include/svx/sdr/properties/e3dlatheproperties.hxx index e88c4964f217..4a5b56559cbc 100644 --- a/include/svx/sdr/properties/e3dlatheproperties.hxx +++ b/include/svx/sdr/properties/e3dlatheproperties.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -46,7 +46,7 @@ namespace sdr virtual ~E3dLatheProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dproperties.hxx b/include/svx/sdr/properties/e3dproperties.hxx index c55f40b53421..39e10235cb26 100644 --- a/include/svx/sdr/properties/e3dproperties.hxx +++ b/include/svx/sdr/properties/e3dproperties.hxx @@ -33,10 +33,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -49,10 +49,10 @@ namespace sdr virtual ~E3dProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/e3dsceneproperties.hxx b/include/svx/sdr/properties/e3dsceneproperties.hxx index 2767dd2b135e..a92296d23bba 100644 --- a/include/svx/sdr/properties/e3dsceneproperties.hxx +++ b/include/svx/sdr/properties/e3dsceneproperties.hxx @@ -32,7 +32,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -45,35 +45,35 @@ namespace sdr virtual ~E3dSceneProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // get merged ItemSet. Normappl, this maps directly to GetObjectItemSet(), but may // be overloaded e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SFX_ITEM_DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const; + virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false); + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; // Set a single item, iterate over hierarchies if necessary. - virtual void SetMergedItem(const SfxPoolItem& rItem); + virtual void SetMergedItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // Clear a single item, iterate over hierarchies if necessary. - virtual void ClearMergedItem(const sal_uInt16 nWhich = 0); + virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // Move properties to a new ItemPool. Default implementation does nothing. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; // Special for scene: void SetSceneItemsFromCamera(); diff --git a/include/svx/sdr/properties/e3dsphereproperties.hxx b/include/svx/sdr/properties/e3dsphereproperties.hxx index 2481af6a6007..a92596b6661f 100644 --- a/include/svx/sdr/properties/e3dsphereproperties.hxx +++ b/include/svx/sdr/properties/e3dsphereproperties.hxx @@ -32,7 +32,7 @@ namespace sdr { protected: // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -45,7 +45,7 @@ namespace sdr virtual ~E3dSphereProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/emptyproperties.hxx b/include/svx/sdr/properties/emptyproperties.hxx index ce13b8307f8c..1c7f0250046a 100644 --- a/include/svx/sdr/properties/emptyproperties.hxx +++ b/include/svx/sdr/properties/emptyproperties.hxx @@ -36,19 +36,19 @@ namespace sdr SfxItemSet* mpEmptyItemSet; // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -61,32 +61,32 @@ namespace sdr virtual ~EmptyProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem); + virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem); + virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet); + virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/graphicproperties.hxx b/include/svx/sdr/properties/graphicproperties.hxx index b380fbeb8f0e..8299f5a2955d 100644 --- a/include/svx/sdr/properties/graphicproperties.hxx +++ b/include/svx/sdr/properties/graphicproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~GraphicProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/groupproperties.hxx b/include/svx/sdr/properties/groupproperties.hxx index da0e15493ff3..41a08c45168b 100644 --- a/include/svx/sdr/properties/groupproperties.hxx +++ b/include/svx/sdr/properties/groupproperties.hxx @@ -32,19 +32,19 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // test changeability for a single item - virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const; + virtual bool AllowItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) const SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -57,59 +57,59 @@ namespace sdr virtual ~GroupProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // get merged ItemSet. Normally, this maps directly to GetObjectItemSet(), but may // be overloaded e.g for group objects to return a merged ItemSet of the object. // When using this method the returned ItemSet may contain items in the state // SFX_ITEM_DONTCARE which means there were several such items with different // values. - virtual const SfxItemSet& GetMergedItemSet() const; + virtual const SfxItemSet& GetMergedItemSet() const SAL_OVERRIDE; // Set merged ItemSet. Normally, this maps to SetObjectItemSet(). - virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false); + virtual void SetMergedItemSet(const SfxItemSet& rSet, bool bClearAllItems = false) SAL_OVERRIDE; // set single item - virtual void SetObjectItem(const SfxPoolItem& rItem); + virtual void SetObjectItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // set single item direct, do not do any notifies or things like that - virtual void SetObjectItemDirect(const SfxPoolItem& rItem); + virtual void SetObjectItemDirect(const SfxPoolItem& rItem) SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // clear single item direct, do not do any notifies or things like that. // Also supports complete deleteion of items when default parameter 0 is used. - virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItemDirect(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // Set a single item, iterate over hierarchies if necessary. - virtual void SetMergedItem(const SfxPoolItem& rItem); + virtual void SetMergedItem(const SfxPoolItem& rItem) SAL_OVERRIDE; // Clear a single item, iterate over hierarchies if necessary. - virtual void ClearMergedItem(const sal_uInt16 nWhich = 0); + virtual void ClearMergedItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; // set complete item set - virtual void SetObjectItemSet(const SfxItemSet& rSet); + virtual void SetObjectItemSet(const SfxItemSet& rSet) SAL_OVERRIDE; // set a new StyleSheet - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // get the local StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; // Move properties to a new ItemPool. - virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); + virtual void MoveToItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L) SAL_OVERRIDE; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes(); + virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/measureproperties.hxx b/include/svx/sdr/properties/measureproperties.hxx index 038c99f63d69..0d4c0f1343e9 100644 --- a/include/svx/sdr/properties/measureproperties.hxx +++ b/include/svx/sdr/properties/measureproperties.hxx @@ -32,10 +32,10 @@ namespace sdr { protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -48,14 +48,14 @@ namespace sdr virtual ~MeasureProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/oleproperties.hxx b/include/svx/sdr/properties/oleproperties.hxx index 5a10f87bd771..9a78025acd77 100644 --- a/include/svx/sdr/properties/oleproperties.hxx +++ b/include/svx/sdr/properties/oleproperties.hxx @@ -42,11 +42,11 @@ namespace sdr virtual ~OleProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/pageproperties.hxx b/include/svx/sdr/properties/pageproperties.hxx index 08f583b5842b..6af7debda17a 100644 --- a/include/svx/sdr/properties/pageproperties.hxx +++ b/include/svx/sdr/properties/pageproperties.hxx @@ -32,13 +32,13 @@ namespace sdr { protected: // create a new object specific itemset with object specific ranges. - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& pPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& pPool) SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // Called after ItemChange() is done for all items. - virtual void PostItemChange(const sal_uInt16 nWhich); + virtual void PostItemChange(const sal_uInt16 nWhich) SAL_OVERRIDE; public: // basic constructor @@ -51,17 +51,17 @@ namespace sdr virtual ~PageProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // get itemset. Overloaded here to allow creating the empty itemset // without asserting - virtual const SfxItemSet& GetObjectItemSet() const; + virtual const SfxItemSet& GetObjectItemSet() const SAL_OVERRIDE; // get the installed StyleSheet - virtual SfxStyleSheet* GetStyleSheet() const; + virtual SfxStyleSheet* GetStyleSheet() const SAL_OVERRIDE; // clear single item - virtual void ClearObjectItem(const sal_uInt16 nWhich = 0); + virtual void ClearObjectItem(const sal_uInt16 nWhich = 0) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/rectangleproperties.hxx b/include/svx/sdr/properties/rectangleproperties.hxx index f53b34c5dc65..c78becdb6dec 100644 --- a/include/svx/sdr/properties/rectangleproperties.hxx +++ b/include/svx/sdr/properties/rectangleproperties.hxx @@ -33,7 +33,7 @@ namespace sdr { protected: // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; public: // basic constructor @@ -46,10 +46,10 @@ namespace sdr virtual ~RectangleProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/properties/textproperties.hxx b/include/svx/sdr/properties/textproperties.hxx index 78de4949642a..3a6a5c6991af 100644 --- a/include/svx/sdr/properties/textproperties.hxx +++ b/include/svx/sdr/properties/textproperties.hxx @@ -38,13 +38,13 @@ namespace sdr protected: // create a new itemset - virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool); + virtual SfxItemSet& CreateObjectSpecificItemSet(SfxItemPool& rPool) SAL_OVERRIDE; // Do the ItemChange, may do special handling - virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0); + virtual void ItemChange(const sal_uInt16 nWhich, const SfxPoolItem* pNewItem = 0) SAL_OVERRIDE; // react on ItemSet changes - virtual void ItemSetChanged(const SfxItemSet& rSet); + virtual void ItemSetChanged(const SfxItemSet& rSet) SAL_OVERRIDE; /// Get the TextProvider related to our SdrObject virtual const svx::ITextProvider& getTextProvider() const; @@ -60,28 +60,28 @@ namespace sdr virtual ~TextProperties(); // Clone() operator, normally just calls the local copy constructor - virtual BaseProperties& Clone(SdrObject& rObj) const; + virtual BaseProperties& Clone(SdrObject& rObj) const SAL_OVERRIDE; // set a new StyleSheet and broadcast - virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr); + virtual void SetStyleSheet(SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr) SAL_OVERRIDE; // force default attributes for a specific object type, called from // DefaultProperties::GetObjectItemSet() if a new ItemSet is created - virtual void ForceDefaultAttributes(); + virtual void ForceDefaultAttributes() SAL_OVERRIDE; // force all attributes which come from styles to hard attributes // to be able to live without the style. - virtual void ForceStyleToHardAttributes(); + virtual void ForceStyleToHardAttributes() SAL_OVERRIDE; // This is the notifyer from SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; // Set single item at the local ItemSet. *Does not use* AllowItemChange(), // ItemChange(), PostItemChange() and ItemSetChanged() calls. void SetObjectItemNoBroadcast(const SfxPoolItem& rItem); // #i101556# versioning support - virtual sal_uInt32 getVersion() const; + virtual sal_uInt32 getVersion() const SAL_OVERRIDE; }; } // end of namespace properties } // end of namespace sdr diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 1a011ecea434..0ffe6c2b2afa 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -46,23 +46,23 @@ public: SVX_DLLPRIVATE virtual ~SvxTableController(); // from sdr::SelectionController - SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin); - SVX_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin); + SVX_DLLPRIVATE virtual bool onKeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool onMouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool DeleteMarked(); + SVX_DLLPRIVATE virtual bool DeleteMarked() SAL_OVERRIDE; - SVX_DLLPRIVATE virtual void onSelectionHasChanged(); + SVX_DLLPRIVATE virtual void onSelectionHasChanged() SAL_OVERRIDE; - SVX_DLLPRIVATE virtual void GetState( SfxItemSet& rSet ); - SVX_DLLPRIVATE virtual void Execute( SfxRequest& rReq ); + SVX_DLLPRIVATE virtual void GetState( SfxItemSet& rSet ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual void Execute( SfxRequest& rReq ) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const; - SVX_DLLPRIVATE virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ); + SVX_DLLPRIVATE virtual bool GetStyleSheet( SfxStyleSheet* &rpStyleSheet ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool SetStyleSheet( SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr ) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); - SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ); + SVX_DLLPRIVATE virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) SAL_OVERRIDE; // slots SVX_DLLPRIVATE void onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs = 0 ); @@ -86,11 +86,11 @@ public: */ SVX_DLLPRIVATE void FillCommonBorderAttrFromSelectedCells(SvxBoxItem& rBox, SvxBoxInfoItem& rBoxInfo) const; - SVX_DLLPRIVATE virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const; - SVX_DLLPRIVATE virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll); + SVX_DLLPRIVATE virtual bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll) SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool GetMarkedObjModel( SdrPage* pNewPage ); - SVX_DLLPRIVATE virtual bool PasteObjModel( const SdrModel& rModel ); + SVX_DLLPRIVATE virtual bool GetMarkedObjModel( SdrPage* pNewPage ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool PasteObjModel( const SdrModel& rModel ) SAL_OVERRIDE; SVX_DLLPRIVATE bool hasSelectedCells() const { return mbCellSelectionMode || mpView->IsTextEdit(); } diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index 424b16ee8a11..6489504e79aa 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -67,7 +67,7 @@ namespace sdr // this method is called form the destructor of the referenced page. // do all necessary action to forget the page. It is not necessary to call // RemovePageUser(), that is done form the destructor. - virtual void PageInDestruction(const SdrPage& rPage); + virtual void PageInDestruction(const SdrPage& rPage) SAL_OVERRIDE; // member access to UsedPage SdrPage& GetUsedPage() const { return maUsedPage; } diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index 3f3739d56958..c35ea74cbbc0 100755..100644 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -45,11 +45,11 @@ public: virtual ~SdrUndoManager(); /// react depending on edit mode and if no more undo is possible - virtual bool Undo(); - virtual bool Redo(); + virtual bool Undo() SAL_OVERRIDE; + virtual bool Redo() SAL_OVERRIDE; // #i123350# - virtual void Clear(); + virtual void Clear() SAL_OVERRIDE; // Call for the view which starts the interactive text edit. Use link to // activate (start text edit) and empty link to reset (end text edit). On diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx index 68808c3421a1..7ae67f4481bb 100644 --- a/include/svx/sdtaaitm.hxx +++ b/include/svx/sdtaaitm.hxx @@ -28,12 +28,12 @@ public: TYPEINFO_OVERRIDE(); SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool HasMetrics() const; - virtual bool ScaleMetrics(long nMul, long nDiv); + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; + virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx index 95ab7c39c498..44ac96f93857 100644 --- a/include/svx/sdtaditm.hxx +++ b/include/svx/sdtaditm.hxx @@ -37,17 +37,17 @@ public: TYPEINFO_OVERRIDE(); SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {} SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; SdrTextAniDirection GetValue() const { return (SdrTextAniDirection)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx index 7ce752357e11..c1e452e8ef3b 100644 --- a/include/svx/sdtaitm.hxx +++ b/include/svx/sdtaitm.hxx @@ -39,16 +39,16 @@ public: SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {} SdrTextVertAdjustItem(SdrTextVertAdjust eAdj, sal_uInt16 nWhich): SfxEnumItem(nWhich,(sal_uInt16)eAdj) {} SdrTextVertAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 5; } SdrTextVertAdjust GetValue() const { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; @@ -66,16 +66,16 @@ public: TYPEINFO_OVERRIDE(); SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {} SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; SdrTextHorzAdjust GetValue() const { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx index c93eed5bf6d5..5ae81af7b840 100644 --- a/include/svx/sdtakitm.hxx +++ b/include/svx/sdtakitm.hxx @@ -80,16 +80,16 @@ public: TYPEINFO_OVERRIDE(); SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {} SdrTextAniKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 5; } SdrTextAniKind GetValue() const { return (SdrTextAniKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx index 6a45325a5872..be3cb1cbd457 100644 --- a/include/svx/sdtayitm.hxx +++ b/include/svx/sdtayitm.hxx @@ -28,9 +28,9 @@ public: TYPEINFO_OVERRIDE(); SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx index 7ef6c13fc962..8d2b7448b68b 100644 --- a/include/svx/sdtfchim.hxx +++ b/include/svx/sdtfchim.hxx @@ -31,15 +31,15 @@ public: SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, - OUString &rText, const IntlWrapper * = 0) const; + OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const; - SVX_DLLPRIVATE virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nItem ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SvStream& Store( SvStream&, sal_uInt16 nVersion ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx index 6d763b8513d9..8a194e07be82 100644 --- a/include/svx/sdtfsitm.hxx +++ b/include/svx/sdtfsitm.hxx @@ -47,19 +47,19 @@ public: TYPEINFO_OVERRIDE(); SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {} SdrTextFitToSizeTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 4; } SdrFitToSizeType GetValue() const { return (SdrFitToSizeType)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; - virtual bool HasBoolValue() const; - virtual bool GetBoolValue() const; - virtual void SetBoolValue(sal_Bool bVal); + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual bool HasBoolValue() const SAL_OVERRIDE; + virtual bool GetBoolValue() const SAL_OVERRIDE; + virtual void SetBoolValue(sal_Bool bVal) SAL_OVERRIDE; }; #endif diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx index d8620d365559..644af5ec815f 100644 --- a/include/svx/sdynitm.hxx +++ b/include/svx/sdynitm.hxx @@ -34,10 +34,10 @@ public: SdrYesNoItem(): SfxBoolItem() {} SdrYesNoItem(sal_uInt16 nId, bool bOn=false): SfxBoolItem(nId,bOn) {} SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual OUString GetValueTextByVal(sal_Bool bVal) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual OUString GetValueTextByVal(sal_Bool bVal) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/selctrl.hxx b/include/svx/selctrl.hxx index be8b05a51bdd..173899a1c11c 100644 --- a/include/svx/selctrl.hxx +++ b/include/svx/selctrl.hxx @@ -32,9 +32,9 @@ public: SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual bool MouseButtonDown( const MouseEvent& rEvt ); - virtual void Paint( const UserDrawEvent& rEvt ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent& rEvt ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; private: sal_uInt16 mnState; diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx index 93140d670039..a1ebfe12f9ca 100644 --- a/include/svx/shapepropertynotifier.hxx +++ b/include/svx/shapepropertynotifier.hxx @@ -78,8 +78,8 @@ namespace svx { } - virtual OUString getPropertyName() const; - virtual void getCurrentValue( ::com::sun::star::uno::Any& _out_rValue ) const; + virtual OUString getPropertyName() const SAL_OVERRIDE; + virtual void getCurrentValue( ::com::sun::star::uno::Any& _out_rValue ) const SAL_OVERRIDE; protected: ::cppu::OWeakObject& getContext() const { return m_rContext; } diff --git a/include/svx/sidebar/ColorControl.hxx b/include/svx/sidebar/ColorControl.hxx index c76d7f0cfe1f..8888dcbd66d1 100644 --- a/include/svx/sidebar/ColorControl.hxx +++ b/include/svx/sidebar/ColorControl.hxx @@ -68,7 +68,7 @@ public: const ResId* pNoColorStringResId); virtual ~ColorControl (void); - void GetFocus (void); + void GetFocus (void) SAL_OVERRIDE; void SetCurColorSelect ( const Color aCol, const bool bAvl); diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index 74b5385f81bd..3dc4bfcee18d 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -34,9 +34,9 @@ public: const com::sun::star::uno::Reference<com::sun::star::frame::XFrame> &rFrame); virtual ~PanelLayout(); - virtual Size GetOptimalSize() const; - virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL); - virtual void queue_resize(); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL) SAL_OVERRIDE; + virtual void queue_resize() SAL_OVERRIDE; }; diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx index 64cb2b70fddd..b9ed9286704c 100644 --- a/include/svx/sidebar/PopupContainer.hxx +++ b/include/svx/sidebar/PopupContainer.hxx @@ -36,7 +36,7 @@ public: PopupContainer (Window* pParent); virtual ~PopupContainer (void); - virtual bool Notify (NotifyEvent& rNEvt); + virtual bool Notify (NotifyEvent& rNEvt) SAL_OVERRIDE; }; diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx index 0754ed24909b..ccc361f910a8 100644 --- a/include/svx/sidebar/PopupControl.hxx +++ b/include/svx/sidebar/PopupControl.hxx @@ -40,7 +40,7 @@ public : const ResId& rResId); virtual ~PopupControl (void); - virtual void Paint (const Rectangle& rect); + virtual void Paint (const Rectangle& rect) SAL_OVERRIDE; }; } } // end of namespace svx::sidebar diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx index a8346225afcc..7b81b5b5c45d 100644 --- a/include/svx/sidebar/SelectionChangeHandler.hxx +++ b/include/svx/sidebar/SelectionChangeHandler.hxx @@ -59,13 +59,13 @@ public: virtual ~SelectionChangeHandler (void); virtual void SAL_CALL selectionChanged (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing (void) - throw (cssu::RuntimeException); + throw (cssu::RuntimeException) SAL_OVERRIDE; void Connect (void); void Disconnect (void); diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx index e3a32d450fee..c897e9e4051a 100644 --- a/include/svx/sidebar/SidebarDialControl.hxx +++ b/include/svx/sidebar/SidebarDialControl.hxx @@ -31,11 +31,11 @@ public: SidebarDialControl (Window* pParent, WinBits nBits = 0); virtual ~SidebarDialControl (void); - virtual Size GetOptimalSize() const; - virtual void MouseButtonDown (const MouseEvent& rMEvt); + virtual Size GetOptimalSize() const SAL_OVERRIDE; + virtual void MouseButtonDown (const MouseEvent& rMEvt) SAL_OVERRIDE; protected: - virtual void HandleMouseEvent (const Point& rPos, bool bInitial); + virtual void HandleMouseEvent (const Point& rPos, bool bInitial) SAL_OVERRIDE; }; } } // end of namespace svx::sidebar diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index 318bb6f1abfa..3b80efd4e8bc 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -97,7 +97,7 @@ public: const OUString& rItemText2, const OUString* pItemHelpText ); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; private: struct ValueSetWithTextItem @@ -132,7 +132,7 @@ class SVX_DLLPUBLIC SvxNumValueSet2 : public ValueSet SvxNumValueSet2( Window* pParent, const ResId& rResId); ~SvxNumValueSet2(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; void SetNumberingSettings( @@ -149,7 +149,7 @@ class SVX_DLLPUBLIC SvxNumValueSet3 : public ValueSet SvxNumValueSet3( Window* pParent, const ResId& rResId); ~SvxNumValueSet3(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; }; diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx index e3ae1724d57a..0023d6fd0192 100644 --- a/include/svx/sphere3d.hxx +++ b/include/svx/sphere3d.hxx @@ -34,8 +34,8 @@ private: basegfx::B3DVector aSize; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; void SetDefaultAttributes(E3dDefaultAttributes& rDefault); public: @@ -55,10 +55,10 @@ public: sal_uInt32 GetVerticalSegments() const { return ((const Svx3DVerticalSegmentsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); } - virtual sal_uInt16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; - virtual E3dSphereObj* Clone() const; + virtual E3dSphereObj* Clone() const SAL_OVERRIDE; const basegfx::B3DPoint& Center() const { return aCenter; } const basegfx::B3DVector& Size() const { return aSize; } @@ -68,8 +68,8 @@ public: void SetSize(const basegfx::B3DVector& rNew); // TakeObjName...() is for displaying in the UI, eg "3 selected frames." - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SPHERE3D_HXX diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index b257bc3a310e..606bbe40db93 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -121,10 +121,10 @@ public: SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); ~SvxSearchDialog(); - virtual bool Close(); + virtual bool Close() SAL_OVERRIDE; // Window - virtual void Activate(); + virtual void Activate() SAL_OVERRIDE; const SearchAttrItemList* GetSearchItemList() const { return pSearchList; } @@ -143,7 +143,7 @@ public: void SetSrchFlag( bool bSuccess = false ) { mbSuccess = bSuccess; } bool GetSrchFlag() { return mbSuccess; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > - GetComponentInterface( sal_Bool bCreate ); + GetComponentInterface( sal_Bool bCreate ) SAL_OVERRIDE; void SetSaveToModule(bool b); diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx index e4cc0f2d10b3..7b6e1202a52e 100644 --- a/include/svx/stddlg.hxx +++ b/include/svx/stddlg.hxx @@ -31,7 +31,7 @@ public: SvxStandardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); ~SvxStandardDialog(); - short Execute(); + short Execute() SAL_OVERRIDE; protected: virtual void Apply() = 0; // pure virtual!!! diff --git a/include/svx/subtoolboxcontrol.hxx b/include/svx/subtoolboxcontrol.hxx index 0d18ac803b28..0f3bf6cbbf70 100644 --- a/include/svx/subtoolboxcontrol.hxx +++ b/include/svx/subtoolboxcontrol.hxx @@ -35,8 +35,8 @@ public: SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxSubToolBoxControl(); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx index 728f0321a6cc..f2679a47f804 100644 --- a/include/svx/svdcrtv.hxx +++ b/include/svx/svdcrtv.hxx @@ -75,14 +75,14 @@ protected: virtual ~SdrCreateView(); public: - virtual bool IsAction() const; - virtual void MovAction(const Point& rPnt); - virtual void EndAction(); - virtual void BckAction(); - virtual void BrkAction(); - virtual void TakeActionRect(Rectangle& rRect) const; - - virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual bool IsAction() const SAL_OVERRIDE; + virtual void MovAction(const Point& rPnt) SAL_OVERRIDE; + virtual void EndAction() SAL_OVERRIDE; + virtual void BckAction() SAL_OVERRIDE; + virtual void BrkAction() SAL_OVERRIDE; + virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE; + + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; void SetMeasureLayer(const OUString& rName) { aMeasureLayer=rName; } const OUString& GetMeasureLayer() const { return aMeasureLayer; } diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index c97a53644f82..db16b0ec5b07 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -58,7 +58,7 @@ public: SdrDragEntryPolyPolygon(const basegfx::B2DPolyPolygon& rOriginalPolyPolygon); virtual ~SdrDragEntryPolyPolygon(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) SAL_OVERRIDE; }; @@ -81,7 +81,7 @@ public: const SdrObject& getOriginal() const { return maOriginal; } SdrObject* getClone() { return mpClone; } - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) SAL_OVERRIDE; }; @@ -97,7 +97,7 @@ public: bool bAddToTransparent); virtual ~SdrDragEntryPrimitive2DSequence(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) SAL_OVERRIDE; }; @@ -112,7 +112,7 @@ public: SdrDragEntryPointGlueDrag(const std::vector< basegfx::B2DPoint >& rPositions, bool bIsPointDrag); virtual ~SdrDragEntryPointGlueDrag(); - virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod); + virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequenceInCurrentState(SdrDragMethod& rDragMethod) SAL_OVERRIDE; }; @@ -233,20 +233,20 @@ private: void ImpCheckSnap(const Point& rPt); protected: - virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify); + virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact, bool bModify) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); SdrDragMove(SdrDragView& rNewView); - virtual void TakeSdrDragComment(OUString& rStr) const; - virtual bool BeginSdrDrag(); - virtual void MoveSdrDrag(const Point& rPnt); - virtual bool EndSdrDrag(bool bCopy); - virtual Pointer GetSdrDragPointer() const; + 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 Pointer GetSdrDragPointer() const SAL_OVERRIDE; - virtual basegfx::B2DHomMatrix getCurrentTransformation(); - virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); + virtual basegfx::B2DHomMatrix getCurrentTransformation() SAL_OVERRIDE; + virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; }; @@ -262,14 +262,14 @@ public: TYPEINFO_OVERRIDE(); SdrDragResize(SdrDragView& rNewView); - virtual void TakeSdrDragComment(OUString& rStr) const; - virtual bool BeginSdrDrag(); - virtual void MoveSdrDrag(const Point& rPnt); - virtual bool EndSdrDrag(bool bCopy); - virtual Pointer GetSdrDragPointer() const; + 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 Pointer GetSdrDragPointer() const SAL_OVERRIDE; - virtual basegfx::B2DHomMatrix getCurrentTransformation(); - virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); + virtual basegfx::B2DHomMatrix getCurrentTransformation() SAL_OVERRIDE; + virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) SAL_OVERRIDE; }; @@ -285,18 +285,18 @@ private: SdrObject* mpClone; protected: - virtual void createSdrDragEntries(); + virtual void createSdrDragEntries() SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); SdrDragObjOwn(SdrDragView& rNewView); virtual ~SdrDragObjOwn(); - virtual void TakeSdrDragComment(OUString& rStr) const; - virtual bool BeginSdrDrag(); - virtual void MoveSdrDrag(const Point& rPnt); - virtual bool EndSdrDrag(bool bCopy); - virtual Pointer GetSdrDragPointer() const; + 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 Pointer GetSdrDragPointer() const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SVDDRGMT_HXX diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx index 4dfbf79a3f2e..2838a5283f6d 100644 --- a/include/svx/svddrgv.hxx +++ b/include/svx/svddrgv.hxx @@ -68,7 +68,7 @@ private: SVX_DLLPRIVATE void ImpClearVars(); protected: - virtual void SetMarkHandles(); + virtual void SetMarkHandles() SAL_OVERRIDE; void ShowDragObj(); void HideDragObj(); bool ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut); @@ -79,12 +79,12 @@ protected: virtual ~SdrDragView(); public: - virtual bool IsAction() const; - virtual void MovAction(const Point& rPnt); - virtual void EndAction(); - virtual void BckAction(); - virtual void BrkAction(); - virtual void TakeActionRect(Rectangle& rRect) const; + virtual bool IsAction() const SAL_OVERRIDE; + virtual void MovAction(const Point& rPnt) SAL_OVERRIDE; + virtual void EndAction() SAL_OVERRIDE; + virtual void BckAction() SAL_OVERRIDE; + virtual void BrkAction() SAL_OVERRIDE; + virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE; // Spezialimplementation fuer den Writer: // TakeDragObjAnchorPos() liefert die Position an der ein Objekt diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index 1331498c0b6c..f0a98839e105 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -420,8 +420,8 @@ public: bool IsVirtualObjectBundling() const { return bBundleVirtObj; } // von der SdrMarkView ueberladen fuer den internen gebrauch - virtual void MarkListHasChanged(); - virtual void ModelHasChanged(); + virtual void MarkListHasChanged() SAL_OVERRIDE; + virtual void ModelHasChanged() SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SVDEDTV_HXX diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index c01b34f8de3f..2d730f4584fa 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -140,15 +140,15 @@ public: void TextEditDrawing(SdrPaintWindow& rPaintWindow) const; // Actionhandling fuer Macromodus - virtual bool IsAction() const; - virtual void MovAction(const Point& rPnt); - virtual void EndAction(); - virtual void BrkAction(); - virtual void BckAction(); - virtual void TakeActionRect(Rectangle& rRect) const; + virtual bool IsAction() const SAL_OVERRIDE; + virtual void MovAction(const Point& rPnt) SAL_OVERRIDE; + virtual void EndAction() SAL_OVERRIDE; + virtual void BrkAction() SAL_OVERRIDE; + virtual void BckAction() SAL_OVERRIDE; + virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - virtual void ModelHasChanged(); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; + virtual void ModelHasChanged() SAL_OVERRIDE; // TextEdit ueber einen Outliner @@ -181,7 +181,7 @@ public: // SDRENDTEXTEDIT_SHOULDBEDELETED (anstelle von SDRENDTEXTEDIT_BEDELETED) // der besagt, dass das Objekt geloescht werden sollte. virtual SdrEndTextEditKind SdrEndTextEdit(bool bDontDeleteReally = false); - virtual bool IsTextEdit() const; + virtual bool IsTextEdit() const SAL_OVERRIDE; // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der // des Objektbereichs oder der OutlinerView liegt. @@ -200,7 +200,7 @@ public: SdrObject* GetTextEditObject() const { return mxTextEditObj.get(); } // info about TextEditPageView. Default is 0L. - virtual SdrPageView* GetTextEditPageView() const; + virtual SdrPageView* GetTextEditPageView() const SAL_OVERRIDE; // Das aktuelle Win des Outliners Window* GetTextEditWin() const { return pTextEditWin; } @@ -214,11 +214,11 @@ public: const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; } OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; } - virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); - virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE; // #97766# make virtual to change implementation e.g. for SdOutlineView virtual sal_uInt16 GetScriptType() const; @@ -231,8 +231,8 @@ public: bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); // Intern: Beim Splitteraufziehen neue OutlinerView... - virtual void AddWindowToPaintView(OutputDevice* pNewWin); - virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin); + virtual void AddWindowToPaintView(OutputDevice* pNewWin) SAL_OVERRIDE; + virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin) SAL_OVERRIDE; sal_uInt16 GetSelectionLevel() const; @@ -257,7 +257,7 @@ public: Leaves the any untouched if there currently is no text selected */ void getTextSelection( ::com::sun::star::uno::Any& rSelection ); - virtual void MarkListHasChanged(); + virtual void MarkListHasChanged() SAL_OVERRIDE; rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; } diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index fcb9587f10d4..53e91b95a99c 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -267,7 +267,7 @@ private: bool bUseLuminance : 1; // create marker for this kind - SVX_DLLPRIVATE virtual void CreateB2dIAObject(); + SVX_DLLPRIVATE virtual void CreateB2dIAObject() SAL_OVERRIDE; // help functions SVX_DLLPRIVATE Bitmap CreateColorDropper(Color aCol); @@ -310,7 +310,7 @@ private: bool bMoveFirstHandle : 1; // create marker for this kind - virtual void CreateB2dIAObject(); + virtual void CreateB2dIAObject() SAL_OVERRIDE; public: SdrHdlGradient(const Point& rRef1, const Point& rRef2, bool bGrad = true); @@ -345,7 +345,7 @@ public: class SdrHdlLine: public SdrHdl { // create marker for this kind - virtual void CreateB2dIAObject(); + virtual void CreateB2dIAObject() SAL_OVERRIDE; protected: SdrHdl* pHdl1; @@ -355,7 +355,7 @@ public: SdrHdlLine(SdrHdl& rHdl1, SdrHdl& rHdl2, SdrHdlKind eNewKind=HDL_MIRX) { eKind=eNewKind; pHdl1=&rHdl1; pHdl2=&rHdl2; } virtual ~SdrHdlLine(); - virtual Pointer GetPointer() const; + virtual Pointer GetPointer() const SAL_OVERRIDE; }; // Ein SdrHdlBezWgt hat Kenntnis von seinem "BasisHandle". Seine Draw-Methode @@ -364,7 +364,7 @@ public: class SdrHdlBezWgt: public SdrHdl { // create marker for this kind - virtual void CreateB2dIAObject(); + virtual void CreateB2dIAObject() SAL_OVERRIDE; protected: const SdrHdl* pHdl1; @@ -382,7 +382,7 @@ class E3dVolumeMarker : public SdrHdl basegfx::B2DPolyPolygon aWireframePoly; // create marker for this kind - virtual void CreateB2dIAObject(); + virtual void CreateB2dIAObject() SAL_OVERRIDE; public: explicit E3dVolumeMarker(const basegfx::B2DPolyPolygon& rWireframePoly); @@ -395,7 +395,7 @@ class ImpEdgeHdl: public SdrHdl SdrEdgeLineCode eLineCode; // create marker for this kind - virtual void CreateB2dIAObject(); + virtual void CreateB2dIAObject() SAL_OVERRIDE; public: ImpEdgeHdl(const Point& rPnt, SdrHdlKind eNewKind): SdrHdl(rPnt,eNewKind),eLineCode(MIDDLELINE) {} @@ -404,7 +404,7 @@ public: void SetLineCode(SdrEdgeLineCode eCode); SdrEdgeLineCode GetLineCode() const { return eLineCode; } bool IsHorzDrag() const; - virtual Pointer GetPointer() const; + virtual Pointer GetPointer() const SAL_OVERRIDE; }; @@ -412,13 +412,13 @@ public: class ImpMeasureHdl: public SdrHdl { // create marker for this kind - virtual void CreateB2dIAObject(); + virtual void CreateB2dIAObject() SAL_OVERRIDE; public: ImpMeasureHdl(const Point& rPnt, SdrHdlKind eNewKind): SdrHdl(rPnt,eNewKind) {} virtual ~ImpMeasureHdl(); - virtual Pointer GetPointer() const; + virtual Pointer GetPointer() const SAL_OVERRIDE; }; @@ -428,7 +428,7 @@ class ImpTextframeHdl: public SdrHdl const Rectangle maRect; // create marker for this kind - virtual void CreateB2dIAObject(); + virtual void CreateB2dIAObject() SAL_OVERRIDE; public: explicit ImpTextframeHdl(const Rectangle& rRect); @@ -517,7 +517,7 @@ public: protected: // create marker for this kind - virtual void CreateB2dIAObject(); + virtual void CreateB2dIAObject() SAL_OVERRIDE; BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ); @@ -547,7 +547,7 @@ public: protected: // create marker for this kind - virtual void CreateB2dIAObject(); + virtual void CreateB2dIAObject() SAL_OVERRIDE; }; diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index 15d8735b593c..d57b1a09ecd8 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -56,7 +56,7 @@ public: virtual ~SdrMark(); // Derived from ObjectUser - virtual void ObjectInDestruction(const SdrObject& rObject); + virtual void ObjectInDestruction(const SdrObject& rObject) SAL_OVERRIDE; SdrMark& operator=(const SdrMark& rMark); bool operator==(const SdrMark& rMark) const; diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index d6832923dfd8..309b6030ebeb 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -141,13 +141,13 @@ private: void UndirtyMrkPnt() const; protected: - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - virtual void ModelHasChanged(); // Is called by the PaintView + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; + virtual void ModelHasChanged() SAL_OVERRIDE; // Is called by the PaintView virtual void SetMarkHandles(); // aHdl - fill (List of handles) virtual void SetMarkRects(); // Rects at the PageViews virtual void CheckMarked(); // Scan MarkList after Del and Lock Layer ... virtual void AddDragModeHdl(SdrDragMode eMode); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; // add custom handles (used by other apps, e.g. AnchorPos) virtual void AddCustomHdl(); @@ -175,15 +175,15 @@ protected: virtual ~SdrMarkView(); public: - virtual bool IsAction() const; - virtual void MovAction(const Point& rPnt); - virtual void EndAction(); - virtual void BckAction(); - virtual void BrkAction(); - virtual void TakeActionRect(Rectangle& rRect) const; - - virtual void ClearPageView(); - virtual void HideSdrPage(); + virtual bool IsAction() const SAL_OVERRIDE; + virtual void MovAction(const Point& rPnt) SAL_OVERRIDE; + virtual void EndAction() SAL_OVERRIDE; + virtual void BckAction() SAL_OVERRIDE; + virtual void BrkAction() SAL_OVERRIDE; + virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE; + + virtual void ClearPageView() SAL_OVERRIDE; + virtual void HideSdrPage() SAL_OVERRIDE; virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; // Returns sal_True if objects, points or glue points are selected by drawing a frame diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index ffd44d7476c8..c7be3585c679 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -82,11 +82,11 @@ private: double fObjectRotation; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual void impl_setUnoShape(const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& rxUnoShape); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual void impl_setUnoShape(const com::sun::star::uno::Reference<com::sun::star::uno::XInterface>& rxUnoShape) SAL_OVERRIDE; public: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; // to allow sdr::properties::CustomShapeProperties access friend class sdr::properties::CustomShapeProperties; @@ -133,7 +133,7 @@ protected: // #115391# new method for SdrObjCustomShape and SdrTextObj to correctly handle and set // SdrTextMinFrameWidthItem and SdrTextMinFrameHeightItem based on all settings, necessities // and object sizes - virtual void AdaptTextMinSize(); + virtual void AdaptTextMinSize() SAL_OVERRIDE; OUString aName; @@ -174,87 +174,87 @@ public: }; bool IsDefaultGeometry( const DefaultType eDefaultType ) const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; - virtual void SetModel(SdrModel* pNewModel); + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; - virtual void RecalcSnapRect(); + virtual void RecalcSnapRect() SAL_OVERRIDE; - virtual const Rectangle& GetSnapRect() const; - virtual const Rectangle& GetCurrentBoundRect() const; - virtual const Rectangle& GetLogicRect() const; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; + virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; + virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; - virtual void Move(const Size& rSiz); - virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true); - virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual void SetSnapRect(const Rectangle& rRect); - virtual void SetLogicRect(const Rectangle& rRect); + virtual void Move(const Size& rSiz) SAL_OVERRIDE; + virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE; + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); + virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const SAL_OVERRIDE; - virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr ); + virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, bool bDontRemoveHardAttr ) SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - - virtual bool BegCreate( SdrDragStat& rStat ); - virtual bool MovCreate(SdrDragStat& rStat); // #i37448# - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - - virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; - virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); - virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); - virtual bool IsAutoGrowHeight() const; - virtual bool IsAutoGrowWidth() const; - virtual void SetVerticalWriting( bool bVertical ); - virtual bool BegTextEdit( SdrOutliner& rOutl ); - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; - virtual void EndTextEdit( SdrOutliner& rOutl ); - virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + + virtual bool BegCreate( SdrDragStat& rStat ) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; // #i37448# + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + + virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const SAL_OVERRIDE; + virtual bool NbcAdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true) SAL_OVERRIDE; + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true) SAL_OVERRIDE; + virtual bool IsAutoGrowHeight() const SAL_OVERRIDE; + virtual bool IsAutoGrowWidth() const SAL_OVERRIDE; + virtual void SetVerticalWriting( bool bVertical ) SAL_OVERRIDE; + virtual bool BegTextEdit( SdrOutliner& rOutl ) SAL_OVERRIDE; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const SAL_OVERRIDE; + virtual void EndTextEdit( SdrOutliner& rOutl ) SAL_OVERRIDE; + virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const SAL_OVERRIDE; virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, - Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; - virtual SdrObjCustomShape* Clone() const; + Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const SAL_OVERRIDE; + virtual SdrObjCustomShape* Clone() const SAL_OVERRIDE; SdrObjCustomShape& operator=(const SdrObjCustomShape& rObj); - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual basegfx::B2DPolyPolygon TakeCreatePoly( const SdrDragStat& rDrag) const; + virtual basegfx::B2DPolyPolygon TakeCreatePoly( const SdrDragStat& rDrag) const SAL_OVERRIDE; - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual basegfx::B2DPolyPolygon TakeContour() const; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; - virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); + virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) SAL_OVERRIDE; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; - virtual void SetPage( SdrPage* pNewPage ); + virtual void SetPage( SdrPage* pNewPage ) SAL_OVERRIDE; - virtual SdrObjGeoData *NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData &rGeo) const; - virtual void RestGeoData(const SdrObjGeoData &rGeo); + virtual SdrObjGeoData *NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData &rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData &rGeo) SAL_OVERRIDE; // need to take fObjectRotation instead of aGeo.nWink, replace it temporary - virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const SAL_OVERRIDE; + virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE; - virtual const SdrGluePointList* GetGluePointList() const; + virtual const SdrGluePointList* GetGluePointList() const SAL_OVERRIDE; //virtual SdrGluePointList* GetGluePointList(); - virtual SdrGluePointList* ForceGluePointList(); + virtual SdrGluePointList* ForceGluePointList() SAL_OVERRIDE; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl( sal_uInt32 nHdlNum ) const; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl( sal_uInt32 nHdlNum ) const SAL_OVERRIDE; // #i33136# static bool doConstructOrthogonal(const OUString& rName); diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index d3a39cdca14e..10d257c64836 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -48,7 +48,7 @@ private: friend class SdrOutliner; protected: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; Rectangle maSnapRect; @@ -57,7 +57,7 @@ protected: sal_Int32 ImpGetLineWdt() const; /// Detects when a stylesheet is changed - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; SdrAttrObj(); virtual ~SdrAttrObj(); @@ -71,9 +71,9 @@ public: // Detects if Line != LineNone bool HasLine() const; - virtual const Rectangle& GetSnapRect() const; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; - virtual void SetModel(SdrModel* pNewModel); + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; }; diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 30bd9a085aeb..e7e372866280 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -56,8 +56,8 @@ private: friend class SdrTextObj; // for ImpRecalcTail() during AutoGrow protected: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; private: Polygon aTailPoly; // the whole tail polygon @@ -80,9 +80,9 @@ public: SdrCaptionObj(const Rectangle& rRect, const Point& rTail); virtual ~SdrCaptionObj(); - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual SdrCaptionObj* Clone() const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual SdrCaptionObj* Clone() const SAL_OVERRIDE; // for calc: special shadow only for text box void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = true; } @@ -91,54 +91,54 @@ public: // for calc: fixed note tail position. void SetFixedTail() { mbFixedTail = true; } - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual void SetModel(SdrModel* pNewModel); - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; - - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - virtual Pointer GetCreatePointer() const; - - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - - virtual void NbcSetRelativePos(const Point& rPnt); - virtual Point GetRelativePos() const; - virtual void NbcSetAnchorPos(const Point& rPnt); - virtual const Point& GetAnchorPos() const; - - virtual void RecalcSnapRect(); - virtual const Rectangle& GetSnapRect() const; - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual const Rectangle& GetLogicRect() const; - virtual void NbcSetLogicRect(const Rectangle& rRect); - - virtual sal_uInt32 GetSnapPointCount() const; - virtual Point GetSnapPoint(sal_uInt32 i) const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual Pointer GetCreatePointer() const SAL_OVERRIDE; + + virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + + virtual void NbcSetRelativePos(const Point& rPnt) SAL_OVERRIDE; + virtual Point GetRelativePos() const SAL_OVERRIDE; + virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE; + virtual const Point& GetAnchorPos() const SAL_OVERRIDE; + + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + + virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE; + virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; protected: - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; public: - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; const Point& GetTailPos() const; void SetTailPos(const Point& rPos); @@ -146,7 +146,7 @@ public: // #i32599# // Add own implementation for TRSetBaseGeometry to handle TailPos over changes - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); + virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE; inline const Point& GetFixedTailPos() const {return maFixedTailPos;} diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx index 99879ca71dd9..40386fdf989d 100644 --- a/include/svx/svdocirc.hxx +++ b/include/svx/svdocirc.hxx @@ -49,8 +49,8 @@ private: SdrObjKind GetCircleKind() const { return meCircleKind; } protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; SdrObjKind meCircleKind; long nStartWink; @@ -63,10 +63,10 @@ private: // returns sal_True if paint requires a XPolygon SVX_DLLPRIVATE bool PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc - SVX_DLLPRIVATE virtual void RecalcXPoly(); + SVX_DLLPRIVATE virtual void RecalcXPoly() SAL_OVERRIDE; protected: - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -80,47 +80,47 @@ public: SdrCircObj(SdrObjKind eNewKind, const Rectangle& rRect, long nNewStartWink, long nNewEndWink); virtual ~SdrCircObj(); - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const SAL_OVERRIDE; - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual SdrCircObj* Clone() const; - virtual void RecalcSnapRect(); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; + virtual SdrCircObj* Clone() const SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; - virtual sal_uInt32 GetSnapPointCount() const; - virtual Point GetSnapPoint(sal_uInt32 i) const; + virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE; + virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; - - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - virtual Pointer GetCreatePointer() const; - virtual void NbcMove(const Size& aSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual Pointer GetCreatePointer() const SAL_OVERRIDE; + virtual void NbcMove(const Size& aSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; protected: - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; public: long GetStartWink() const { return nStartWink; } long GetEndWink() const { return nEndWink; } diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 49b29410d07e..438c5e764188 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -156,8 +156,8 @@ private: friend class ImpEdgeHdl; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; SdrObjConnection aCon1; // Verbindungszustand des Linienanfangs SdrObjConnection aCon2; // Verbindungszustand des Linienendes @@ -196,7 +196,7 @@ public: bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; } protected: - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rCenter) const; void ImpRecalcEdgeTrack(); // Neuberechnung des Verbindungsverlaufs @@ -219,80 +219,80 @@ public: virtual ~SdrEdgeObj(); SdrObjConnection& GetConnection(bool bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual const Rectangle& GetCurrentBoundRect() const; - virtual const Rectangle& GetSnapRect() const; - virtual bool IsNode() const; - virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; - virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; - virtual const SdrGluePointList* GetGluePointList() const; - virtual SdrGluePointList* ForceGluePointList(); - virtual bool IsEdge() const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; + virtual bool IsNode() const SAL_OVERRIDE; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const SAL_OVERRIDE; + virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const SAL_OVERRIDE; + virtual const SdrGluePointList* GetGluePointList() const SAL_OVERRIDE; + virtual SdrGluePointList* ForceGluePointList() SAL_OVERRIDE; + virtual bool IsEdge() const SAL_OVERRIDE; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect void SetEdgeTrackDirty() { bEdgeTrackDirty=true; } - void ConnectToNode(bool bTail1, SdrObject* pObj); - void DisconnectFromNode(bool bTail1); - SdrObject* GetConnectedNode(bool bTail1) const; + void ConnectToNode(bool bTail1, SdrObject* pObj) SAL_OVERRIDE; + void DisconnectFromNode(bool bTail1) SAL_OVERRIDE; + SdrObject* GetConnectedNode(bool bTail1) const SAL_OVERRIDE; const SdrObjConnection& GetConnection(bool bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); } bool CheckNodeConnection(bool bTail1) const; - virtual void RecalcSnapRect(); - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; - virtual SdrEdgeObj* Clone() const; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const SAL_OVERRIDE; + virtual SdrEdgeObj* Clone() const SAL_OVERRIDE; SdrEdgeObj& operator=(const SdrEdgeObj& rObj); - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; void SetEdgeTrackPath( const basegfx::B2DPolyPolygon& rPoly ); basegfx::B2DPolyPolygon GetEdgeTrackPath() const; - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE; // FullDrag support - virtual SdrObject* getFullDragClone() const; + virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcMove(const Size& aSize); - virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact); + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcMove(const Size& aSize) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact) SAL_OVERRIDE; // #i54102# added rotate, mirrorn and shear support - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; // #102344# Added missing implementation - virtual void NbcSetAnchorPos(const Point& rPnt); - - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - virtual Pointer GetCreatePointer() const; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; - - virtual sal_uInt32 GetSnapPointCount() const; - virtual Point GetSnapPoint(sal_uInt32 i) const; - virtual bool IsPolyObj() const; - virtual sal_uInt32 GetPointCount() const; - virtual Point GetPoint(sal_uInt32 i) const; - virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); - - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual Pointer GetCreatePointer() const SAL_OVERRIDE; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; + + virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE; + virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; + virtual bool IsPolyObj() const SAL_OVERRIDE; + virtual sal_uInt32 GetPointCount() const SAL_OVERRIDE; + virtual Point GetPoint(sal_uInt32 i) const SAL_OVERRIDE; + virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) SAL_OVERRIDE; + + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; /** updates edges that are connected to the edges of this object as if the connected objects send a repaint broadcast @@ -306,8 +306,8 @@ public: void setGluePointIndex( bool bTail, sal_Int32 nId = -1 ); sal_Int32 getGluePointIndex( bool bTail ); - virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const SAL_OVERRIDE; + virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE; // for geometry access ::basegfx::B2DPolygon getEdgeTrack() const; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 4ca3a238e166..4a3779a0f85f 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -72,8 +72,8 @@ private: friend class SdrGraphicLink; private: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; void ImpSetAttrToGrafInfo(); // Werte vom Pool kopieren GraphicAttr aGrafInfo; @@ -147,44 +147,44 @@ public: void StartAnimation(OutputDevice* pOutDev, const Point& rPoint, const Size& rSize, long nExtraData=0L); - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; // #i25616# - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; - virtual SdrGrafObj* Clone() const; + virtual SdrGrafObj* Clone() const SAL_OVERRIDE; SdrGrafObj& operator=(const SdrGrafObj& rObj); - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; bool HasGDIMetaFile() const; - virtual void SetPage(SdrPage* pNewPage); - virtual void SetModel(SdrModel* pNewModel); + virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; bool isEmbeddedSvg() const; GDIMetaFile getMetafileFromEmbeddedSvg() const; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); + virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) SAL_OVERRIDE; - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; bool IsMirrored() const; void SetMirrored( bool _bMirrored ); @@ -196,7 +196,7 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > getInputStream(); // #i103116# FullDrag support - virtual SdrObject* getFullDragClone() const; + virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; // add handles for crop mode when selected void addCropHandles(SdrHdlList& rTarget) const; diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx index 5851b6280688..4a89e8f3a61d 100644 --- a/include/svx/svdogrp.hxx +++ b/include/svx/svdogrp.hxx @@ -39,8 +39,8 @@ class SVX_DLLPUBLIC SdrObjGroup : public SdrObject { private: protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; SdrObjList* pSub; // Subliste (Kinder) Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe @@ -51,63 +51,63 @@ public: SdrObjGroup(); virtual ~SdrObjGroup(); - virtual void SetBoundRectDirty(); - virtual sal_uInt16 GetObjIdentifier() const; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual SdrLayerID GetLayer() const; - virtual void NbcSetLayer(SdrLayerID nLayer); - virtual void SetObjList(SdrObjList* pNewObjList); - virtual void SetPage(SdrPage* pNewPage); - virtual void SetModel(SdrModel* pNewModel); - virtual bool HasRefPoint() const; - virtual Point GetRefPoint() const; - virtual void SetRefPoint(const Point& rPnt); - virtual SdrObjList* GetSubList() const; - - virtual const Rectangle& GetCurrentBoundRect() const; - virtual const Rectangle& GetSnapRect() const; - - virtual SdrObjGroup* Clone() const; + virtual void SetBoundRectDirty() SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual SdrLayerID GetLayer() const SAL_OVERRIDE; + virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE; + virtual void SetObjList(SdrObjList* pNewObjList) SAL_OVERRIDE; + virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + virtual bool HasRefPoint() const SAL_OVERRIDE; + virtual Point GetRefPoint() const SAL_OVERRIDE; + virtual void SetRefPoint(const Point& rPnt) SAL_OVERRIDE; + virtual SdrObjList* GetSubList() const SAL_OVERRIDE; + + virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; + + virtual SdrObjGroup* Clone() const SAL_OVERRIDE; SdrObjGroup& operator=(const SdrObjGroup& rObj); - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual void RecalcSnapRect(); - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; // special drag methods - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - - virtual bool BegCreate(SdrDragStat& rStat); - - virtual long GetRotateAngle() const; - virtual long GetShearAngle(bool bVertical = false) const; - - virtual void Move(const Size& rSiz); - virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true); - virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); - virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual void SetAnchorPos(const Point& rPnt); - virtual void SetRelativePos(const Point& rPnt); - virtual void SetSnapRect(const Rectangle& rRect); - virtual void SetLogicRect(const Rectangle& rRect); - - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual void NbcSetAnchorPos(const Point& rPnt); - virtual void NbcSetRelativePos(const Point& rPnt); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - - virtual void NbcReformatText(); - virtual void ReformatText(); - - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + + virtual long GetRotateAngle() const SAL_OVERRIDE; + virtual long GetShearAngle(bool bVertical = false) const SAL_OVERRIDE; + + virtual void Move(const Size& rSiz) SAL_OVERRIDE; + virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE; + virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + virtual void SetAnchorPos(const Point& rPnt) SAL_OVERRIDE; + virtual void SetRelativePos(const Point& rPnt) SAL_OVERRIDE; + virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + + virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + virtual void NbcSetAnchorPos(const Point& rPnt) SAL_OVERRIDE; + virtual void NbcSetRelativePos(const Point& rPnt) SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + + virtual void NbcReformatText() SAL_OVERRIDE; + virtual void ReformatText() SAL_OVERRIDE; + + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SVDOGRP_HXX diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx index 27d083789724..5cea5fe2de8b 100644 --- a/include/svx/svdomeas.hxx +++ b/include/svx/svdomeas.hxx @@ -64,8 +64,8 @@ private: friend class SdrMeasureField; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; Point aPt1; Point aPt2; @@ -80,9 +80,9 @@ protected: void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(true); } } void UndirtyText() const; - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -90,66 +90,66 @@ public: SdrMeasureObj(const Point& rPt1, const Point& rPt2); virtual ~SdrMeasureObj(); - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; - virtual SdrMeasureObj* Clone() const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const SAL_OVERRIDE; + virtual SdrMeasureObj* Clone() const SAL_OVERRIDE; - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; - - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - virtual Pointer GetCreatePointer() const; - - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - virtual long GetRotateAngle() const; - virtual void RecalcSnapRect(); - - virtual sal_uInt32 GetSnapPointCount() const; - virtual Point GetSnapPoint(sal_uInt32 i) const; - - virtual bool IsPolyObj() const; - virtual sal_uInt32 GetPointCount() const; - virtual Point GetPoint(sal_uInt32 i) const; - virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); - - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; - - virtual bool BegTextEdit(SdrOutliner& rOutl); - virtual const Size& GetTextSize() const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual Pointer GetCreatePointer() const SAL_OVERRIDE; + + virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + virtual long GetRotateAngle() const SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; + + virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE; + virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; + + virtual bool IsPolyObj() const SAL_OVERRIDE; + virtual sal_uInt32 GetPointCount() const SAL_OVERRIDE; + virtual Point GetPoint(sal_uInt32 i) const SAL_OVERRIDE; + virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) SAL_OVERRIDE; + + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; + + virtual bool BegTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE; + virtual const Size& GetTextSize() const SAL_OVERRIDE; virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, - Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; - virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; - virtual sal_uInt16 GetOutlinerViewAnchorMode() const; - virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); - virtual OutlinerParaObject* GetOutlinerParaObject() const; + Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const SAL_OVERRIDE; + virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const SAL_OVERRIDE; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const SAL_OVERRIDE; + virtual sal_uInt16 GetOutlinerViewAnchorMode() const SAL_OVERRIDE; + virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) SAL_OVERRIDE; + virtual OutlinerParaObject* GetOutlinerParaObject() const SAL_OVERRIDE; virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, - bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const; + bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const SAL_OVERRIDE; // #i97878# - virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const SAL_OVERRIDE; + virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE; }; // Creating: diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 2fef2413a16f..b9690e0f1dfc 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -45,18 +45,18 @@ public: virtual ~SdrMediaObj(); - virtual bool HasTextEdit() const; + virtual bool HasTextEdit() const SAL_OVERRIDE; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual SdrMediaObj* Clone() const; + virtual SdrMediaObj* Clone() const SAL_OVERRIDE; SdrMediaObj& operator=(const SdrMediaObj& rObj); - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); + virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) SAL_OVERRIDE; public: @@ -76,7 +76,7 @@ public: protected: virtual void mediaPropertiesChanged( const ::avmedia::MediaItem& rNewState ); - virtual ::sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual ::sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; private: struct Impl; diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx index 6a12228c551c..ce4264086ae7 100644 --- a/include/svx/svdoole2.hxx +++ b/include/svx/svdoole2.hxx @@ -55,8 +55,8 @@ private: SdrObject* createSdrGrafObjReplacement(bool bAddText, bool bUseHCGraphic) const; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; svt::EmbeddedObjectRef xObjRef; Graphic* pGraphic; @@ -127,8 +127,8 @@ public: void AbandonObject(); - virtual void SetPage(SdrPage* pNewPage); - virtual void SetModel(SdrModel* pModel); + virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pModel) SAL_OVERRIDE; /** Change the IsClosedObj attribute @@ -138,21 +138,21 @@ public: void SetClosedObj( bool bIsClosed ); // FullDrag support - virtual SdrObject* getFullDragClone() const; + virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - SdrOle2Obj* Clone() const; + SdrOle2Obj* Clone() const SAL_OVERRIDE; SdrOle2Obj& operator=(const SdrOle2Obj& rObj); - virtual void NbcMove(const Size& rSize); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual void SetGeoData(const SdrObjGeoData& rGeo); + virtual void NbcMove(const Size& rSize) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void SetGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; static bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); @@ -188,7 +188,7 @@ public: void SetWindow(const com::sun::star::uno::Reference < com::sun::star::awt::XWindow >& _xWindow); // #i118485# missing converter added - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SVDOOLE2_HXX diff --git a/include/svx/svdoopengl.hxx b/include/svx/svdoopengl.hxx index 03d740512963..857e313ae2bc 100644 --- a/include/svx/svdoopengl.hxx +++ b/include/svx/svdoopengl.hxx @@ -16,7 +16,7 @@ class SVX_DLLPUBLIC SdrOpenGLObj : public SdrObject { public: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE { return new sdr::contact::ViewContactOfOpenGLObj(*this); } diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 5712feccc6f7..48a9235afbf2 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -30,7 +30,7 @@ public: // this method is called form the destructor of the referenced page. // do all necessary action to forget the page. It is not necessary to call // RemovePageUser(), that is done form the destructor. - virtual void PageInDestruction(const SdrPage& rPage); + virtual void PageInDestruction(const SdrPage& rPage) SAL_OVERRIDE; private: // #111111# @@ -38,8 +38,8 @@ private: SdrPage* mpShownPage; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -52,15 +52,15 @@ public: void SetReferencedPage(SdrPage* pNewPage); // #i96598# - virtual void SetBoundRectDirty(); + virtual void SetBoundRectDirty() SAL_OVERRIDE; - virtual sal_uInt16 GetObjIdentifier() const; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual SdrPageObj* Clone() const; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual SdrPageObj* Clone() const SAL_OVERRIDE; SdrPageObj& operator=(const SdrPageObj& rObj); - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; }; diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index dc57bc8121b1..b9cb18f73630 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -47,7 +47,7 @@ private: friend class ImpPathForDragAndCreate; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; basegfx::B2DPolyPolygon maPathPolygon; SdrObjKind meKind; @@ -68,7 +68,7 @@ protected: public: static bool ImpFindPolyPnt(const basegfx::B2DPolyPolygon& rPoly, sal_uInt32 nAbsPnt, sal_uInt32& rPolyNum, sal_uInt32& rPointNum); - virtual void SetRectsDirty(bool bNotMyself = false); + virtual void SetRectsDirty(bool bNotMyself = false) SAL_OVERRIDE; double GetBrightness() { return mdBrightness; } public: @@ -77,55 +77,55 @@ public: SdrPathObj(SdrObjKind eNewKind, const basegfx::B2DPolyPolygon& rPathPoly, double dBrightness = 1.0); virtual ~SdrPathObj(); - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; - virtual SdrPathObj* Clone() const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const SAL_OVERRIDE; + virtual SdrPathObj* Clone() const SAL_OVERRIDE; SdrPathObj& operator=(const SdrPathObj& rObj); - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual void RecalcSnapRect(); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; - virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const; - virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlNum) const; - virtual void AddToHdlList(SdrHdlList& rHdlList) const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; + virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const SAL_OVERRIDE; + virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlNum) const SAL_OVERRIDE; + virtual void AddToHdlList(SdrHdlList& rHdlList) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - Pointer GetCreatePointer() const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + Pointer GetCreatePointer() const SAL_OVERRIDE; // during drag or create, allow accessing the so-far created/modified polyPolygon basegfx::B2DPolyPolygon getObjectPolyPolygon(const SdrDragStat& rDrag) const; basegfx::B2DPolyPolygon getDragPolyPolygon(const SdrDragStat& rDrag) const; - virtual void NbcMove(const Size& aSize); - virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact); - virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos); - virtual void NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2); - virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear); + virtual void NbcMove(const Size& aSize) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, bool bVShear) SAL_OVERRIDE; - virtual sal_uInt32 GetSnapPointCount() const; - virtual Point GetSnapPoint(sal_uInt32 i) const; + virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE; + virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; - virtual bool IsPolyObj() const; - virtual sal_uInt32 GetPointCount() const; - virtual Point GetPoint(sal_uInt32 nHdlNum) const; - virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum); + virtual bool IsPolyObj() const SAL_OVERRIDE; + virtual sal_uInt32 GetPointCount() const SAL_OVERRIDE; + virtual Point GetPoint(sal_uInt32 nHdlNum) const SAL_OVERRIDE; + virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 nHdlNum) SAL_OVERRIDE; // insert point sal_uInt32 NbcInsPointOld(const Point& rPos, bool bNewObj, bool bHideHim); @@ -135,12 +135,12 @@ public: SdrObject* RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index); protected: - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; public: - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; // Bezier-polygon getter/setter const basegfx::B2DPolyPolygon& GetPathPoly() const { return maPathPolygon; } @@ -165,11 +165,11 @@ public: // // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. - virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const SAL_OVERRIDE; // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has // to use (0,0) as upper left and will be scaled to the given size in the matrix. - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); + virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SVDOPATH_HXX diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx index fc6bbb5265bd..afd1d57b08b4 100644 --- a/include/svx/svdorect.hxx +++ b/include/svx/svdorect.hxx @@ -48,8 +48,8 @@ private: friend class SdrTextObj; // wg SetXPolyDirty bei GrowAdjust protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; XPolygon* mpXPoly; @@ -61,7 +61,7 @@ protected: // Instanz generiert (new) und an mpXPoly zugewiesen werden. virtual void RecalcXPoly(); const XPolygon& GetXPoly() const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -79,46 +79,46 @@ public: SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect); virtual ~SdrRectObj(); - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const SAL_OVERRIDE; - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual SdrRectObj* Clone() const; - virtual void RecalcSnapRect(); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; + virtual SdrRectObj* Clone() const SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE; - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - virtual Pointer GetCreatePointer() const; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual Pointer GetCreatePointer() const SAL_OVERRIDE; - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); + virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; - virtual bool DoMacro(const SdrObjMacroHitRec& rRec); - virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; + virtual bool DoMacro(const SdrObjMacroHitRec& rRec) SAL_OVERRIDE; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; - virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; - virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const SAL_OVERRIDE; + virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const SAL_OVERRIDE; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SVDORECT_HXX diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx index aaa9573ae735..2594a3544e3d 100644 --- a/include/svx/svdotable.hxx +++ b/include/svx/svdotable.hxx @@ -157,114 +157,114 @@ public: // text stuff /** returns the currently active text. */ - virtual SdrText* getActiveText() const; + virtual SdrText* getActiveText() const SAL_OVERRIDE; /** returns the nth available text. */ - virtual SdrText* getText( sal_Int32 nIndex ) const; + virtual SdrText* getText( sal_Int32 nIndex ) const SAL_OVERRIDE; /** returns the number of texts available for this object. */ - virtual sal_Int32 getTextCount() const; + virtual sal_Int32 getTextCount() const SAL_OVERRIDE; /** changes the current active text */ - virtual void setActiveText( sal_Int32 nIndex ); + virtual void setActiveText( sal_Int32 nIndex ) SAL_OVERRIDE; /** returns the index of the text that contains the given point or -1 */ - virtual sal_Int32 CheckTextHit(const Point& rPnt) const; + virtual sal_Int32 CheckTextHit(const Point& rPnt) const SAL_OVERRIDE; // #i121917# - virtual bool HasText() const; + virtual bool HasText() const SAL_OVERRIDE; bool IsTextEditActive() const { return (pEdtOutl != 0L); } bool IsTextEditActive( const sdr::table::CellPos& rPos ); /** returns true only if we are in edit mode and the user actually changed anything */ - virtual bool IsRealyEdited() const; + virtual bool IsRealyEdited() const SAL_OVERRIDE; // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const SAL_OVERRIDE; virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; - virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; + virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const SAL_OVERRIDE; - virtual bool IsAutoGrowHeight() const; + virtual bool IsAutoGrowHeight() const SAL_OVERRIDE; long GetMinTextFrameHeight() const; long GetMaxTextFrameHeight() const; - virtual bool IsAutoGrowWidth() const; + virtual bool IsAutoGrowWidth() const SAL_OVERRIDE; long GetMinTextFrameWidth() const; long GetMaxTextFrameWidth() const; - virtual bool IsFontwork() const; + virtual bool IsFontwork() const SAL_OVERRIDE; - virtual void SetPage(SdrPage* pNewPage); - virtual void SetModel(SdrModel* pNewModel); - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual void SetChanged(); + virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual void SetChanged() SAL_OVERRIDE; - virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; - virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true); - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; - virtual SdrTableObj* Clone() const; + virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const SAL_OVERRIDE; + virtual bool AdjustTextFrameWidthAndHeight(bool bHgt = true, bool bWdt = true) SAL_OVERRIDE; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; + virtual SdrTableObj* Clone() const SAL_OVERRIDE; SdrTableObj& operator=(const SdrTableObj& rObj); - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual basegfx::B2DPolyPolygon TakeContour() const; - virtual void RecalcSnapRect(); - virtual const Rectangle& GetSnapRect() const; - virtual void NbcSetSnapRect(const Rectangle& rRect); + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; - virtual const Rectangle& GetLogicRect() const; - virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); + virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ) SAL_OVERRIDE; - virtual sal_uInt32 GetSnapPointCount() const; - virtual Point GetSnapPoint(sal_uInt32 i) const; + virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE; + virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; - virtual void AddToHdlList(SdrHdlList& rHdlList) const; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; + virtual void AddToHdlList(SdrHdlList& rHdlList) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; - - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - virtual Pointer GetCreatePointer() const; - - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - - virtual bool BegTextEdit(SdrOutliner& rOutl); - virtual void EndTextEdit(SdrOutliner& rOutl); - virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual Pointer GetCreatePointer() const SAL_OVERRIDE; + + virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + + virtual bool BegTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE; + virtual void EndTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE; + virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const SAL_OVERRIDE; virtual void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; - virtual sal_uInt16 GetOutlinerViewAnchorMode() const; + virtual sal_uInt16 GetOutlinerViewAnchorMode() const SAL_OVERRIDE; - virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); + virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) SAL_OVERRIDE; - virtual OutlinerParaObject* GetOutlinerParaObject() const; - virtual OutlinerParaObject* GetEditOutlinerParaObject() const; + virtual OutlinerParaObject* GetOutlinerParaObject() const SAL_OVERRIDE; + virtual OutlinerParaObject* GetEditOutlinerParaObject() const SAL_OVERRIDE; - virtual void NbcReformatText(); - virtual void ReformatText(); + virtual void NbcReformatText() SAL_OVERRIDE; + virtual void ReformatText() SAL_OVERRIDE; void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; } - virtual bool IsVerticalWriting() const; - virtual void SetVerticalWriting(bool bVertical); + virtual bool IsVerticalWriting() const SAL_OVERRIDE; + virtual void SetVerticalWriting(bool bVertical) SAL_OVERRIDE; com::sun::star::text::WritingMode GetWritingMode() const; - virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ); + virtual void onEditOutlinerStatusEvent( EditStatus* pEditStatus ) SAL_OVERRIDE; @@ -277,12 +277,12 @@ public: // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. - virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const SAL_OVERRIDE; // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has // to use (0,0) as upper left and will be scaled to the given size in the matrix. - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); + virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE; // #103836# iterates over the paragraphs of a given SdrObject and removes all // hard set character attributes with the which ids contained in the @@ -297,12 +297,12 @@ private: void init( sal_Int32 nColumns, sal_Int32 nRows ); protected: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; private: SdrOutliner* GetCellTextEditOutliner( const ::sdr::table::Cell& rCell ) const; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 84393da7da29..d5f8e01c3353 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -108,7 +108,7 @@ public: ImpSdrObjTextLinkUserData(SdrTextObj* pObj1); virtual ~ImpSdrObjTextLinkUserData(); - virtual SdrObjUserData* Clone(SdrObject* pObj1) const; + virtual SdrObjUserData* Clone(SdrObject* pObj1) const SAL_OVERRIDE; }; namespace sdr @@ -137,8 +137,8 @@ private: friend class sdr::properties::CustomShapeProperties; protected: - virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties(); - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::properties::BaseProperties* CreateObjectSpecificProperties() SAL_OVERRIDE; + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; private: // This method is only allowed for sdr::properties::TextProperties @@ -286,9 +286,9 @@ protected: // rAnchorRect ist InOut-Parameter! void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, bool bLineWidth ) const; - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; bool NbcSetEckenradius(long nRad); bool NbcSetAutoGrowHeight(bool bAuto); bool NbcSetMaxTextFrameHeight(long nHgt); @@ -345,7 +345,7 @@ public: SdrObjKind GetTextKind() const { return eTextKind; } // #i121917# - virtual bool HasText() const; + virtual bool HasText() const SAL_OVERRIDE; bool HasEditText() const; bool IsTextEditActive() const { return (pEdtOutl != 0L); } @@ -354,10 +354,10 @@ public: virtual SdrText* getActiveText() const; /** returns the nth available text. */ - virtual SdrText* getText( sal_Int32 nIndex ) const; + virtual SdrText* getText( sal_Int32 nIndex ) const SAL_OVERRIDE; /** returns the number of texts available for this object. */ - virtual sal_Int32 getTextCount() const; + virtual sal_Int32 getTextCount() const SAL_OVERRIDE; /** returns true only if we are in edit mode and the user actually changed anything */ virtual bool IsRealyEdited() const; @@ -422,69 +422,69 @@ public: SdrTextAniKind GetTextAniKind() const; SdrTextAniDirection GetTextAniDirection() const; - virtual void SetPage(SdrPage* pNewPage); - virtual void SetModel(SdrModel* pNewModel); - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; + virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; // Wird zur Bestimmung des Textankerbereichs benoetigt virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; - virtual SdrTextObj* Clone() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; + virtual SdrTextObj* Clone() const SAL_OVERRIDE; SdrTextObj& operator=(const SdrTextObj& rObj); - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual basegfx::B2DPolyPolygon TakeContour() const; - virtual void RecalcSnapRect(); - virtual void NbcSetSnapRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual const Rectangle& GetLogicRect() const; - virtual long GetRotateAngle() const; - virtual long GetShearAngle(bool bVertical = false) const; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeContour() const SAL_OVERRIDE; + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; + virtual long GetRotateAngle() const SAL_OVERRIDE; + virtual long GetShearAngle(bool bVertical = false) const SAL_OVERRIDE; - virtual sal_uInt32 GetSnapPointCount() const; - virtual Point GetSnapPoint(sal_uInt32 i) const; + virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE; + virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; - - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - virtual Pointer GetCreatePointer() const; - - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - - virtual bool HasTextEdit() const; - virtual bool BegTextEdit(SdrOutliner& rOutl); + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual Pointer GetCreatePointer() const SAL_OVERRIDE; + + virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + + virtual bool HasTextEdit() const SAL_OVERRIDE; + virtual bool BegTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; - virtual void EndTextEdit(SdrOutliner& rOutl); + virtual void EndTextEdit(SdrOutliner& rOutl) SAL_OVERRIDE; virtual sal_uInt16 GetOutlinerViewAnchorMode() const; - virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); + virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) SAL_OVERRIDE; void NbcSetOutlinerParaObjectForText( OutlinerParaObject* pTextObject, SdrText* pText ); - virtual OutlinerParaObject* GetOutlinerParaObject() const; + virtual OutlinerParaObject* GetOutlinerParaObject() const SAL_OVERRIDE; virtual OutlinerParaObject* GetEditOutlinerParaObject() const; - virtual void NbcReformatText(); - virtual void ReformatText(); + virtual void NbcReformatText() SAL_OVERRIDE; + virtual void ReformatText() SAL_OVERRIDE; virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, OUString& rRet) const; - virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const; + virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const SAL_OVERRIDE; void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; } @@ -536,12 +536,12 @@ public: // gets base transformation and rectangle of object. If it's an SdrPathObj it fills the PolyPolygon // with the base geometry and returns TRUE. Otherwise it returns FALSE. - virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const; + virtual bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const SAL_OVERRIDE; // sets the base geometry of the object using infos contained in the homogen 3x3 matrix. // If it's an SdrPathObj it will use the provided geometry information. The Polygon has // to use (0,0) as upper left and will be scaled to the given size in the matrix. - virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); + virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon) SAL_OVERRIDE; // #103836# iterates over the paragraphs of a given SdrObject and removes all // hard set character attributes with the which ids contained in the diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx index 3037fe0f02f2..57475455553b 100644 --- a/include/svx/svdouno.hxx +++ b/include/svx/svdouno.hxx @@ -72,28 +72,28 @@ public: bool bOwnsModel = true); virtual ~SdrUnoObj(); - virtual void SetPage(SdrPage* pNewPage); - virtual void SetModel(SdrModel* pModel); + virtual void SetPage(SdrPage* pNewPage) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pModel) SAL_OVERRIDE; - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt16 GetObjIdentifier() const; + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; - virtual SdrUnoObj* Clone() const; + virtual SdrUnoObj* Clone() const SAL_OVERRIDE; SdrUnoObj& operator= (const SdrUnoObj& rObj); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcSetLayer(SdrLayerID nLayer); + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcSetLayer(SdrLayerID nLayer) SAL_OVERRIDE; // SpecialDrag support - virtual bool hasSpecialDrag() const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; // FullDrag support - virtual bool supportsFullDrag() const; - virtual SdrObject* getFullDragClone() const; + virtual bool supportsFullDrag() const SAL_OVERRIDE; + virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual void SetContextWritingMode( const sal_Int16 _nContextWritingMode ); + virtual void SetContextWritingMode( const sal_Int16 _nContextWritingMode ) SAL_OVERRIDE; ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > GetUnoControlModel() const {return xUnoControlModel;} ::com::sun::star::uno::Reference< com::sun::star::awt::XControl > GetUnoControl(const SdrView& _rView, const OutputDevice& _rOut) const; @@ -135,7 +135,7 @@ public: protected: // SdrObject overridables - virtual ::sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual ::sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; private: /** retrieves the typed ViewContact for the object diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx index 0c650ecfe72e..bfbdc249c4ca 100644 --- a/include/svx/svdoutl.hxx +++ b/include/svx/svdoutl.hxx @@ -44,7 +44,7 @@ public: void setVisualizedPage(const SdrPage* pPage) { if(pPage != mpVisualizedPage) mpVisualizedPage = pPage; } const SdrPage* getVisualizedPage() const { return mpVisualizedPage; } - virtual OUString CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor); + virtual OUString CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rpTxtColor, Color*& rpFldColor) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SVDOUTL_HXX diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx index 7b299e4132e9..766b8070c9ec 100644 --- a/include/svx/svdovirt.hxx +++ b/include/svx/svdovirt.hxx @@ -36,20 +36,20 @@ class SVX_DLLPUBLIC SdrVirtObj : public SdrObject { public: - virtual sdr::properties::BaseProperties& GetProperties() const; + virtual sdr::properties::BaseProperties& GetProperties() const SAL_OVERRIDE; protected: - virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact(); + virtual sdr::contact::ViewContact* CreateObjectSpecificViewContact() SAL_OVERRIDE; SdrObject& rRefObj; // Referenziertes Zeichenobjekt Rectangle aSnapRect; protected: - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; - virtual SdrObjGeoData* NewGeoData() const; - virtual void SaveGeoData(SdrObjGeoData& rGeo) const; - virtual void RestGeoData(const SdrObjGeoData& rGeo); + virtual SdrObjGeoData* NewGeoData() const SAL_OVERRIDE; + virtual void SaveGeoData(SdrObjGeoData& rGeo) const SAL_OVERRIDE; + virtual void RestGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; public: TYPEINFO_OVERRIDE(); @@ -57,93 +57,93 @@ public: virtual ~SdrVirtObj(); virtual SdrObject& ReferencedObj(); virtual const SdrObject& GetReferencedObj() const; - virtual void NbcSetAnchorPos(const Point& rAnchorPos); - virtual void SetModel(SdrModel* pNewModel); - - virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual sal_uInt32 GetObjInventor() const; - virtual sal_uInt16 GetObjIdentifier() const; - virtual SdrObjList* GetSubList() const; - - virtual const Rectangle& GetCurrentBoundRect() const; - virtual const Rectangle& GetLastBoundRect() const; - virtual void RecalcBoundRect(); - virtual void SetChanged(); - virtual SdrVirtObj* Clone() const; + virtual void NbcSetAnchorPos(const Point& rAnchorPos) SAL_OVERRIDE; + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; + + virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const SAL_OVERRIDE; + virtual sal_uInt32 GetObjInventor() const SAL_OVERRIDE; + virtual sal_uInt16 GetObjIdentifier() const SAL_OVERRIDE; + virtual SdrObjList* GetSubList() const SAL_OVERRIDE; + + virtual const Rectangle& GetCurrentBoundRect() const SAL_OVERRIDE; + virtual const Rectangle& GetLastBoundRect() const SAL_OVERRIDE; + virtual void RecalcBoundRect() SAL_OVERRIDE; + virtual void SetChanged() SAL_OVERRIDE; + virtual SdrVirtObj* Clone() const SAL_OVERRIDE; SdrVirtObj& operator=(const SdrVirtObj& rObj); - virtual OUString TakeObjNameSingul() const; - virtual OUString TakeObjNamePlural() const; + virtual OUString TakeObjNameSingul() const SAL_OVERRIDE; + virtual OUString TakeObjNamePlural() const SAL_OVERRIDE; - virtual basegfx::B2DPolyPolygon TakeXorPoly() const; - virtual sal_uInt32 GetHdlCount() const; - virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; - virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const; - virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlNum) const; - virtual void AddToHdlList(SdrHdlList& rHdlList) const; + virtual basegfx::B2DPolyPolygon TakeXorPoly() const SAL_OVERRIDE; + virtual sal_uInt32 GetHdlCount() const SAL_OVERRIDE; + virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const SAL_OVERRIDE; + virtual sal_uInt32 GetPlusHdlCount(const SdrHdl& rHdl) const SAL_OVERRIDE; + virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlNum) const SAL_OVERRIDE; + virtual void AddToHdlList(SdrHdlList& rHdlList) const SAL_OVERRIDE; // special drag methods - virtual bool hasSpecialDrag() const; - virtual bool beginSpecialDrag(SdrDragStat& rDrag) const; - virtual bool applySpecialDrag(SdrDragStat& rDrag); - virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const; - virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const; + virtual bool hasSpecialDrag() const SAL_OVERRIDE; + virtual bool beginSpecialDrag(SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual bool applySpecialDrag(SdrDragStat& rDrag) SAL_OVERRIDE; + virtual OUString getSpecialDragComment(const SdrDragStat& rDrag) const SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; // FullDrag support - virtual bool supportsFullDrag() const; - virtual SdrObject* getFullDragClone() const; - - virtual bool BegCreate(SdrDragStat& rStat); - virtual bool MovCreate(SdrDragStat& rStat); - virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); - virtual bool BckCreate(SdrDragStat& rStat); - virtual void BrkCreate(SdrDragStat& rStat); - virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; - - virtual void NbcMove(const Size& rSiz); - virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); - virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs); - virtual void NbcMirror(const Point& rRef1, const Point& rRef2); - virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear); - - virtual void Move(const Size& rSiz); - virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true); - virtual void Rotate(const Point& rRef, long nWink, double sn, double cs); - virtual void Mirror(const Point& rRef1, const Point& rRef2); - virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear); - - virtual void RecalcSnapRect(); - virtual const Rectangle& GetSnapRect() const; - virtual void SetSnapRect(const Rectangle& rRect); - virtual void NbcSetSnapRect(const Rectangle& rRect); - - virtual const Rectangle& GetLogicRect() const; - virtual void SetLogicRect(const Rectangle& rRect); - virtual void NbcSetLogicRect(const Rectangle& rRect); - - virtual long GetRotateAngle() const; - virtual long GetShearAngle(bool bVertical = false) const; - - virtual sal_uInt32 GetSnapPointCount() const; - virtual Point GetSnapPoint(sal_uInt32 i) const; - - virtual bool IsPolyObj() const; - virtual sal_uInt32 GetPointCount() const; - virtual Point GetPoint(sal_uInt32 i) const; - virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); - - virtual SdrObjGeoData* GetGeoData() const; - virtual void SetGeoData(const SdrObjGeoData& rGeo); - - virtual void NbcReformatText(); - virtual void ReformatText(); - - virtual bool HasMacro() const; - virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const; - virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const; - virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const; - virtual bool DoMacro (const SdrObjMacroHitRec& rRec); - virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; + virtual bool supportsFullDrag() const SAL_OVERRIDE; + virtual SdrObject* getFullDragClone() const SAL_OVERRIDE; + + virtual bool BegCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool MovCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SAL_OVERRIDE; + virtual bool BckCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual void BrkCreate(SdrDragStat& rStat) SAL_OVERRIDE; + virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const SAL_OVERRIDE; + + virtual void NbcMove(const Size& rSiz) SAL_OVERRIDE; + virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact) SAL_OVERRIDE; + virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void NbcMirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + + virtual void Move(const Size& rSiz) SAL_OVERRIDE; + virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true) SAL_OVERRIDE; + virtual void Rotate(const Point& rRef, long nWink, double sn, double cs) SAL_OVERRIDE; + virtual void Mirror(const Point& rRef1, const Point& rRef2) SAL_OVERRIDE; + virtual void Shear(const Point& rRef, long nWink, double tn, bool bVShear) SAL_OVERRIDE; + + virtual void RecalcSnapRect() SAL_OVERRIDE; + virtual const Rectangle& GetSnapRect() const SAL_OVERRIDE; + virtual void SetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetSnapRect(const Rectangle& rRect) SAL_OVERRIDE; + + virtual const Rectangle& GetLogicRect() const SAL_OVERRIDE; + virtual void SetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + virtual void NbcSetLogicRect(const Rectangle& rRect) SAL_OVERRIDE; + + virtual long GetRotateAngle() const SAL_OVERRIDE; + virtual long GetShearAngle(bool bVertical = false) const SAL_OVERRIDE; + + virtual sal_uInt32 GetSnapPointCount() const SAL_OVERRIDE; + virtual Point GetSnapPoint(sal_uInt32 i) const SAL_OVERRIDE; + + virtual bool IsPolyObj() const SAL_OVERRIDE; + virtual sal_uInt32 GetPointCount() const SAL_OVERRIDE; + virtual Point GetPoint(sal_uInt32 i) const SAL_OVERRIDE; + virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i) SAL_OVERRIDE; + + virtual SdrObjGeoData* GetGeoData() const SAL_OVERRIDE; + virtual void SetGeoData(const SdrObjGeoData& rGeo) SAL_OVERRIDE; + + virtual void NbcReformatText() SAL_OVERRIDE; + virtual void ReformatText() SAL_OVERRIDE; + + virtual bool HasMacro() const SAL_OVERRIDE; + virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; + virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; + virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; + virtual bool DoMacro (const SdrObjMacroHitRec& rRec) SAL_OVERRIDE; + virtual OUString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const SAL_OVERRIDE; // OD 30.06.2003 #108784# - virtual <GetOffset()> returns Point(0,0) // #i73248# for default SdrVirtObj, offset is aAnchor, not (0,0) diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 8214f40eb92b..077b66964803 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -391,9 +391,9 @@ public: virtual ~SdrPageProperties(); // Notify(...) from baseclass SfxListener - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; - virtual bool isUsedByModel() const; + virtual bool isUsedByModel() const SAL_OVERRIDE; // data read/write const SfxItemSet& GetItemSet() const; @@ -522,7 +522,7 @@ public: virtual sal_Int32 GetRgtBorder() const; virtual sal_Int32 GetLwrBorder() const; - virtual void SetModel(SdrModel* pNewModel); + virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; // New MasterPage interface bool TRG_HasMasterPage() const { return (0L != mpMasterPageDescriptor); } @@ -596,7 +596,7 @@ public: // different, overload the method and at least do what the method does. virtual drawinglayer::primitive2d::Primitive2DSequence createRedirectedPrimitive2DSequence( const sdr::contact::ViewObjectContact& rOriginal, - const sdr::contact::DisplayInfo& rDisplayInfo); + const sdr::contact::DisplayInfo& rDisplayInfo) SAL_OVERRIDE; }; diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 49b34766ef02..4026b1db0647 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -235,7 +235,7 @@ protected: protected: void AppendPaintWindow(SdrPaintWindow& rNew); SdrPaintWindow* RemovePaintWindow(SdrPaintWindow& rOld); - void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ); + void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; public: sal_uInt32 PaintWindowCount() const { return maPaintWindows.size(); } @@ -266,7 +266,7 @@ public: bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; } protected: - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); + virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE; void GlueInvalidate() const; void ShowEncirclement(OutputDevice* pOut); diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index f3b79e13c8c1..568b7f4104ea 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -50,32 +50,32 @@ protected: virtual ~SdrPolyEditView(); public: - bool IsSetMarkedPointsSmoothPossible() const; - SdrPathSmoothKind GetMarkedPointsSmooth() const; - void SetMarkedPointsSmooth(SdrPathSmoothKind eKind); + bool IsSetMarkedPointsSmoothPossible() const SAL_OVERRIDE; + SdrPathSmoothKind GetMarkedPointsSmooth() const SAL_OVERRIDE; + void SetMarkedPointsSmooth(SdrPathSmoothKind eKind) SAL_OVERRIDE; // Ein PolySegment kann eine Strecke oder eine Bezierkurve sein. - bool IsSetMarkedSegmentsKindPossible() const; - SdrPathSegmentKind GetMarkedSegmentsKind() const; - void SetMarkedSegmentsKind(SdrPathSegmentKind eKind); + bool IsSetMarkedSegmentsKindPossible() const SAL_OVERRIDE; + SdrPathSegmentKind GetMarkedSegmentsKind() const SAL_OVERRIDE; + void SetMarkedSegmentsKind(SdrPathSegmentKind eKind) SAL_OVERRIDE; // Moeglicherweise ist das Obj hinterher geloescht: - void DeleteMarkedPoints(); - bool IsDeleteMarkedPointsPossible() const; + void DeleteMarkedPoints() SAL_OVERRIDE; + bool IsDeleteMarkedPointsPossible() const SAL_OVERRIDE; void MoveMarkedPoints(const Size& rSiz, bool bCopy=false); void ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); void RotateMarkedPoints(const Point& rRef, long nWink, bool bCopy=false); // Hierbei entstehen eventuell beliebig viele neue Objekte: - void RipUpAtMarkedPoints(); - bool IsRipUpAtMarkedPointsPossible() const; + void RipUpAtMarkedPoints() SAL_OVERRIDE; + bool IsRipUpAtMarkedPointsPossible() const SAL_OVERRIDE; // Alle markierten Polylines werden zu Polygonen, alle offenen // Bezierkurven zu geschlossenen. - void CloseMarkedObjects(bool bToggle=false, bool bOpen=false); // , long nOpenDistance=0); - bool IsOpenCloseMarkedObjectsPossible() const; - SdrObjClosedKind GetMarkedObjectsClosedState() const; + void CloseMarkedObjects(bool bToggle=false, bool bOpen=false) SAL_OVERRIDE; // , long nOpenDistance=0); + bool IsOpenCloseMarkedObjectsPossible() const SAL_OVERRIDE; + SdrObjClosedKind GetMarkedObjectsClosedState() const SAL_OVERRIDE; void CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmooth, bool& b1stSegm, bool& bCurve, bool& bSmoothFuz, bool& bSegmFuz, basegfx::B2VectorContinuity& eSmooth ); }; diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index 93b23fd14781..10e20c60b759 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -38,13 +38,13 @@ protected: virtual ~SdrItemPool(); public: - virtual SfxItemPool* Clone() const; + virtual SfxItemPool* Clone() const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(const SfxPoolItem& rItem, SfxItemPresentation ePresentation, SfxMapUnit ePresentationMetric, OUString& rText, const IntlWrapper * pIntlWrapper - = 0) const; + = 0) const SAL_OVERRIDE; static void TakeItemName(sal_uInt16 nWhich, OUString& rItemName); }; diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx index feee90765a76..815656a77a39 100644 --- a/include/svx/svdsnpv.hxx +++ b/include/svx/svdsnpv.hxx @@ -91,12 +91,12 @@ protected: virtual ~SdrSnapView(); public: - virtual bool IsAction() const; - virtual void MovAction(const Point& rPnt); - virtual void EndAction(); - virtual void BckAction(); - virtual void BrkAction(); // f.abg.Klassen Actions z,B, Draggen abbrechen. - virtual void TakeActionRect(Rectangle& rRect) const; + virtual bool IsAction() const SAL_OVERRIDE; + virtual void MovAction(const Point& rPnt) SAL_OVERRIDE; + virtual void EndAction() SAL_OVERRIDE; + virtual void BckAction() SAL_OVERRIDE; + virtual void BrkAction() SAL_OVERRIDE; // f.abg.Klassen Actions z,B, Draggen abbrechen. + virtual void TakeActionRect(Rectangle& rRect) const SAL_OVERRIDE; void SetSnapGridWidth(const Fraction& rX, const Fraction& rY) { aSnapWdtX=rX; aSnapWdtY=rY; } const Fraction& GetSnapGridWidthX() const { return aSnapWdtX; } diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 7f65f337a882..2904d87321ba 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -59,10 +59,10 @@ public: TYPEINFO_OVERRIDE(); virtual ~SdrUndoAction(); - virtual bool CanRepeat(SfxRepeatTarget& rView) const; - virtual void Repeat(SfxRepeatTarget& rView); + virtual bool CanRepeat(SfxRepeatTarget& rView) const SAL_OVERRIDE; + virtual void Repeat(SfxRepeatTarget& rView) SAL_OVERRIDE; - virtual OUString GetRepeatComment(SfxRepeatTarget& rView) const; + virtual OUString GetRepeatComment(SfxRepeatTarget& rView) const SAL_OVERRIDE; virtual OUString GetSdrRepeatComment(SdrView& rView) const; virtual bool CanSdrRepeat(SdrView& rView) const; @@ -98,14 +98,14 @@ public: void SetComment(const OUString& rStr) { aComment=rStr; } void SetObjDescription(const OUString& rStr) { aObjDescription=rStr; } - virtual OUString GetComment() const; - virtual OUString GetSdrRepeatComment(SdrView& rView) const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual bool CanSdrRepeat(SdrView& rView) const; - virtual void SdrRepeat(SdrView& rView); + virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; + virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; void SetRepeatFunction(SdrRepeatFunc eFunc) { eFunction=eFunc; } SdrRepeatFunc GetRepeatFunction() const { return eFunction; } }; @@ -164,14 +164,14 @@ protected: public: SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false); virtual ~SdrUndoAttrObj(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual OUString GetSdrRepeatComment(SdrView& rView) const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; - virtual void SdrRepeat(SdrView& rView); - virtual bool CanSdrRepeat(SdrView& rView) const; + virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; + virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; }; /** @@ -192,14 +192,14 @@ public: void SetDistance(const Size& rDist) { aDistance=rDist; } const Size& GetDistance() const { return aDistance; } - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual OUString GetSdrRepeatComment(SdrView& rView) const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; - virtual void SdrRepeat(SdrView& rView); - virtual bool CanSdrRepeat(SdrView& rView) const; + virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; + virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; }; /** @@ -219,10 +219,10 @@ public: SdrUndoGeoObj(SdrObject& rNewObj); virtual ~SdrUndoGeoObj(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; /** @@ -272,8 +272,8 @@ public: SdrUndoRemoveObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; virtual ~SdrUndoRemoveObj(); }; @@ -290,8 +290,8 @@ public: SdrUndoInsertObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoObjList(rNewObj,bOrdNumDirect) {} - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; /** @@ -307,14 +307,14 @@ private: public: SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual OUString GetSdrRepeatComment(SdrView& rView) const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; - virtual void SdrRepeat(SdrView& rView); - virtual bool CanSdrRepeat(SdrView& rView) const; + virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; + virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; }; /** @@ -328,10 +328,10 @@ public: SdrUndoNewObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoInsertObj(rNewObj,bOrdNumDirect) {} - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; static OUString GetComment(const SdrObject& _rForObject); }; @@ -355,8 +355,8 @@ public: SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect = false); virtual ~SdrUndoReplaceObj(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; bool IsNewOwner() { return bNewOwner; } void SetNewOwner(bool bNew); @@ -376,7 +376,7 @@ public: SdrUndoCopyObj(SdrObject& rNewObj, bool bOrdNumDirect = false) : SdrUndoNewObj(rNewObj,bOrdNumDirect) {} - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; class SdrUndoObjOrdNum : public SdrUndoObj @@ -388,10 +388,10 @@ protected: public: SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; @@ -406,8 +406,8 @@ protected: public: SdrUndoObjectLayerChange(SdrObject& rObj, SdrLayerID aOldLayer, SdrLayerID aNewLayer); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; }; class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj @@ -426,14 +426,14 @@ public: bool IsDifferent() const { return pOldText!=pNewText; } void AfterSetText(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual OUString GetSdrRepeatComment(SdrView& rView) const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; - virtual void SdrRepeat(SdrView& rView); - virtual bool CanSdrRepeat(SdrView& rView) const; + virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; + virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; }; /** @@ -461,10 +461,10 @@ public: const OUString& sOldStr, const OUString& sNewStr); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; @@ -500,10 +500,10 @@ public: SdrUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) {} - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; /** @@ -517,10 +517,10 @@ public: SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=true; } - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; /** @@ -536,10 +536,10 @@ public: SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {} - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; @@ -600,14 +600,14 @@ public: SdrUndoDelPage(SdrPage& rNewPg); virtual ~SdrUndoDelPage(); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; - virtual OUString GetSdrRepeatComment(SdrView& rView) const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; - virtual void SdrRepeat(SdrView& rView); - virtual bool CanSdrRepeat(SdrView& rView) const; + virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; + virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; }; /** @@ -620,10 +620,10 @@ class SVX_DLLPUBLIC SdrUndoNewPage : public SdrUndoPageList public: SdrUndoNewPage(SdrPage& rNewPg): SdrUndoPageList(rNewPg) {} - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; /** @@ -636,11 +636,11 @@ class SdrUndoCopyPage : public SdrUndoNewPage public: SdrUndoCopyPage(SdrPage& rNewPg): SdrUndoNewPage(rNewPg) {} - virtual OUString GetComment() const; - virtual OUString GetSdrRepeatComment(SdrView& rView) const; + virtual OUString GetComment() const SAL_OVERRIDE; + virtual OUString GetSdrRepeatComment(SdrView& rView) const SAL_OVERRIDE; - virtual void SdrRepeat(SdrView& rView); - virtual bool CanSdrRepeat(SdrView& rView) const; + virtual void SdrRepeat(SdrView& rView) SAL_OVERRIDE; + virtual bool CanSdrRepeat(SdrView& rView) const SAL_OVERRIDE; }; /** @@ -658,10 +658,10 @@ public: SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) : SdrUndoPage(rNewPg),nOldPageNum(nOldPageNum1),nNewPageNum(nNewPageNum1) {} - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; @@ -698,10 +698,10 @@ class SdrUndoPageRemoveMasterPage : public SdrUndoPageMasterPage public: SdrUndoPageRemoveMasterPage(SdrPage& rChangedPage); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; /** @@ -719,10 +719,10 @@ protected: public: SdrUndoPageChangeMasterPage(SdrPage& rChangedPage); - virtual void Undo(); - virtual void Redo(); + virtual void Undo() SAL_OVERRIDE; + virtual void Redo() SAL_OVERRIDE; - virtual OUString GetComment() const; + virtual OUString GetComment() const SAL_OVERRIDE; }; diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index f8d563e83850..02f3d5495461 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -194,13 +194,13 @@ public: void SetMasterPagePaintCaching(bool bOn); bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; } - sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); - virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); - virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); + sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin) SAL_OVERRIDE; + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin) SAL_OVERRIDE; + virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin) SAL_OVERRIDE; - virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) SAL_OVERRIDE; bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll=false) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr=false) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx index 142f01d8898c..9e63e24cc1a7 100644 --- a/include/svx/svx3ditems.hxx +++ b/include/svx/svx3ditems.hxx @@ -70,8 +70,8 @@ public: class Svx3DReducedLineGeometryItem : public SfxBoolItem { public: Svx3DReducedLineGeometryItem(bool bVal = false); - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; - virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; class SVX_DLLPUBLIC Svx3DNormalsKindItem : public SfxUInt16Item { @@ -79,9 +79,9 @@ public: Svx3DNormalsKindItem(sal_uInt16 nVal = 0); // use drawing::NormalsKind - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; }; class Svx3DNormalsInvertItem : public SfxBoolItem { @@ -94,9 +94,9 @@ public: Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; }; class SVX_DLLPUBLIC Svx3DTextureProjectionYItem : public SfxUInt16Item { @@ -104,9 +104,9 @@ public: Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; }; class Svx3DShadow3DItem : public SfxBoolItem { @@ -139,9 +139,9 @@ public: Svx3DTextureKindItem(sal_uInt16 nVal = 3); // use drawing::TextureKind - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; }; class SVX_DLLPUBLIC Svx3DTextureModeItem : public SfxUInt16Item { @@ -149,9 +149,9 @@ public: Svx3DTextureModeItem(sal_uInt16 nVal = 2); // use drawing:TextureMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; }; class Svx3DTextureFilterItem : public SfxBoolItem { @@ -165,9 +165,9 @@ public: Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE); // use drawing::ProjectionMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; }; class Svx3DDistanceItem : public SfxUInt32Item { @@ -320,9 +320,9 @@ public: Svx3DShadeModeItem(sal_uInt16 nVal = 2); // use drawing::ShadeMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; }; @@ -330,40 +330,40 @@ public: class Svx3DSmoothNormalsItem : public SfxBoolItem { public: Svx3DSmoothNormalsItem(bool bVal = true); - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; - virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack class Svx3DSmoothLidsItem : public SfxBoolItem { public: Svx3DSmoothLidsItem(bool bVal = false); - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; - virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode class Svx3DCharacterModeItem : public SfxBoolItem { public: Svx3DCharacterModeItem(bool bVal = false); - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; - virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem { public: Svx3DCloseFrontItem(bool bVal = true); - SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; - SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem { public: Svx3DCloseBackItem(bool bVal = true); - SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; - SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const SAL_OVERRIDE; }; #endif // INCLUDED_SVX_SVX3DITEMS_HXX diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index bc788df133ff..572e152acf0e 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -149,8 +149,8 @@ class AbstractSvxSearchFormatDialog : public SfxAbstractTabDialog //for SvxSea { public: //From class Window. - virtual void SetText( const OUString& rStr ) =0 ; - virtual OUString GetText() const =0 ; + virtual void SetText( const OUString& rStr ) SAL_OVERRIDE =0 ; + virtual OUString GetText() const SAL_OVERRIDE =0 ; }; class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog @@ -437,7 +437,7 @@ public: SdrModel* pModel, const SdrObject* pObj = NULL, bool bHasObj = true )=0; - virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; + virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) SAL_OVERRIDE = 0; virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, const SfxItemSet& rAttr, const SdrView* pView, @@ -451,7 +451,7 @@ public: virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, const SfxItemSet& rCoreSet, bool bPrevNext = false) = 0; - virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) = 0; + virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) SAL_OVERRIDE = 0; virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; virtual DialogGetRanges GetDialogGetRangesFunc() = 0; @@ -461,10 +461,10 @@ public: Window* pParent, bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame - ) = 0; + ) SAL_OVERRIDE = 0; virtual VclAbstractDialog* CreateScriptErrorDialog( - Window* pParent, com::sun::star::uno::Any aException) = 0; + Window* pParent, com::sun::star::uno::Any aException) SAL_OVERRIDE = 0; virtual VclAbstractDialog* CreateSvxMacroAssignDlg( Window* _pParent, diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx index 015c339e813c..794884355ad4 100644 --- a/include/svx/svxgrahicitem.hxx +++ b/include/svx/svxgrahicitem.hxx @@ -36,8 +36,8 @@ public: SvxGraphicItem( const SvxGraphicItem& ); - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; Graphic GetGraphic() const { return aGraphic; } diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index 4619f0d2ef61..a790b4283685 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -67,10 +67,10 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public Window Rectangle DrawInnerFrame_Impl(const Rectangle &rRect, const Color &rFillColor, const Color &rBorderColor); void DrawRect_Impl(const Rectangle &rRect, const Color &rFillColor, const Color &rLineColor); - virtual void Paint(const Rectangle&); - virtual Size GetOptimalSize() const; + virtual void Paint(const Rectangle&) SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; protected: - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: SvxSwFrameExample(Window* pParent, WinBits nStyle); diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx index 888743b05537..df786d2f407e 100644 --- a/include/svx/sxcecitm.hxx +++ b/include/svx/sxcecitm.hxx @@ -35,14 +35,14 @@ public: TYPEINFO_OVERRIDE(); SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {} SdrCaptionEscDirItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 3; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 3; } SdrCaptionEscDir GetValue() const { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); } - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; diff --git a/include/svx/sxcikitm.hxx b/include/svx/sxcikitm.hxx index 8c6761fbf11f..e07938ca56e6 100644 --- a/include/svx/sxcikitm.hxx +++ b/include/svx/sxcikitm.hxx @@ -32,16 +32,16 @@ public: TYPEINFO_OVERRIDE(); SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 4; } SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx index 28195cc7fed0..36cce7364a41 100644 --- a/include/svx/sxctitm.hxx +++ b/include/svx/sxctitm.hxx @@ -33,12 +33,12 @@ public: TYPEINFO_OVERRIDE(); SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrCaptionTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 4; } SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); } - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx index d0f3ac901b68..5ad2b341165b 100644 --- a/include/svx/sxekitm.hxx +++ b/include/svx/sxekitm.hxx @@ -37,14 +37,14 @@ public: TYPEINFO_OVERRIDE(); SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrEdgeKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_EDGEKIND,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 5; } SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx index 852c69d0cf52..27f7122eb5ec 100644 --- a/include/svx/sxelditm.hxx +++ b/include/svx/sxelditm.hxx @@ -33,24 +33,24 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem { public: SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal) {} SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem { public: SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal) {} SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem { public: SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal) {} SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx index 46a2ababf080..40bc1538c81a 100644 --- a/include/svx/sxenditm.hxx +++ b/include/svx/sxenditm.hxx @@ -27,32 +27,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { public: SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { public: SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { public: SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { public: SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; class SdrEdgeNode1GlueDistItem: public SdrMetricItem { diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx index e6557648ee87..b1f587d00adf 100644 --- a/include/svx/sxfiitm.hxx +++ b/include/svx/sxfiitm.hxx @@ -33,11 +33,11 @@ public: SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {} SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} SdrFractionItem(sal_uInt16 nId, SvStream& rIn); - virtual bool operator==(const SfxPoolItem&) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const; - virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const; - virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; + virtual bool operator==(const SfxPoolItem&) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const SAL_OVERRIDE; const Fraction& GetValue() const { return nValue; } void SetValue(const Fraction& rVal) { nValue = rVal; } }; diff --git a/include/svx/sxmkitm.hxx b/include/svx/sxmkitm.hxx index f00757859998..a74f7b6316ef 100644 --- a/include/svx/sxmkitm.hxx +++ b/include/svx/sxmkitm.hxx @@ -32,16 +32,16 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 2; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 2; } SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx index cf3fe879422d..9133d7879ac1 100644 --- a/include/svx/sxmtpitm.hxx +++ b/include/svx/sxmtpitm.hxx @@ -34,16 +34,16 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextHPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 4; } SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; @@ -54,16 +54,16 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 5; } SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 4b55f207b72a..69bb5d92527f 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -31,16 +31,16 @@ public: TYPEINFO_OVERRIDE(); SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {} SdrMeasureUnitItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn) {} - virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; // { return 14; } + virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; // { return 14; } FieldUnit GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; - virtual OUString GetValueTextByPos(sal_uInt16 nPos) const; - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const; + virtual OUString GetValueTextByPos(sal_uInt16 nPos) const SAL_OVERRIDE; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, OUString& rText, const IntlWrapper * = 0) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx index 30c2070617f5..65a7671c7846 100644 --- a/include/svx/sxsiitm.hxx +++ b/include/svx/sxsiitm.hxx @@ -27,9 +27,9 @@ public: SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {} SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} - virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const; - virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const; - virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; + virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, OUString &rText, const IntlWrapper * = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index b63fd1cb9d73..4ed93da0036d 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -176,21 +176,21 @@ public: SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxStyleToolBoxControl(); - virtual Window* CreateItemWindow( Window *pParent ); + virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; DECL_LINK( VisibilityNotification, void* ); protected: // 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; // XUpdatable - virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; private: @@ -227,8 +227,8 @@ public: SvxFontNameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual void StateChanged ( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual Window* CreateItemWindow ( Window *pParent ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual Window* CreateItemWindow ( Window *pParent ) SAL_OVERRIDE; }; @@ -250,9 +250,9 @@ public: ~SvxFontColorToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; @@ -278,10 +278,10 @@ public: ~SvxColorExtToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); - virtual void Select( bool bMod1 = false ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; + virtual void Select( bool bMod1 = false ) SAL_OVERRIDE; }; @@ -301,9 +301,9 @@ public: ~SvxColorToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; @@ -319,10 +319,10 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxFrameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; @@ -339,10 +339,10 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxFrameLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; @@ -365,9 +365,9 @@ public: ~SvxFrameLineColorToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; }; class SVX_DLLPUBLIC SvxSimpleUndoRedoController : public SfxToolBoxControl @@ -381,7 +381,7 @@ public: ~SvxSimpleUndoRedoController(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; }; #endif // INCLUDED_SVX_TBCONTRL_HXX diff --git a/include/svx/tbxalign.hxx b/include/svx/tbxalign.hxx index 252636257e50..f56f8e68fc07 100644 --- a/include/svx/tbxalign.hxx +++ b/include/svx/tbxalign.hxx @@ -26,13 +26,13 @@ class SVX_DLLPUBLIC SvxTbxCtlAlign: public SfxToolBoxControl { public: - 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; - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx index 9413a914bbcf..99c129b74378 100644 --- a/include/svx/tbxctl.hxx +++ b/include/svx/tbxctl.hxx @@ -44,10 +44,10 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - virtual void Select( bool bMod1 = false ); + virtual void Select( bool bMod1 = false ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; }; #endif diff --git a/include/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx index 578b67804c5b..e7b6a46c29bc 100644 --- a/include/svx/tbxcustomshapes.hxx +++ b/include/svx/tbxcustomshapes.hxx @@ -32,11 +32,11 @@ class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl { public: using SfxToolBoxControl::Select; - virtual void Select( bool bMod1 = false ); + virtual void Select( bool bMod1 = false ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual SfxPopupWindowType GetPopupWindowType() const; - virtual SfxPopupWindow* CreatePopupWindow(); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; + virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; SFX_DECL_TOOLBOX_CONTROL(); @@ -44,10 +44,10 @@ public: ~SvxTbxCtlCustomShapes() {} //interface 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; private: OUString m_aSubTbName; diff --git a/include/svx/tbxdraw.hxx b/include/svx/tbxdraw.hxx index c38ee71abcb4..8b7ce59a6e6e 100644 --- a/include/svx/tbxdraw.hxx +++ b/include/svx/tbxdraw.hxx @@ -50,14 +50,14 @@ public: ~SvxPopupWindowTbxMgr(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState); - virtual SfxPopupWindow* Clone() const; - virtual void PopupModeEnd(); + const SfxPoolItem* pState) SAL_OVERRIDE; + virtual SfxPopupWindow* Clone() const SAL_OVERRIDE; + virtual void PopupModeEnd() SAL_OVERRIDE; void StartSelection(); // toolbox click or execute may chage the default selection in the tools toolbox - virtual void UserEvent( sal_uIntPtr nEvent, void* pEventData ); + virtual void UserEvent( sal_uIntPtr nEvent, void* pEventData ) SAL_OVERRIDE; }; diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx index 671e05eca094..967ee1c3d011 100644 --- a/include/svx/unomod.hxx +++ b/include/svx/unomod.hxx @@ -36,9 +36,9 @@ class SVX_DLLPUBLIC SvxUnoDrawMSFactory : public ::com::sun::star::lang::XMultiS public: SvxUnoDrawMSFactory() throw() {}; - 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); - 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); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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) 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) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // internal diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx index f238260a323c..42defea33355 100644 --- a/include/svx/unomodel.hxx +++ b/include/svx/unomodel.hxx @@ -60,33 +60,33 @@ public: SdrModel* GetDoc() const { return mpDoc; } // 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; // XModel - virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL hasControllersLocked( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL lockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unlockControllers( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasControllersLocked( ) 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); - 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; // XDrawPagesSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages > SAL_CALL getDrawPages( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XMultiServiceFactory ( SvxFmMSFactory ) - 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); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) 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 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; // XAnyCompareFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XAnyCompare > SAL_CALL createAnyCompareByName( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; SVX_DLLPUBLIC extern bool SvxDrawingLayerExport( SdrModel* pModel, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOut ); diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index 77d8d7b677c4..a5a37d565bb6 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -104,38 +104,38 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: UNO3_GETIMPLEMENTATION_DECL( SvxDrawPage ) // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; // XInterface - virtual void SAL_CALL release() throw(); + 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 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); + 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; // XShapeGrouper - virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > SAL_CALL group( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL ungroup( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup >& aGroup ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > SAL_CALL group( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xShapes ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ungroup( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup >& aGroup ) 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 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; // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); - 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); + virtual void SAL_CALL 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 >& aListener ) 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) SAL_OVERRIDE; }; #endif diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index 09ca33a1469a..e327cc704ab4 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -52,27 +52,27 @@ public: virtual SfxItemPool* getModelPool( bool bReadOnly ) throw(); // overiden helpers from comphelper::PropertySetHelper - virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ); - virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + virtual void _setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const ::com::sun::star::uno::Any* pValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; + virtual void _getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::uno::Any* pValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; - virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::beans::PropertyState* pStates ) throw(::com::sun::star::beans::UnknownPropertyException ); - virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException ); - virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ); + virtual void _getPropertyStates( const comphelper::PropertyMapEntry** ppEntries, ::com::sun::star::beans::PropertyState* pStates ) throw(::com::sun::star::beans::UnknownPropertyException ) SAL_OVERRIDE; + virtual void _setPropertyToDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any _getPropertyDefault( const comphelper::PropertyMapEntry* pEntry ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException ) SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL 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 queryAggregation( 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 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; // 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 - 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; protected: void init(); diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index bcf2b6231ea3..153e193d76e8 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -220,89 +220,89 @@ public: void setMaster( SvxShapeMaster* pMaster ); // SfxListener - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw (); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) throw () SAL_OVERRIDE; // XAggregation - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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; // 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; // 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; // XComponent - virtual void SAL_CALL dispose() 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); - 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); + virtual void SAL_CALL 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) 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) 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); - 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 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; // 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; // XGluePointsSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL getGluePoints( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > SAL_CALL getGluePoints( ) 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; // 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; // XActionLockable - virtual sal_Bool SAL_CALL isActionLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addActionLock( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeActionLock( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL resetActionLocks( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isActionLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addActionLock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeActionLock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setActionLocks( sal_Int16 nLock ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL resetActionLocks( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: /** initializes SdrObj-dependent members. Only to be called when GetSdrObject() != NULL @@ -318,48 +318,48 @@ class SVX_DLLPUBLIC SvxShapeText : public SvxShape, public SvxUnoTextBase { protected: /** called from the XActionLockable interface methods on initial locking */ - virtual void lock(); + virtual void lock() SAL_OVERRIDE; /** called from the XActionLockable interface methods on final unlock */ - virtual void unlock(); + virtual void unlock() SAL_OVERRIDE; protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool getPropertyStateImpl( const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::beans::PropertyState& rState ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; + virtual bool setPropertyToDefaultImpl( const SfxItemPropertySimpleEntry* pProperty ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: SvxShapeText( SdrObject* pObj ) throw (); SvxShapeText( SdrObject* pObject, const SfxItemPropertyMapEntry* pPropertyMap, const SvxItemPropertySet* pPropertySet ) throw (); virtual ~SvxShapeText() throw (); - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL 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 queryAggregation( 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 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; // 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; // ::com::sun::star::text::XTextRange - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getStart() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getEnd() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setString( const OUString& aString ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) 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); - 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; }; class SvxShapeRect : public SvxShapeText @@ -369,13 +369,13 @@ public: virtual ~SvxShapeRect() throw (); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL 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 queryAggregation( 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 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; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -394,49 +394,49 @@ public: SvxShapeGroup( SdrObject* pObj,SvxDrawPage* pDrawPage ) throw (); virtual ~SvxShapeGroup() throw (); - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL 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 queryAggregation( 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 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; // 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; // XShapes2 - virtual void SAL_CALL addTop( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addBottom( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addTop( 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 addBottom( 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; // 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; // 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; // XShapeGroup - virtual void SAL_CALL enterGroup( ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL leaveGroup( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL enterGroup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL leaveGroup( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) 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; }; #include <com/sun/star/drawing/XConnectorShape.hpp> @@ -451,32 +451,32 @@ public: virtual ~SvxShapeConnector() throw(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL 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 queryAggregation( 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 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; // 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; // 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; // XConnectorShape - virtual void SAL_CALL connectStart( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape, ::com::sun::star::drawing::ConnectionType nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL connectEnd( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape, ::com::sun::star::drawing::ConnectionType nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disconnectBegin( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL disconnectEnd( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL connectStart( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape, ::com::sun::star::drawing::ConnectionType nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL connectEnd( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape, ::com::sun::star::drawing::ConnectionType nPos ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disconnectBegin( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disconnectEnd( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XConnectableShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) 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; }; #include <com/sun/star/drawing/XControlShape.hpp> @@ -494,39 +494,39 @@ public: virtual ~SvxShapeControl() throw(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL 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 queryAggregation( 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 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; // XPropertySet - 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; // 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 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; // 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; // 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; // XControlShape - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getControl() throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xControl ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getControl() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setControl( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& xControl ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) 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; }; /*********************************************************************** @@ -539,7 +539,7 @@ public: virtual ~SvxShapeDimensioning() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -552,7 +552,7 @@ public: virtual ~SvxShapeCircle() throw (); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -564,8 +564,8 @@ class SVX_DLLPUBLIC SvxOle2Shape : public SvxShapeText { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; void resetModifiedState(); @@ -580,7 +580,7 @@ public: bool createLink( const OUString& aLinkURL ); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; @@ -599,8 +599,8 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: SvxShapePolyPolygon( SdrObject* pObj , ::com::sun::star::drawing::PolygonKind eNew = com::sun::star::drawing::PolygonKind_LINE ) throw(com::sun::star::lang::IllegalArgumentException, com::sun::star::beans::PropertyVetoException); @@ -612,7 +612,7 @@ public: basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -630,8 +630,8 @@ protected: public: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; SvxShapePolyPolygonBezier( SdrObject* pObj , ::com::sun::star::drawing::PolygonKind eNew = com::sun::star::drawing::PolygonKind_PATHLINE) throw(); virtual ~SvxShapePolyPolygonBezier() throw(); @@ -642,7 +642,7 @@ public: basegfx::B2DPolyPolygon GetPolygon() const throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -655,8 +655,8 @@ protected: using SvxUnoTextRangeBase::getPropertyValue; // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: SvxGraphicObject( SdrObject* pObj, OUString const & referer ) throw(); @@ -681,37 +681,37 @@ protected: public: Svx3DSceneObject( SdrObject* pObj, SvxDrawPage* pDrawPage ) throw(); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ~Svx3DSceneObject() throw(); - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL 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 queryAggregation( 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 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; // 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; // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 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) 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; }; /*********************************************************************** @@ -721,15 +721,15 @@ class Svx3DCubeObject : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: Svx3DCubeObject( SdrObject* pObj ) throw(); virtual ~Svx3DCubeObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -741,13 +741,13 @@ public: Svx3DSphereObject( SdrObject* pObj ) throw(); protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ~Svx3DSphereObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -757,15 +757,15 @@ class Svx3DLatheObject : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: Svx3DLatheObject( SdrObject* pObj ) throw(); virtual ~Svx3DLatheObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -777,13 +777,13 @@ public: Svx3DExtrudeObject( SdrObject* pObj ) throw(); protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ~Svx3DExtrudeObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -793,15 +793,15 @@ class Svx3DPolygonObject : public SvxShape { protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; public: Svx3DPolygonObject( SdrObject* pObj ) throw(); virtual ~Svx3DPolygonObject() throw(); // XServiceInfo - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) 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) SAL_OVERRIDE; }; /*********************************************************************** @@ -823,37 +823,37 @@ protected: public: SvxCustomShape( SdrObject* pObj ) throw (); // overide these for special property handling in subcasses. Return true if property is handled - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; virtual ~SvxCustomShape() throw (); - virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ); + virtual void Create( SdrObject* pNewOpj, SvxDrawPage* pNewPage = NULL ) SAL_OVERRIDE; // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL 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 queryAggregation( 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 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; // 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; // 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; // XPropertySet - void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, std::exception); + void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, 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); - 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; //XEnhancedCustomShapeDefaulter - virtual void SAL_CALL createCustomShapeDefaults( const OUString& rShapeType ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL createCustomShapeDefaults( const OUString& rShapeType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; /*********************************************************************** @@ -868,8 +868,8 @@ public: protected: // overide these for special property handling in subcasses. Return true if property is handled - virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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); - virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool setPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, 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) SAL_OVERRIDE; + virtual bool getPropertyValueImpl( const OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) SAL_OVERRIDE; private: OUString referer_; diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx index 09dee0d33627..315737c9aaeb 100644 --- a/include/svx/unoshtxt.hxx +++ b/include/svx/unoshtxt.hxx @@ -55,26 +55,26 @@ public: virtual ~SvxTextEditSource(); - virtual SvxEditSource* Clone() const; - virtual SvxTextForwarder* GetTextForwarder(); - virtual SvxViewForwarder* GetViewForwarder(); + virtual SvxEditSource* Clone() const SAL_OVERRIDE; + virtual SvxTextForwarder* GetTextForwarder() SAL_OVERRIDE; + virtual SvxViewForwarder* GetViewForwarder() SAL_OVERRIDE; virtual SvxEditViewForwarder* GetEditViewForwarder( bool bCreate = false ) SAL_OVERRIDE; - virtual void UpdateData(); + virtual void UpdateData() SAL_OVERRIDE; - virtual void addRange( SvxUnoTextRangeBase* pNewRange ); - virtual void removeRange( SvxUnoTextRangeBase* pOldRange ); - virtual const SvxUnoTextRangeBaseList& getRanges() const; + virtual void addRange( SvxUnoTextRangeBase* pNewRange ) SAL_OVERRIDE; + virtual void removeRange( SvxUnoTextRangeBase* pOldRange ) SAL_OVERRIDE; + virtual const SvxUnoTextRangeBaseList& getRanges() const SAL_OVERRIDE; - virtual SfxBroadcaster& GetBroadcaster() const; + virtual SfxBroadcaster& GetBroadcaster() const SAL_OVERRIDE; void lock(); void unlock(); // the SvxViewForwarder interface - virtual bool IsValid() const; - virtual Rectangle GetVisArea() const; - virtual Point LogicToPixel( const Point&, const MapMode& ) const; - virtual Point PixelToLogic( const Point&, const MapMode& ) const; + virtual bool IsValid() const SAL_OVERRIDE; + virtual Rectangle GetVisArea() const SAL_OVERRIDE; + virtual Point LogicToPixel( const Point&, const MapMode& ) const SAL_OVERRIDE; + virtual Point PixelToLogic( const Point&, const MapMode& ) const SAL_OVERRIDE; void ChangeModel( SdrModel* pNewModel ); diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx index e502fea5a2c2..d2bb5863f828 100644 --- a/include/svx/verttexttbxctrl.hxx +++ b/include/svx/verttexttbxctrl.hxx @@ -33,7 +33,7 @@ public: ~SvxVertCTLTextTbxCtrl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); + const SfxPoolItem* pState ) SAL_OVERRIDE; void SetVert(bool bSet) {bCheckVertical = bSet;} }; diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx index 74f793269335..4681121416b6 100644 --- a/include/svx/view3d.hxx +++ b/include/svx/view3d.hxx @@ -82,23 +82,23 @@ public: virtual ~E3dView(); // Output all marked Objects on the given OutputDevice. - virtual void DrawMarkedObj(OutputDevice& rOut) const; + virtual void DrawMarkedObj(OutputDevice& rOut) const SAL_OVERRIDE; // Access to the default attributes. E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; } - virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL); - virtual void CheckPossibilities(); + virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL) SAL_OVERRIDE; + virtual void CheckPossibilities() SAL_OVERRIDE; // Get/Set Event void SetMouseEvent(const MouseEvent& rNew) { aMouseEvent = rNew; } const MouseEvent& GetMouseEvent() { return aMouseEvent; } // Override getting the model, as we need to supply a Scene together with individual 3D Objects. - virtual SdrModel* GetMarkedObjModel() const; + virtual SdrModel* GetMarkedObjModel() const SAL_OVERRIDE; // On Paste: We need to insert the objects of the Scene, but not the Scene itself using SdrView::Paste; - virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0) SAL_OVERRIDE; // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset); @@ -115,7 +115,7 @@ public: // Migration of overlay bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); } - virtual void MovAction(const Point& rPnt); + virtual void MovAction(const Point& rPnt) SAL_OVERRIDE; void End3DCreation(bool bUseDefaultValuesForMirrorAxes=false); void ResetCreationActive(); diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 7688f14fff20..4ce2858c8b23 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -40,12 +40,12 @@ public: bool IsBookMode() const {return mbBookMode; } // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer - virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const SAL_OVERRIDE; // leer + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; // leer + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; // leer }; diff --git a/include/svx/wrapfield.hxx b/include/svx/wrapfield.hxx index ea7966a4afd0..02b4f961bccd 100644 --- a/include/svx/wrapfield.hxx +++ b/include/svx/wrapfield.hxx @@ -36,9 +36,9 @@ public: protected: /** Up event with wrap-around functionality. */ - virtual void Up(); + virtual void Up() SAL_OVERRIDE; /** Down event with wrap-around functionality. */ - virtual void Down(); + virtual void Down() SAL_OVERRIDE; }; diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx index 060a15e313dd..a5ebc6d62a9e 100644 --- a/include/svx/xbtmpit.hxx +++ b/include/svx/xbtmpit.hxx @@ -49,19 +49,19 @@ public: XFillBitmapItem( const XFillBitmapItem& rItem ); XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 ); - virtual bool operator==( const SfxPoolItem& rItem ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual bool operator==( const SfxPoolItem& rItem ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; const GraphicObject& GetGraphicObject() const; void SetGraphicObject(const GraphicObject& rGraphicObject); diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 3eb317105089..561c56c5922c 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -39,18 +39,18 @@ public: XColorItem() {} XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; XColorItem(sal_uInt16 nWhich, const Color& rTheColor); XColorItem(sal_uInt16 nWhich, const OUString& rName, const Color& rTheColor); XColorItem(sal_uInt16 nWhich, SvStream& rIn); XColorItem(const XColorItem& rItem); - virtual bool operator==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; const Color& GetColorValue(const XColorList* pTable = 0) const; void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); } diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx index 731aab194033..8c24fcb386ce 100644 --- a/include/svx/xfillit0.hxx +++ b/include/svx/xfillit0.hxx @@ -38,17 +38,17 @@ public: XFillStyleItem(XFillStyle, sal_uInt16 nWhich); XFillStyleItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - virtual sal_uInt16 GetValueCount() const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; XFillStyle GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); } }; diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx index 6f1cc1eb52c8..0f0e9ae4a6ef 100644 --- a/include/svx/xflasit.hxx +++ b/include/svx/xflasit.hxx @@ -38,9 +38,9 @@ public: XFillAttrSetItem(const XFillAttrSetItem& rAttr); XFillAttrSetItem(const XFillAttrSetItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx index b5119d9aee71..b8ccfb121589 100644 --- a/include/svx/xflbckit.hxx +++ b/include/svx/xflbckit.hxx @@ -38,13 +38,13 @@ public: SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx index 6938a5bdae06..3d6b319a91f2 100644 --- a/include/svx/xflbmpit.hxx +++ b/include/svx/xflbmpit.hxx @@ -31,15 +31,15 @@ public: XFillBmpPosItem( RECT_POINT eRP = RP_MM ); SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const; + SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); } }; diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx index ec1008f9e6b8..27b2f98f87a1 100644 --- a/include/svx/xflbmsli.hxx +++ b/include/svx/xflbmsli.hxx @@ -30,13 +30,13 @@ public: XFillBmpSizeLogItem( bool bLog = true ); SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx index a8103fbf8a58..1f0a4cd27607 100644 --- a/include/svx/xflbmsxy.hxx +++ b/include/svx/xflbmsxy.hxx @@ -30,18 +30,18 @@ public: XFillBmpSizeXItem( long nSizeX = 0 ); SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual bool HasMetrics() const; + SVX_DLLPRIVATE virtual bool HasMetrics() const SAL_OVERRIDE; }; class SVX_DLLPUBLIC XFillBmpSizeYItem : public SfxMetricItem @@ -51,18 +51,18 @@ public: XFillBmpSizeYItem( long nSizeY = 0 ); SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; // Dieses Item nimmt sowohl metrische als auch // Prozentwerte ( sind negativ ) auf; das muessen // wir hier beruecksichtigen - SVX_DLLPRIVATE virtual bool HasMetrics() const; + SVX_DLLPRIVATE virtual bool HasMetrics() const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx index 038b72fcdc0b..e513757aaca8 100644 --- a/include/svx/xflbmtit.hxx +++ b/include/svx/xflbmtit.hxx @@ -30,13 +30,13 @@ public: XFillBmpTileItem( bool bTile = true ); XFillBmpTileItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx index aac255d363cb..dcc239797ee3 100644 --- a/include/svx/xflboxy.hxx +++ b/include/svx/xflboxy.hxx @@ -30,13 +30,13 @@ public: XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item @@ -46,13 +46,13 @@ public: XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx index b59f6748d787..7d0e9e72c7ac 100644 --- a/include/svx/xflbstit.hxx +++ b/include/svx/xflbstit.hxx @@ -30,13 +30,13 @@ public: XFillBmpStretchItem( bool bStretch = true ); XFillBmpStretchItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx index 66914214c36e..f229042894ad 100644 --- a/include/svx/xflbtoxy.hxx +++ b/include/svx/xflbtoxy.hxx @@ -30,13 +30,13 @@ public: XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item @@ -46,13 +46,13 @@ public: XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn ); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx index 113b0e7a0cdf..27a9455723e8 100644 --- a/include/svx/xflclit.hxx +++ b/include/svx/xflclit.hxx @@ -39,16 +39,16 @@ public: XFillColorItem(const OUString& rName, const Color& rTheColor); XFillColorItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx index eff4ff50faaa..1a715896edc1 100644 --- a/include/svx/xflftrit.hxx +++ b/include/svx/xflftrit.hxx @@ -41,14 +41,14 @@ public: XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, bool bEnable = true ); XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem ); - virtual bool operator==( const SfxPoolItem& rItem ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& rItem ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, - SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const; + SfxMapUnit ePresMetric, OUString &rText, const IntlWrapper * pIntlWrapper = 0 ) const SAL_OVERRIDE; bool IsEnabled() const { return bEnabled; } void SetEnabled( bool bEnable ) { bEnabled = bEnable; } diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx index 65615be9fd56..9618bb7ae871 100644 --- a/include/svx/xflgrit.hxx +++ b/include/svx/xflgrit.hxx @@ -43,18 +43,18 @@ public: XFillGradientItem(const XFillGradientItem& rItem); XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0); - virtual bool operator==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; const XGradient& GetGradientValue() const; // GetValue -> GetGradientValue void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx index 388948f33443..364292f66e89 100644 --- a/include/svx/xflhtit.hxx +++ b/include/svx/xflhtit.hxx @@ -41,19 +41,19 @@ public: XFillHatchItem(const XFillHatchItem& rItem); XFillHatchItem(SvStream& rIn); - virtual bool operator==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - virtual bool HasMetrics() const; - virtual bool ScaleMetrics(long nMul, long nDiv); + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; + virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; const XHatch& GetHatchValue() const; // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx index 4a20fee332ed..e1434d12cdde 100644 --- a/include/svx/xfltrit.hxx +++ b/include/svx/xfltrit.hxx @@ -35,12 +35,12 @@ public: TYPEINFO_OVERRIDE(); XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); XFillTransparenceItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx index e2eba0b49322..8afdb88483fe 100644 --- a/include/svx/xftadit.hxx +++ b/include/svx/xftadit.hxx @@ -35,13 +35,13 @@ public: TYPEINFO_OVERRIDE(); XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER); XFormTextAdjustItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; XFormTextAdjust GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx index f9abcba7ba1b..949b4718a543 100644 --- a/include/svx/xftdiit.hxx +++ b/include/svx/xftdiit.hxx @@ -35,8 +35,8 @@ public: TYPEINFO_OVERRIDE(); XFormTextDistanceItem(long nDist = 0); XFormTextDistanceItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx index 9be4439c2d66..afb98cc43269 100644 --- a/include/svx/xftmrit.hxx +++ b/include/svx/xftmrit.hxx @@ -35,8 +35,8 @@ public: TYPEINFO_OVERRIDE(); XFormTextMirrorItem(bool bMirror = false); XFormTextMirrorItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx index f284aed27dcc..62c9bf21109b 100644 --- a/include/svx/xftouit.hxx +++ b/include/svx/xftouit.hxx @@ -35,8 +35,8 @@ public: TYPEINFO_OVERRIDE(); XFormTextOutlineItem(bool bOutline = false); XFormTextOutlineItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx index e858a4a1ea97..2bbf49b25a82 100644 --- a/include/svx/xftshcit.hxx +++ b/include/svx/xftshcit.hxx @@ -37,8 +37,8 @@ public: XFormTextShadowColorItem(const OUString& rName, const Color& rTheColor); XFormTextShadowColorItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx index 0676d7ce1be0..399aa5025103 100644 --- a/include/svx/xftshit.hxx +++ b/include/svx/xftshit.hxx @@ -36,13 +36,13 @@ public: TYPEINFO_OVERRIDE(); XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE); XFormTextShadowItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; XFormTextShadow GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; #endif diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx index 0f6f08705d21..6f0ef4d08777 100644 --- a/include/svx/xftshtit.hxx +++ b/include/svx/xftshtit.hxx @@ -34,8 +34,8 @@ public: TYPEINFO_OVERRIDE(); XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); XFormTextShadowTranspItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx index 809ba3da0c60..14bec5ea7cb1 100644 --- a/include/svx/xftshxy.hxx +++ b/include/svx/xftshxy.hxx @@ -35,8 +35,8 @@ public: TYPEINFO_OVERRIDE(); XFormTextShadowXValItem(long nVal = 0); XFormTextShadowXValItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; }; /************************************************************************* @@ -51,8 +51,8 @@ public: TYPEINFO_OVERRIDE(); XFormTextShadowYValItem(long nVal = 0); XFormTextShadowYValItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx index ba695f26402f..2d427af502e1 100644 --- a/include/svx/xftstit.hxx +++ b/include/svx/xftstit.hxx @@ -35,8 +35,8 @@ public: TYPEINFO_OVERRIDE(); XFormTextStartItem(long nStart = 0); XFormTextStartItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx index 065e1f7d8478..b1312aff2883 100644 --- a/include/svx/xgrscit.hxx +++ b/include/svx/xgrscit.hxx @@ -35,12 +35,12 @@ public: TYPEINFO_OVERRIDE(); XGradientStepCountItem( sal_uInt16 nStepCount = 0 ); XGradientStepCountItem( SvStream& rIn ); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 1d5dae5fa5da..7ea554d39585 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -52,10 +52,10 @@ public: NameOrIndex(const NameOrIndex& rNameOrIndex); ~NameOrIndex() {}; - virtual bool operator==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; OUString GetName() const { return GetValue(); } void SetName(const OUString& rName) { SetValue(rName); } diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx index d8a5182f4fc9..6db9aa2fb39a 100644 --- a/include/svx/xlineit0.hxx +++ b/include/svx/xlineit0.hxx @@ -33,17 +33,17 @@ public: TYPEINFO_OVERRIDE(); XLineStyleItem(XLineStyle = XLINE_SOLID); XLineStyleItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - virtual sal_uInt16 GetValueCount() const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; XLineStyle GetValue() const { return (XLineStyle) SfxEnumItem::GetValue(); } }; diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx index 722487c411eb..58ce016109e0 100644 --- a/include/svx/xlinjoit.hxx +++ b/include/svx/xlinjoit.hxx @@ -36,17 +36,17 @@ public: XLineJointItem( com::sun::star::drawing::LineJoint eLineJoint = com::sun::star::drawing::LineJoint_ROUND ); XLineJointItem( SvStream& rIn ); - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; com::sun::star::drawing::LineJoint GetValue() const { return (com::sun::star::drawing::LineJoint) SfxEnumItem::GetValue(); } }; diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx index 6a32cf5df32d..63d4f42b33f3 100644 --- a/include/svx/xlnasit.hxx +++ b/include/svx/xlnasit.hxx @@ -39,9 +39,9 @@ public: XLineAttrSetItem(const XLineAttrSetItem& rAttr); XLineAttrSetItem(const XLineAttrSetItem& rAttr, SfxItemPool* pItemPool); - virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const; - virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const; - virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const SAL_OVERRIDE; + virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx index 9308b3020e2e..2367a0ea9887 100644 --- a/include/svx/xlncapit.hxx +++ b/include/svx/xlncapit.hxx @@ -36,17 +36,17 @@ public: XLineCapItem(com::sun::star::drawing::LineCap eLineCap = com::sun::star::drawing::LineCap_BUTT); XLineCapItem(SvStream& rIn); - virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - virtual sal_uInt16 GetValueCount() const; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; com::sun::star::drawing::LineCap GetValue() const; }; diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx index e7b9780dc466..0aef9bc127a8 100644 --- a/include/svx/xlnclit.hxx +++ b/include/svx/xlnclit.hxx @@ -35,16 +35,16 @@ public: XLineColorItem(const OUString& rName, const Color& rTheColor); XLineColorItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx index 237f822e71b0..e58159932117 100644 --- a/include/svx/xlndsit.hxx +++ b/include/svx/xlndsit.hxx @@ -42,20 +42,20 @@ public: XLineDashItem(const XLineDashItem& rItem); XLineDashItem(SvStream& rIn); - virtual bool operator==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; - virtual bool HasMetrics() const; - virtual bool ScaleMetrics(long nMul, long nDiv); + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; + virtual bool HasMetrics() const SAL_OVERRIDE; + virtual bool ScaleMetrics(long nMul, long nDiv) SAL_OVERRIDE; const XDash& GetDashValue() const; void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx index 818cbc571bb5..767015bfa283 100644 --- a/include/svx/xlnedcit.hxx +++ b/include/svx/xlnedcit.hxx @@ -32,16 +32,16 @@ public: TYPEINFO_OVERRIDE(); XLineEndCenterItem(bool bEndCenter = false); XLineEndCenterItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx index f1071080c1a5..edd77763abab 100644 --- a/include/svx/xlnedit.hxx +++ b/include/svx/xlnedit.hxx @@ -41,18 +41,18 @@ public: XLineEndItem(const XLineEndItem& rItem); XLineEndItem(SvStream& rIn); - virtual bool operator==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; basegfx::B2DPolyPolygon GetLineEndValue() const; void SetLineEndValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx index e5da6e361bfd..8610a2560c56 100644 --- a/include/svx/xlnedwit.hxx +++ b/include/svx/xlnedwit.hxx @@ -35,16 +35,16 @@ public: TYPEINFO_OVERRIDE(); XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); XLineEndWidthItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx index 5b04e2deecfb..fa1514736424 100644 --- a/include/svx/xlnstcit.hxx +++ b/include/svx/xlnstcit.hxx @@ -32,16 +32,16 @@ public: TYPEINFO_OVERRIDE(); XLineStartCenterItem(bool bStartCenter = false); XLineStartCenterItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx index e20d818f17dc..bb0c66720d31 100644 --- a/include/svx/xlnstit.hxx +++ b/include/svx/xlnstit.hxx @@ -41,18 +41,18 @@ public: XLineStartItem(const XLineStartItem& rItem); XLineStartItem(SvStream& rIn); - virtual bool operator==(const SfxPoolItem& rItem) const; - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; basegfx::B2DPolyPolygon GetLineStartValue() const; void SetLineStartValue(const basegfx::B2DPolyPolygon& rPolyPolygon) { maPolyPolygon = rPolyPolygon; Detach(); } diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx index 2dbefda771cc..9214de6da034 100644 --- a/include/svx/xlnstwit.hxx +++ b/include/svx/xlnstwit.hxx @@ -34,16 +34,16 @@ public: TYPEINFO_OVERRIDE(); XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); XLineStartWidthItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx index f924e8d18b0c..7b2f1bdc289b 100644 --- a/include/svx/xlntrit.hxx +++ b/include/svx/xlntrit.hxx @@ -35,12 +35,12 @@ public: TYPEINFO_OVERRIDE(); XLineTransparenceItem(sal_uInt16 nLineTransparence = 0); XLineTransparenceItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx index fd9045a2e232..ef67521ed96b 100644 --- a/include/svx/xlnwtit.hxx +++ b/include/svx/xlnwtit.hxx @@ -32,16 +32,16 @@ public: TYPEINFO_OVERRIDE(); XLineWidthItem(long nWidth = 0); XLineWidthItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index 1891523060ae..9b6c885f26b0 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -105,7 +105,7 @@ protected: ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ); - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; public: SvXMLEmbeddedObjectHelper( @@ -125,16 +125,16 @@ public: void Flush(); // XEmbeddedObjectResolver - virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) throw(::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; // XNameAccess - 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; static void splitObjectURL(const OUString& aURLNoPar, diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 6530b2d45c25..2c7f30d2a7d2 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -68,8 +68,8 @@ namespace svx protected: // TransferableHelper overridables - 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; OXFormsDescriptor m_aDescriptor; diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index bd5a2a79ca40..7a9f7e29eed6 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -89,7 +89,7 @@ protected: SvXMLGraphicHelperMode eCreateMode, bool bDirect ); - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; public: SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ); @@ -104,12 +104,12 @@ public: public: // XGraphicObjectResolver - virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XBinaryStreamResolver - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( const OUString& rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL createOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL resolveOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxBinaryStream ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL getInputStream( const OUString& rURL ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL createOutputStream( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL resolveOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& rxBinaryStream ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/include/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx index c202c4344d99..59016e62f403 100644 --- a/include/svx/xmlsecctrl.hxx +++ b/include/svx/xmlsecctrl.hxx @@ -41,9 +41,9 @@ public: XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); ~XmlSecStatusBarControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; }; #endif diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx index 396578040c0a..f83df3ab0a3c 100644 --- a/include/svx/xpool.hxx +++ b/include/svx/xpool.hxx @@ -44,7 +44,7 @@ public: bool bLoadRefCounts = true); XOutdevItemPool(const XOutdevItemPool& rPool); - virtual SfxItemPool* Clone() const; + virtual SfxItemPool* Clone() const SAL_OVERRIDE; protected: virtual ~XOutdevItemPool(); }; diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx index eb9a91be64b5..37f4f37301bf 100644 --- a/include/svx/xsflclit.hxx +++ b/include/svx/xsflclit.hxx @@ -33,15 +33,15 @@ public: XSecondaryFillColorItem(const OUString& rName, const Color& rTheColor); SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn); - SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, - OUString &rText, const IntlWrapper * = 0 ) const; + OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE; - SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const SAL_OVERRIDE; }; diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index a400a5677c02..d86b5f49e4ab 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -281,7 +281,7 @@ public: class SVX_DLLPUBLIC XColorList : public XPropertyList { protected: - virtual Bitmap CreateBitmapForUI(long nIndex); + virtual Bitmap CreateBitmapForUI(long nIndex) SAL_OVERRIDE; public: XColorList(const OUString& rPath, const OUString& rReferer) @@ -293,8 +293,8 @@ public: XColorEntry* Replace(long nIndex, XColorEntry* pEntry); XColorEntry* Remove(long nIndex); XColorEntry* GetColor(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance(); - virtual bool Create(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() SAL_OVERRIDE; + virtual bool Create() SAL_OVERRIDE; static XColorListRef CreateStdColorList(); static XColorListRef GetStdColorList(); // returns a singleton @@ -307,7 +307,7 @@ public: class SVX_DLLPUBLIC XLineEndList : public XPropertyList { protected: - virtual Bitmap CreateBitmapForUI(long nIndex); + virtual Bitmap CreateBitmapForUI(long nIndex) SAL_OVERRIDE; public: XLineEndList(const OUString& rPath, const OUString& rReferer); @@ -317,8 +317,8 @@ public: XLineEndEntry* Remove(long nIndex); XLineEndEntry* GetLineEnd(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance(); - virtual bool Create(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() SAL_OVERRIDE; + virtual bool Create() SAL_OVERRIDE; }; @@ -334,7 +334,7 @@ private: protected: Bitmap ImpCreateBitmapForXDash(const XDash* pDash); - virtual Bitmap CreateBitmapForUI(long nIndex); + virtual Bitmap CreateBitmapForUI(long nIndex) SAL_OVERRIDE; public: XDashList(const OUString& rPath, const OUString& rReferer); @@ -346,8 +346,8 @@ public: XDashEntry* Remove(long nIndex); XDashEntry* GetDash(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance(); - virtual bool Create(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() SAL_OVERRIDE; + virtual bool Create() SAL_OVERRIDE; // Special call to get a bitmap for the solid line representation. It // creates a bitmap fitting in size and style to the ones you get by @@ -367,7 +367,7 @@ public: class SVX_DLLPUBLIC XHatchList : public XPropertyList { protected: - virtual Bitmap CreateBitmapForUI(long nIndex); + virtual Bitmap CreateBitmapForUI(long nIndex) SAL_OVERRIDE; public: XHatchList(const OUString& rPath, const OUString& rReferer); @@ -379,8 +379,8 @@ public: XHatchEntry* Remove(long nIndex); XHatchEntry* GetHatch(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance(); - virtual bool Create(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() SAL_OVERRIDE; + virtual bool Create() SAL_OVERRIDE; }; @@ -389,7 +389,7 @@ public: class SVX_DLLPUBLIC XGradientList : public XPropertyList { protected: - virtual Bitmap CreateBitmapForUI(long nIndex); + virtual Bitmap CreateBitmapForUI(long nIndex) SAL_OVERRIDE; public: XGradientList(const OUString& rPath, const OUString& rReferer); @@ -401,8 +401,8 @@ public: XGradientEntry* Remove(long nIndex); XGradientEntry* GetGradient(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance(); - virtual bool Create(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() SAL_OVERRIDE; + virtual bool Create() SAL_OVERRIDE; }; @@ -412,7 +412,7 @@ public: class SVX_DLLPUBLIC XBitmapList : public XPropertyList { protected: - virtual Bitmap CreateBitmapForUI(long nIndex); + virtual Bitmap CreateBitmapForUI(long nIndex) SAL_OVERRIDE; public: XBitmapList(const OUString& rPath, const OUString& rReferer) @@ -423,8 +423,8 @@ public: XBitmapEntry* Remove(long nIndex); XBitmapEntry* GetBitmap(long nIndex) const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance(); - virtual bool Create(); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createInstance() SAL_OVERRIDE; + virtual bool Create() SAL_OVERRIDE; }; diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx index fec64739b4a0..c5ded2f5f78a 100644 --- a/include/svx/xtextit0.hxx +++ b/include/svx/xtextit0.hxx @@ -36,13 +36,13 @@ public: TYPEINFO_OVERRIDE(); XFormTextStyleItem(XFormTextStyle = XFT_NONE); XFormTextStyleItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual sal_uInt16 GetValueCount() const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; + virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; XFormTextStyle GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; /************************************************************************* @@ -57,8 +57,8 @@ public: TYPEINFO_OVERRIDE(); XFormTextHideFormItem(bool bHide = false); XFormTextHideFormItem(SvStream& rIn); - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const SAL_OVERRIDE; }; #endif diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx index 429ee9c67798..29d9472539fd 100644 --- a/include/svx/zoomctrl.hxx +++ b/include/svx/zoomctrl.hxx @@ -32,9 +32,9 @@ private: public: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, - const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); - virtual void Command( const CommandEvent& rCEvt ); + const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; SFX_DECL_STATUSBAR_CONTROL(); diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx index 0aad2968cb22..2a39cde88a2a 100644 --- a/include/svx/zoomsliderctrl.hxx +++ b/include/svx/zoomsliderctrl.hxx @@ -42,10 +42,10 @@ public: SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); ~SvxZoomSliderControl(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); - virtual void Paint( const UserDrawEvent& rEvt ); - virtual bool MouseButtonDown( const MouseEvent & ); - virtual bool MouseMove( const MouseEvent & rEvt ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; + virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; + virtual bool MouseButtonDown( const MouseEvent & ) SAL_OVERRIDE; + virtual bool MouseMove( const MouseEvent & rEvt ) SAL_OVERRIDE; }; #endif diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index edae1bfe9100..4f49b64c1522 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -45,12 +45,12 @@ public: sal_uInt16 GetMaxZoom() const {return mnMaxZoom;} // "pure virtual Methoden" vom SfxPoolItem - virtual bool operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer - virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const SAL_OVERRIDE; // leer + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const SAL_OVERRIDE; // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; }; diff --git a/include/tools/rtti.hxx b/include/tools/rtti.hxx index 83bd5671d40c..a1e79a480887 100644 --- a/include/tools/rtti.hxx +++ b/include/tools/rtti.hxx @@ -43,8 +43,8 @@ typedef void* (*TypeId)(); visibility static void* CreateType(); \ visibility static TypeId StaticType(); \ visibility static bool IsOf( TypeId aSameOrSuperType ); \ - visibility virtual TypeId Type() const; \ - visibility virtual bool IsA( TypeId aSameOrSuperType ) const + visibility virtual TypeId Type() const SAL_OVERRIDE; \ + visibility virtual bool IsA( TypeId aSameOrSuperType ) const SAL_OVERRIDE #define TYPEINIT_FACTORY(sType, Factory ) \ void* sType::CreateType() { return Factory; } \ diff --git a/include/vbahelper/vbaapplicationbase.hxx b/include/vbahelper/vbaapplicationbase.hxx index a5bfa882aae2..626e86ca1cdc 100644 --- a/include/vbahelper/vbaapplicationbase.hxx +++ b/include/vbahelper/vbaapplicationbase.hxx @@ -39,30 +39,30 @@ protected: virtual css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException) = 0; public: // XHelperInterface ( parent is itself ) - virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) { return this; } + virtual css::uno::Reference< ov::XHelperInterface > SAL_CALL getParent( ) throw (css::script::BasicErrorException, css::uno::RuntimeException) SAL_OVERRIDE { return this; } - virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getInteractive() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setInteractive( ::sal_Bool bInteractive ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setVisible( ::sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL OnKey( const OUString& Key, const ::com::sun::star::uno::Any& Procedure ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getVersion() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getVBE() throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getScreenUpdating() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setScreenUpdating(sal_Bool bUpdate) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getDisplayStatusBar() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDisplayStatusBar(sal_Bool bDisplayStatusBar) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getInteractive() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setInteractive( ::sal_Bool bInteractive ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( ::sal_Bool bVisible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL OnKey( const OUString& Key, const ::com::sun::star::uno::Any& Procedure ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL CommandBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getVersion() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getVBE() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual css::uno::Any SAL_CALL Run( const OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL OnTime( const css::uno::Any& aEarliestTime, const OUString& aFunction, const css::uno::Any& aLatestTime, const css::uno::Any& aSchedule ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Quit() throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Run( const OUString& MacroName, const css::uno::Any& varg1, const css::uno::Any& varg2, const css::uno::Any& varg3, const css::uno::Any& varg4, const css::uno::Any& varg5, const css::uno::Any& varg6, const css::uno::Any& varg7, const css::uno::Any& varg8, const css::uno::Any& varg9, const css::uno::Any& varg10, const css::uno::Any& varg11, const css::uno::Any& varg12, const css::uno::Any& varg13, const css::uno::Any& varg14, const css::uno::Any& varg15, const css::uno::Any& varg16, const css::uno::Any& varg17, const css::uno::Any& varg18, const css::uno::Any& varg19, const css::uno::Any& varg20, const css::uno::Any& varg21, const css::uno::Any& varg22, const css::uno::Any& varg23, const css::uno::Any& varg24, const css::uno::Any& varg25, const css::uno::Any& varg26, const css::uno::Any& varg27, const css::uno::Any& varg28, const css::uno::Any& varg29, const css::uno::Any& varg30 ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL OnTime( const css::uno::Any& aEarliestTime, const OUString& aFunction, const css::uno::Any& aLatestTime, const css::uno::Any& aSchedule ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL CentimetersToPoints( float _Centimeters ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Undo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Quit() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; }; #endif diff --git a/include/vbahelper/vbacollectionimpl.hxx b/include/vbahelper/vbacollectionimpl.hxx index 587479d125dd..e59a298f2e9d 100644 --- a/include/vbahelper/vbacollectionimpl.hxx +++ b/include/vbahelper/vbacollectionimpl.hxx @@ -58,12 +58,12 @@ public: const css::uno::Reference< css::container::XIndexAccess >& rxIndexAccess ) throw (css::uno::RuntimeException) : mxIndexAccess( rxIndexAccess ), mnIndex( 0 ) {} - virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return mnIndex < mxIndexAccess->getCount(); } - virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { if( !hasMoreElements() ) throw css::container::NoSuchElementException(); @@ -99,12 +99,12 @@ public: const css::uno::Reference< css::container::XIndexAccess >& rxIndexAccess ) throw (css::uno::RuntimeException) : mxParent( rxParent ), mxContext( rxContext ), mxEnumeration( new SimpleIndexAccessToEnumeration( rxIndexAccess ) ) {} - virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) + virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return mxEnumeration->hasMoreElements(); } - virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return createCollectionObject( mxEnumeration->nextElement() ); } @@ -131,7 +131,7 @@ protected: public: EnumerationHelperImpl( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XEnumeration >& xEnumeration ) throw ( css::uno::RuntimeException ) : m_xParent( xParent ), m_xContext( xContext ), m_xEnumeration( xEnumeration ) { } - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException, std::exception) { return m_xEnumeration->hasMoreElements(); } + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_xEnumeration->hasMoreElements(); } }; // a wrapper class for a providing a XIndexAccess, XNameAccess, XEnumerationAccess impl based on providing a vector of interfaces @@ -155,12 +155,12 @@ private: public: XNamedEnumerationHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), mIt( mXNamedVec.begin() ) {} - virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasMoreElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mIt != mXNamedVec.end() ); } - virtual css::uno::Any SAL_CALL nextElement( ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual css::uno::Any SAL_CALL nextElement( ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( hasMoreElements() ) return css::uno::makeAny( *mIt++ ); @@ -174,16 +174,16 @@ protected: public: XNamedObjectCollectionHelper( const XNamedVec& sMap ) : mXNamedVec( sMap ), cachePos(mXNamedVec.begin()) {} // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) { return cppu::UnoType<Ifc1>::get(); } - virtual ::sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) { return ( mXNamedVec.size() > 0 ); } + virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::UnoType<Ifc1>::get(); } + virtual ::sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return ( mXNamedVec.size() > 0 ); } // XNameAcess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE { if ( !hasByName(aName) ) throw css::container::NoSuchElementException(); return css::uno::makeAny( *cachePos ); } - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { css::uno::Sequence< OUString > sNames( mXNamedVec.size() ); OUString* pString = sNames.getArray(); @@ -197,7 +197,7 @@ public: } return sNames; } - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { cachePos = mXNamedVec.begin(); typename XNamedVec::iterator it_end = mXNamedVec.end(); @@ -211,8 +211,8 @@ public: } // XElementAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) { return mXNamedVec.size(); } - virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return mXNamedVec.size(); } + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) throw (css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE { if ( Index < 0 || Index >= getCount() ) throw css::lang::IndexOutOfBoundsException(); @@ -221,7 +221,7 @@ public: } // XEnumerationAccess - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return new XNamedEnumerationHelper( mXNamedVec ); } diff --git a/include/vbahelper/vbadialogbase.hxx b/include/vbahelper/vbadialogbase.hxx index 32f0ebeb3510..276cc9a9192d 100644 --- a/include/vbahelper/vbadialogbase.hxx +++ b/include/vbahelper/vbadialogbase.hxx @@ -36,7 +36,7 @@ public: virtual ~VbaDialogBase() {} // Methods - virtual void SAL_CALL Show() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Show() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString mapIndexToName( sal_Int32 nIndex ) = 0; }; diff --git a/include/vbahelper/vbadialogsbase.hxx b/include/vbahelper/vbadialogsbase.hxx index 4012d9d99fc8..239995ae4d14 100644 --- a/include/vbahelper/vbadialogsbase.hxx +++ b/include/vbahelper/vbadialogsbase.hxx @@ -36,8 +36,8 @@ public: virtual ~VbaDialogsBase() {} // XCollection - virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getCount() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // INCLUDED_VBAHELPER_VBADIALOGSBASE_HXX diff --git a/include/vbahelper/vbadocumentbase.hxx b/include/vbahelper/vbadocumentbase.hxx index 01d442a34686..43306761c7a2 100644 --- a/include/vbahelper/vbadocumentbase.hxx +++ b/include/vbahelper/vbadocumentbase.hxx @@ -39,25 +39,25 @@ public: virtual ~VbaDocumentBase() {} // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getFullName() throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getVBProject() throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getPath() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getFullName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getSaved() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSaved( sal_Bool bSave ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getVBProject() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods virtual void SAL_CALL Close( const css::uno::Any &bSaveChanges, const css::uno::Any &aFileName, - const css::uno::Any &bRouteWorkbook ) throw (css::uno::RuntimeException, std::exception); + const css::uno::Any &bRouteWorkbook ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Protect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException); - virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Save() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Unprotect( const css::uno::Any &aPassword ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Save() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Activate() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; static OUString getNameFromModel( const css::uno::Reference< css::frame::XModel >& xModel ); }; diff --git a/include/vbahelper/vbadocumentsbase.hxx b/include/vbahelper/vbadocumentsbase.hxx index f4427468a0ce..c4e002f10f6b 100644 --- a/include/vbahelper/vbadocumentsbase.hxx +++ b/include/vbahelper/vbadocumentsbase.hxx @@ -43,11 +43,11 @@ public: virtual ~VbaDocumentsBase() {} // XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) = 0; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) = 0; + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE = 0; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE = 0; // VbaDocumentsBase_BASE - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) = 0; + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE = 0; protected: css::uno::Any createDocument() throw (css::uno::RuntimeException); diff --git a/include/vbahelper/vbaeventshelperbase.hxx b/include/vbahelper/vbaeventshelperbase.hxx index 8654a6e9281e..49441d522f7c 100644 --- a/include/vbahelper/vbaeventshelperbase.hxx +++ b/include/vbahelper/vbaeventshelperbase.hxx @@ -50,17 +50,17 @@ public: virtual ~VbaEventsHelperBase(); // script::vba::XVBAEventProcessor - virtual sal_Bool SAL_CALL hasVbaEventHandler( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL processVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::util::VetoException, css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasVbaEventHandler( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL processVbaEvent( sal_Int32 nEventId, const css::uno::Sequence< css::uno::Any >& rArgs ) throw (css::lang::IllegalArgumentException, css::util::VetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // document::XEventListener - virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL notifyEvent( const css::document::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // util::XChangesListener - virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& rEvent ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // lang::XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // little helpers --------------------------------------------------------- diff --git a/include/vbahelper/vbafontbase.hxx b/include/vbahelper/vbafontbase.hxx index 87abf9fc9df1..9601f6fbba30 100644 --- a/include/vbahelper/vbafontbase.hxx +++ b/include/vbahelper/vbafontbase.hxx @@ -67,28 +67,28 @@ public: virtual ~VbaFontBase();// {} // Attributes - virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSize( const css::uno::Any& _size ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setBold( const css::uno::Any& _bold ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) = 0; - virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) = 0; - virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setStrikethrough( const css::uno::Any& _strikethrough ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setShadow( const css::uno::Any& _shadow ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setItalic( const css::uno::Any& _italic ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const css::uno::Any& _name ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) ; + virtual css::uno::Any SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSize( const css::uno::Any& _size ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getColorIndex() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColorIndex( const css::uno::Any& _colorindex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getBold() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBold( const css::uno::Any& _bold ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getUnderline() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual void SAL_CALL setUnderline( const css::uno::Any& _underline ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE = 0; + virtual css::uno::Any SAL_CALL getStrikethrough() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setStrikethrough( const css::uno::Any& _strikethrough ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getShadow() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setShadow( const css::uno::Any& _shadow ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getItalic() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setItalic( const css::uno::Any& _italic ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSubscript() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSubscript( const css::uno::Any& _subscript ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getSuperscript() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setSuperscript( const css::uno::Any& _superscript ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const css::uno::Any& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getColor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setColor( const css::uno::Any& _color ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; }; #endif diff --git a/include/vbahelper/vbaglobalbase.hxx b/include/vbahelper/vbaglobalbase.hxx index f791f1890123..fec13aec6317 100644 --- a/include/vbahelper/vbaglobalbase.hxx +++ b/include/vbahelper/vbaglobalbase.hxx @@ -36,9 +36,9 @@ public: VbaGlobalsBase( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& sDocCtxName ); virtual ~VbaGlobalsBase(); // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index 6b3c2c29822c..ee7be80d7638 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -175,14 +175,14 @@ class VBAHELPER_DLLPUBLIC ConcreteXShapeGeometryAttributes : public AbstractGeom std::auto_ptr< ShapeHelper > m_pShapeHelper; public: ConcreteXShapeGeometryAttributes( const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ); - virtual double getLeft() const; - virtual void setLeft( double nLeft ); - virtual double getTop() const; - virtual void setTop( double nTop ); - virtual double getHeight() const; - virtual void setHeight( double nHeight ); - virtual double getWidth() const; - virtual void setWidth( double nWidth); + virtual double getLeft() const SAL_OVERRIDE; + virtual void setLeft( double nLeft ) SAL_OVERRIDE; + virtual double getTop() const SAL_OVERRIDE; + virtual void setTop( double nTop ) SAL_OVERRIDE; + virtual double getHeight() const SAL_OVERRIDE; + virtual void setHeight( double nHeight ) SAL_OVERRIDE; + virtual double getWidth() const SAL_OVERRIDE; + virtual void setWidth( double nWidth) SAL_OVERRIDE; virtual ~ConcreteXShapeGeometryAttributes(); }; @@ -195,20 +195,20 @@ public: const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::awt::XControl >& xControl, double fOffsetX, double fOffsetY ); - virtual double getLeft() const; - virtual void setLeft( double fLeft ); - virtual double getTop() const; - virtual void setTop( double fTop ); - virtual double getWidth() const; - virtual void setWidth( double fWidth ); - virtual double getHeight() const; - virtual void setHeight( double fHeight ); - virtual double getInnerWidth() const; - virtual void setInnerWidth( double fWidth ); - virtual double getInnerHeight() const; - virtual void setInnerHeight( double fHeight ); - virtual double getOffsetX() const; - virtual double getOffsetY() const; + virtual double getLeft() const SAL_OVERRIDE; + virtual void setLeft( double fLeft ) SAL_OVERRIDE; + virtual double getTop() const SAL_OVERRIDE; + virtual void setTop( double fTop ) SAL_OVERRIDE; + virtual double getWidth() const SAL_OVERRIDE; + virtual void setWidth( double fWidth ) SAL_OVERRIDE; + virtual double getHeight() const SAL_OVERRIDE; + virtual void setHeight( double fHeight ) SAL_OVERRIDE; + virtual double getInnerWidth() const SAL_OVERRIDE; + virtual void setInnerWidth( double fWidth ) SAL_OVERRIDE; + virtual double getInnerHeight() const SAL_OVERRIDE; + virtual void setInnerHeight( double fHeight ) SAL_OVERRIDE; + virtual double getOffsetX() const SAL_OVERRIDE; + virtual double getOffsetY() const SAL_OVERRIDE; private: double implGetPos( bool bPosY ) const; diff --git a/include/vbahelper/vbahelperinterface.hxx b/include/vbahelper/vbahelperinterface.hxx index 0a7cfd515e12..cba2340e67cc 100644 --- a/include/vbahelper/vbahelperinterface.hxx +++ b/include/vbahelper/vbahelperinterface.hxx @@ -165,8 +165,8 @@ css::uno::Sequence< OUString > classname::getServiceNames() \ declaration. */ #define VBAHELPER_DECL_XHELPERINTERFACE \ - virtual OUString getServiceImplName(); \ - virtual css::uno::Sequence< OUString > getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; \ + virtual css::uno::Sequence< OUString > getServiceNames() SAL_OVERRIDE; diff --git a/include/vbahelper/vbapagesetupbase.hxx b/include/vbahelper/vbapagesetupbase.hxx index 31b7a7fc7f9b..7ee5d2c610d5 100644 --- a/include/vbahelper/vbapagesetupbase.hxx +++ b/include/vbahelper/vbapagesetupbase.hxx @@ -41,20 +41,20 @@ public: virtual ~VbaPageSetupBase(){} // Attribute - virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTopMargin( double margin ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getBottomMargin() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setBottomMargin( double margin ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getRightMargin() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRightMargin( double margin ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getLeftMargin() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeftMargin( double margin ) throw (css::uno::RuntimeException, std::exception); + virtual double SAL_CALL getTopMargin() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTopMargin( double margin ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getBottomMargin() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setBottomMargin( double margin ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getRightMargin() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRightMargin( double margin ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getLeftMargin() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeftMargin( double margin ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual double SAL_CALL getHeaderMargin() throw (css::uno::RuntimeException); virtual void SAL_CALL setHeaderMargin( double margin ) throw (css::uno::RuntimeException); virtual double SAL_CALL getFooterMargin() throw (css::uno::RuntimeException); virtual void SAL_CALL setFooterMargin( double margin ) throw (css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getOrientation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setOrientation( sal_Int32 orientation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/include/vbahelper/vbapropvalue.hxx b/include/vbahelper/vbapropvalue.hxx index db80f8080de1..0abc159b81d5 100644 --- a/include/vbahelper/vbapropvalue.hxx +++ b/include/vbahelper/vbapropvalue.hxx @@ -43,10 +43,10 @@ public: ScVbaPropValue( PropListener* pListener ); // Attributes - virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL getValue() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue( const css::uno::Any& _value ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException, std::exception) { return OUString("Value"); } + OUString SAL_CALL getDefaultPropertyName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Value"); } }; #endif //SC_VBA_PROPVALULE_HXX diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index ab2c19ad32fb..f3d6bde84c65 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.hxx @@ -49,8 +49,8 @@ protected: virtual void addListeners(); virtual void removeShapeListener() throw( css::uno::RuntimeException ); virtual void removeShapesListener() throw( css::uno::RuntimeException ); - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; public: ScVbaShape( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape, const css::uno::Reference< css::drawing::XShapes >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel, sal_Int32 nType ) throw ( css::lang::IllegalArgumentException ); virtual ~ScVbaShape(); @@ -60,51 +60,51 @@ public: static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException); // Attributes - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAlternativeText() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAlternativeText( const OUString& _name ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getZOrderPosition() throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getRotation() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRotation( double _rotation ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::msforms::XPictureFormat > SAL_CALL getPictureFormat() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLockAnchor( ::sal_Bool _lockanchor ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAlternativeText() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAlternativeText( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getZOrderPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getType() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getRotation() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRotation( double _rotation ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::msforms::XPictureFormat > SAL_CALL getPictureFormat() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLockAnchor( ::sal_Bool _lockanchor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual css::uno::Any SAL_CALL SAL_CALL TextFrame( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ScaleHeight( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ScaleWidth( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL SAL_CALL TextFrame( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL Delete() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ScaleHeight( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ScaleWidth( double Factor, sal_Bool RelativeToOriginalSize, sal_Int32 Scale ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Replace?? - virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL ShapeRange( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL Select( const css::uno::Any& Replace ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL ShapeRange( const css::uno::Any& index ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const css::lang::EventObject& rEventObject ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif // INCLUDED_VBAHELPER_VBASHAPE_HXX diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx index a5e9fd7e8825..b01f6f45ed65 100644 --- a/include/vbahelper/vbashaperange.hxx +++ b/include/vbahelper/vbashaperange.hxx @@ -35,46 +35,46 @@ private: css::uno::Reference< css::drawing::XShapes > m_xShapes; protected: css::uno::Reference< css::frame::XModel > m_xModel; - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; css::uno::Reference< css::drawing::XShapes > getShapes() throw (css::uno::RuntimeException) ; public: ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape, const css::uno::Reference< css::frame::XModel >& xModel ); // Methods - virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ::ooo::vba::msforms::XShape > SAL_CALL Group() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception); - virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setLockAnchor( ::sal_Bool _lockanchor ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL SAL_CALL TextFrame( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat( ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL Select( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ::ooo::vba::msforms::XShape > SAL_CALL Group() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL IncrementRotation( double Increment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL IncrementLeft( double Increment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL IncrementTop( double Increment ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setName( const OUString& _name ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setHeight( double _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setWidth( double _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLeft( double _left ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual double SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setTop( double _top ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::msforms::XLineFormat > SAL_CALL getLine() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::msforms::XFillFormat > SAL_CALL getFill() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLockAspectRatio() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLockAspectRatio( ::sal_Bool _lockaspectratio ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLockAnchor() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLockAnchor( ::sal_Bool _lockanchor ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getRelativeHorizontalPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRelativeHorizontalPosition( ::sal_Int32 _relativehorizontalposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getRelativeVerticalPosition() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setRelativeVerticalPosition( ::sal_Int32 _relativeverticalposition ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL SAL_CALL TextFrame( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL SAL_CALL WrapFormat( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ZOrder( sal_Int32 ZOrderCmd ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) SAL_OVERRIDE; }; #endif // INCLUDED_VBAHELPER_VBASHAPERANGE_HXX diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index 2e8e979d5405..5c6800fb00dd 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -39,8 +39,8 @@ private: void initBaseCollection(); protected: css::uno::Reference< css::frame::XModel > m_xModel; - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; virtual css::uno::Reference< css::container::XIndexAccess > getShapesByArrayIndices( const css::uno::Any& Index ) throw (css::uno::RuntimeException); css::uno::Reference< css::drawing::XShape > createShape( const OUString& service ) throw (css::uno::RuntimeException); css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException); @@ -55,18 +55,18 @@ public: static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException); static void setShape_NameProperty( css::uno::Reference< css::drawing::XShape > xShape, const OUString& sName ); //XEnumerationAccess - virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException); - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException); + virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - virtual void SAL_CALL SelectAll() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL SelectAll() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; //helper::calc - virtual css::uno::Any SAL_CALL AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL AddLine( sal_Int32 StartX, sal_Int32 StartY, sal_Int32 endX, sal_Int32 endY ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL AddShape( sal_Int32 _nType, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL AddTextbox( sal_Int32 _nOrientation, sal_Int32 _nLeft, sal_Int32 _nTop, sal_Int32 _nWidth, sal_Int32 _nHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< ov::msforms::XShapeRange > SAL_CALL Range( const css::uno::Any& shapes ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ScVbaCollectionBaseImpl - virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) throw (css::uno::RuntimeException); - virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException); + virtual css::uno::Any createCollectionObject( const css::uno::Any& aSource ) throw (css::uno::RuntimeException) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL Item( const css::uno::Any& Index1, const css::uno::Any& Index2 ) throw (css::uno::RuntimeException) SAL_OVERRIDE; }; #endif // INCLUDED_VBAHELPER_VBASHAPES_HXX diff --git a/include/vbahelper/vbatextframe.hxx b/include/vbahelper/vbatextframe.hxx index a5714e2d82a9..c2ddd8db8b1e 100644 --- a/include/vbahelper/vbatextframe.hxx +++ b/include/vbahelper/vbatextframe.hxx @@ -31,8 +31,8 @@ protected: css::uno::Reference< css::drawing::XShape > m_xShape; css::uno::Reference< css::beans::XPropertySet > m_xPropertySet; protected: - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; virtual void setAsMSObehavior(); sal_Int32 getMargin( const OUString& sMarginType ); void setMargin( const OUString& sMarginType, float fMargin ); @@ -40,19 +40,19 @@ public: VbaTextFrame( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext , css::uno::Reference< css::drawing::XShape > xShape); virtual ~VbaTextFrame() {} // Attributes - virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setAutoSize( sal_Bool _autosize ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getMarginBottom() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMarginBottom( float _marginbottom ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getMarginTop() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMarginTop( float _margintop ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getMarginLeft() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMarginLeft( float _marginleft ) throw (css::uno::RuntimeException, std::exception); - virtual float SAL_CALL getMarginRight() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMarginRight( float _marginright ) throw (css::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL getAutoSize() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setAutoSize( sal_Bool _autosize ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getMarginBottom() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMarginBottom( float _marginbottom ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getMarginTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMarginTop( float _margintop ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getMarginLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMarginLeft( float _marginleft ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual float SAL_CALL getMarginRight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setMarginRight( float _marginright ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // Methods - virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException, std::exception); + virtual css::uno::Any SAL_CALL Characters( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/include/vbahelper/vbawindowbase.hxx b/include/vbahelper/vbawindowbase.hxx index 3f2abd3f58fd..cd2b8a705ff3 100644 --- a/include/vbahelper/vbawindowbase.hxx +++ b/include/vbahelper/vbawindowbase.hxx @@ -42,20 +42,20 @@ public: throw (css::uno::RuntimeException); // XWindowBase - virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException, std::exception) ; - virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) ; - virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) ; - virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) ; + virtual sal_Int32 SAL_CALL getHeight() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setHeight( sal_Int32 _height ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual sal_Int32 SAL_CALL getLeft() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setLeft( sal_Int32 _left ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual sal_Int32 SAL_CALL getTop() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setTop( sal_Int32 _top ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual sal_Bool SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setVisible( sal_Bool _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getWidth() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setWidth( sal_Int32 _width ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; // XHelperInterface - virtual OUString getServiceImplName(); - virtual css::uno::Sequence<OUString> getServiceNames(); + virtual OUString getServiceImplName() SAL_OVERRIDE; + virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; protected: css::uno::Reference< css::frame::XController > getController() throw (css::uno::RuntimeException); diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index d3e075fed57c..c475aec559db 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -298,7 +298,7 @@ protected: void DrawDeviceBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - BitmapEx& rBitmapEx ); + BitmapEx& rBitmapEx ) SAL_OVERRIDE; public: Printer(); diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 2b82d2cf067a..5b25b72f6e6d 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -113,7 +113,7 @@ public: virtual ~VirtualDevice(); - virtual void EnableRTL( bool bEnable = true ); + virtual void EnableRTL( bool bEnable = true ) SAL_OVERRIDE; bool SetOutputSizePixel( const Size& rNewSize, bool bErase = true ); bool SetOutputSizePixelScaleOffsetAndBuffer( const Size& rNewSize, const Fraction& rScale, const Point& rNewOffset, const basebmp::RawMemorySharedArray &pBuffer ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index ecd350eff67e..5751489fe1c7 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -595,7 +595,7 @@ public: OutputDevice const* GetOutDev() const { return mpOutputDevice; }; OutputDevice* GetOutDev() { return mpOutputDevice; }; - virtual void EnableRTL ( bool bEnable = true ); + virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); |