diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:37:00 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-26 16:39:26 +0100 |
| commit | 70cc2b191b95fbc210bc1f0f6a7159f341894f0f (patch) | |
| tree | a70f4957c454b443520cbf91250c41d9eea80017 /extensions | |
| parent | 8757bea2e88c6e349e1fe98d8e9695d7b9c6179e (diff) | |
First batch of adding SAL_OVERRRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: I71fa20213e86be10de332ece0aa273239df7b61a
Diffstat (limited to 'extensions')
47 files changed, 472 insertions, 472 deletions
diff --git a/extensions/qa/update/test_update.cxx b/extensions/qa/update/test_update.cxx index 2fbbfef6beea..97b10649a88f 100644 --- a/extensions/qa/update/test_update.cxx +++ b/extensions/qa/update/test_update.cxx @@ -26,7 +26,7 @@ namespace testupdate { class Test : public test::BootstrapFixture { public: - virtual void setUp() + virtual void setUp() SAL_OVERRIDE { // so that comphelper::getProcessServiceFactory() works, m_xContext is // set up, etc. @@ -40,7 +40,7 @@ public: m_aRepositoryList[0] = getURLFromSrc( "/extensions/qa/update/simple.xml" ); } - virtual void tearDown() + virtual void tearDown() SAL_OVERRIDE { m_xProvider.clear(); m_aRepositoryList.realloc( 0 ); diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index e3a86ed293d2..342971dddb43 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -81,7 +81,7 @@ namespace bib protected: - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; public: @@ -95,7 +95,7 @@ namespace bib // #100312# const Reference< frame::XDispatchProviderInterception>& getDispatchProviderInterception() const { return m_xDispatchProviderInterception; } - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; }; BibGridwin::BibGridwin( Window* _pParent, WinBits _nStyle ) : Window( _pParent, _nStyle ) diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 06b62eeb8006..adc5d67a97c4 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -64,7 +64,7 @@ namespace bib // FormControlContainer ---------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > - getControlContainer(); + getControlContainer() SAL_OVERRIDE; public: // #100312# ------------------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > @@ -75,7 +75,7 @@ namespace bib void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &); - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; }; diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index fc1fb965d106..eae39cddab1c 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -106,8 +106,8 @@ public: BibConfig(); ~BibConfig(); - virtual void Commit(); - virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames); + virtual void Commit() SAL_OVERRIDE; + virtual void Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames) SAL_OVERRIDE; BibDBDescriptor GetBibliographyURL(); void SetBibliographyURL(const BibDBDescriptor& rDesc); diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index f63fef02d5ab..bb73f85e0adc 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.hxx @@ -37,7 +37,7 @@ class BibWindowContainer : public BibWindow //Window BibShortCutHandler* pChild; protected: - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; public: BibWindowContainer( Window* pParent, BibShortCutHandler* pChild, WinBits nStyle = WB_3DLOOK); @@ -45,9 +45,9 @@ class BibWindowContainer : public BibWindow //Window inline Window* GetChild(); - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; - virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled + virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; // returns true, if key was handled using Window::GetChild; }; @@ -77,9 +77,9 @@ class BibBookContainer: public BibSplitWindow protected: - virtual void Split(); + virtual void Split() SAL_OVERRIDE; - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: @@ -94,9 +94,9 @@ class BibBookContainer: public BibSplitWindow void createBottomFrame( BibShortCutHandler* pWin ); - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; - virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled + virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; // returns true, if key was handled }; #endif diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 0ad42f0b075b..2e0c0fac497f 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -98,9 +98,9 @@ public: ~BibliographyLoader(); // XServiceInfo - OUString SAL_CALL getImplementationName() throw(std::exception ); - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ); - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ); + OUString SAL_CALL getImplementationName() throw(std::exception ) SAL_OVERRIDE; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception ) SAL_OVERRIDE; + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw(std::exception ) SAL_OVERRIDE; static OUString getImplementationName_Static() throw( ) { @@ -110,22 +110,22 @@ public: } //XNameAccess - virtual Any SAL_CALL getByName(const OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ); - virtual Sequence< OUString > SAL_CALL getElementNames(void) throw ( RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw ( RuntimeException, std::exception ); + virtual Any SAL_CALL getByName(const OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getElementNames(void) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; //XElementAccess - virtual Type SAL_CALL getElementType(void) throw ( RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasElements(void) throw ( RuntimeException, std::exception ); + virtual Type SAL_CALL getElementType(void) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements(void) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; //XPropertySet - virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw ( RuntimeException, std::exception ); - virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ); - virtual Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ); - virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ); - virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ); - virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ); - virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ); + virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(void) throw ( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception ) SAL_OVERRIDE; static Sequence<OUString> SAL_CALL getSupportedServiceNames_Static(void) throw( ); @@ -134,8 +134,8 @@ public: // XLoader virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL, const Sequence< PropertyValue >& aArgs, - const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException, std::exception); + const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; BibliographyLoader::BibliographyLoader() : diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index 80f0949abfad..3129b80ed60c 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -48,15 +48,15 @@ namespace bib protected: // Window overridables - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; // FormControlContainer virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > - getControlContainer(); + getControlContainer() SAL_OVERRIDE; // XLoadListener equivalents - virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ); - virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ); + virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; public: BibView( Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK ); @@ -64,9 +64,9 @@ namespace bib void UpdatePages(); - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; - virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled + virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; // returns true, if key was handled }; diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 015f2b7d0853..c8965e0fdfa6 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -66,13 +66,13 @@ public: void ReleaseInterceptor(); // 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; // XDispatchProviderInterceptor - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) 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 >& xNewSlaveDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) 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 >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; typedef cppu::WeakComponentImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener @@ -118,14 +118,14 @@ protected: createGridModel( const OUString& rName ); // XLoadable - virtual void SAL_CALL load( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL unload( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL reload( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isLoaded( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addLoadListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeLoadListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL load( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unload( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reload( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isLoaded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addLoadListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeLoadListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; public: @@ -133,9 +133,9 @@ public: ~BibDataManager(); virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx index c7737c3f5cf2..4378f5f66d10 100644 --- a/extensions/source/bibliography/formcontrolcontainer.hxx +++ b/extensions/source/bibliography/formcontrolcontainer.hxx @@ -58,11 +58,11 @@ namespace bib protected: // XLoadListener equivalents - virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ); - virtual void _unloading( const ::com::sun::star::lang::EventObject& _rEvent ); - virtual void _unloaded( const ::com::sun::star::lang::EventObject& _rEvent ); - virtual void _reloading( const ::com::sun::star::lang::EventObject& _rEvent ); - virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ); + virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _unloading( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _unloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _reloading( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; + virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ) SAL_OVERRIDE; }; diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 440d19bcfdc4..07d5de5ca65d 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -145,8 +145,8 @@ public: ~BibFrameCtrl_Impl(); - virtual void SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index e360e8eb52b6..263101da440a 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -85,40 +85,40 @@ public: void RemoveFilter(); // ::com::sun::star::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) 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& sServiceName ) 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::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); - virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() 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; + virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() 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 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; // ::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; //class ::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); + 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); - 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); + 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; // ::com::sun::star::frame::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 CommandGroup ) 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 CommandGroup ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index be37d26cfdb4..649c74ab62df 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -86,12 +86,12 @@ public: BibPosListener(BibGeneralPage* pParent); //XPositioningListener - virtual void SAL_CALL cursorMoved(const lang::EventObject& event) throw( uno::RuntimeException, std::exception ); - virtual void SAL_CALL rowChanged(const lang::EventObject& /*event*/) throw( uno::RuntimeException, std::exception ){ /* not interested in */ } - virtual void SAL_CALL rowSetChanged(const lang::EventObject& /*event*/) throw( uno::RuntimeException, std::exception ){ /* not interested in */ } + virtual void SAL_CALL cursorMoved(const lang::EventObject& event) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL rowChanged(const lang::EventObject& /*event*/) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE { /* not interested in */ } + virtual void SAL_CALL rowSetChanged(const lang::EventObject& /*event*/) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE { /* not interested in */ } //XEventListener - virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing(const lang::EventObject& Source) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 8062e1874d01..0d91f4165cf7 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -136,7 +136,7 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage DECL_LINK( ScrollHdl, ScrollBar* ); protected: - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; void InitFixedTexts( void ); // create mnemonics and set text an all fixed texts public: @@ -154,16 +154,16 @@ public: void CommitActiveControl(); - 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 SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ); - void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ); + void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void RemoveListeners(); - virtual void GetFocus(); + virtual void GetFocus() SAL_OVERRIDE; - virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled + virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ) SAL_OVERRIDE; // returns true, if key was handled }; diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx index 2735f59b3981..8501e5b6188b 100644 --- a/extensions/source/bibliography/loadlisteneradapter.hxx +++ b/extensions/source/bibliography/loadlisteneradapter.hxx @@ -144,8 +144,8 @@ namespace bib OLoadListener* getLoadListener( ) { return static_cast< OLoadListener* >( getListener() ); } protected: - virtual void disposing(); - virtual void startComponentListening(); + virtual void disposing() SAL_OVERRIDE; + virtual void startComponentListening() SAL_OVERRIDE; public: OLoadListenerAdapter( @@ -154,19 +154,19 @@ namespace bib ); - 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; protected: // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLoadListener - virtual void SAL_CALL loaded( const ::com::sun::star::lang::EventObject& aEvent ) 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 unloaded( 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& aEvent ) 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 unloaded( 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; }; diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 86da81ad918c..72a124e62791 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -56,11 +56,11 @@ public: // ::com::sun::star::lang::XEventListener // we do not hold References to dispatches, so there is nothing to do on disposal virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*Source*/) - throw( ::com::sun::star::uno::RuntimeException, std::exception ){}; + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE {}; // ::com::sun::star::frame::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; }; @@ -72,7 +72,7 @@ public: ~BibTBListBoxListener(); 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; }; @@ -84,7 +84,7 @@ public: ~BibTBEditListener(); 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; }; @@ -96,7 +96,7 @@ public: ~BibTBQueryMenuListener(); 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; }; @@ -139,11 +139,11 @@ class BibToolBar: public ToolBox protected: - void DataChanged( const DataChangedEvent& rDCEvt ); + void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void InitListener(); - virtual void Select(); - virtual void Click(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual void Select() SAL_OVERRIDE; + virtual void Click() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index 456bbf83b9a8..3a24025c3b75 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx @@ -60,19 +60,19 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) - throw (uno::RuntimeException, std::exception) ; + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual sal_Bool SAL_CALL supportsService( const OUString& aServiceName ) - throw (uno::RuntimeException, std::exception) ; + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE ; virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) ; + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE ; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) + getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return css::uno::Reference< css::beans::XPropertySetInfo >(); } virtual void SAL_CALL setPropertyValue( @@ -81,20 +81,20 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL getPropertyValue( OUString const & PropertyName) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener( OUString const &, css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL removePropertyChangeListener( @@ -102,7 +102,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase css::uno::Reference< css::beans::XPropertyChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL addVetoableChangeListener( @@ -110,7 +110,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE {} virtual void SAL_CALL removeVetoableChangeListener( @@ -118,7 +118,7 @@ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase css::uno::Reference< css::beans::XVetoableChangeListener > const &) throw ( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE {} /** diff --git a/extensions/source/logging/consolehandler.cxx b/extensions/source/logging/consolehandler.cxx index cd88ed1055fe..0e954eae9324 100644 --- a/extensions/source/logging/consolehandler.cxx +++ b/extensions/source/logging/consolehandler.cxx @@ -80,29 +80,29 @@ namespace logging virtual ~ConsoleHandler(); // XConsoleHandler - virtual ::sal_Int32 SAL_CALL getThreshold() throw (RuntimeException, std::exception); - virtual void SAL_CALL setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException, std::exception); + virtual ::sal_Int32 SAL_CALL getThreshold() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setThreshold( ::sal_Int32 _threshold ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XLogHandler - virtual OUString SAL_CALL getEncoding() throw (RuntimeException, std::exception); - virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException, std::exception); - virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException, std::exception); - virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception); - virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception); - virtual void SAL_CALL flush( ) throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getEncoding() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; public: // XServiceInfo - static version diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx index 3c8580efdf4a..c62622d339e2 100644 --- a/extensions/source/logging/csvformatter.cxx +++ b/extensions/source/logging/csvformatter.cxx @@ -56,7 +56,7 @@ namespace logging class CsvFormatter : public CsvFormatter_Base { public: - virtual OUString SAL_CALL formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL formatMultiColumn(const Sequence< OUString>& column_data) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - static version static OUString SAL_CALL getImplementationName_static(); @@ -68,27 +68,27 @@ namespace logging virtual ~CsvFormatter(); // XCsvLogFormatter - virtual ::sal_Bool SAL_CALL getLogEventNo() throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLogThread() throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLogTimestamp() throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL getLogSource() throw (RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getColumnnames() throw (RuntimeException, std::exception); - - virtual void SAL_CALL setLogEventNo( ::sal_Bool log_event_no ) throw (RuntimeException, std::exception); - virtual void SAL_CALL setLogThread( ::sal_Bool log_thread ) throw (RuntimeException, std::exception); - virtual void SAL_CALL setLogTimestamp( ::sal_Bool log_timestamp ) throw (RuntimeException, std::exception); - virtual void SAL_CALL setLogSource( ::sal_Bool log_source ) throw (RuntimeException, std::exception); - virtual void SAL_CALL setColumnnames( const Sequence< OUString>& column_names) throw (RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL getLogEventNo() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLogThread() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLogTimestamp() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL getLogSource() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getColumnnames() throw (RuntimeException, std::exception) SAL_OVERRIDE; + + virtual void SAL_CALL setLogEventNo( ::sal_Bool log_event_no ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLogThread( ::sal_Bool log_thread ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLogTimestamp( ::sal_Bool log_timestamp ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLogSource( ::sal_Bool log_source ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setColumnnames( const Sequence< OUString>& column_names) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XLogFormatter - virtual OUString SAL_CALL getHead( ) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getTail( ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getHead( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTail( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& service_name ) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& service_name ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; private: ::sal_Bool m_LogEventNo; diff --git a/extensions/source/logging/filehandler.cxx b/extensions/source/logging/filehandler.cxx index 4b4f05eda1ec..2802f9586de6 100644 --- a/extensions/source/logging/filehandler.cxx +++ b/extensions/source/logging/filehandler.cxx @@ -100,25 +100,25 @@ namespace logging virtual ~FileHandler(); // XLogHandler - virtual OUString SAL_CALL getEncoding() throw (RuntimeException, std::exception); - virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException, std::exception); - virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException, std::exception); - virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception); - virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception); - virtual void SAL_CALL flush( ) throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getEncoding() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setEncoding( const OUString& _encoding ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XLogFormatter > SAL_CALL getFormatter() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setFormatter( const Reference< XLogFormatter >& _formatter ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL publish( const LogRecord& Record ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // OComponentHelper - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; public: // XServiceInfo - static version diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx index b7b7d17e1b17..68e0f42fbaa3 100644 --- a/extensions/source/logging/logger.cxx +++ b/extensions/source/logging/logger.cxx @@ -76,19 +76,19 @@ namespace logging EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // XLogger - virtual OUString SAL_CALL getName() throw (RuntimeException, std::exception); - virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception); - virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception); - virtual void SAL_CALL addLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException, std::exception); - virtual void SAL_CALL removeLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isLoggable( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception); - virtual void SAL_CALL log( ::sal_Int32 Level, const OUString& Message ) throw (RuntimeException, std::exception); - virtual void SAL_CALL logp( ::sal_Int32 Level, const OUString& SourceClass, const OUString& SourceMethod, const OUString& Message ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getName() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int32 SAL_CALL getLevel() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setLevel( ::sal_Int32 _level ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeLogHandler( const Reference< XLogHandler >& LogHandler ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isLoggable( ::sal_Int32 _nLevel ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL log( ::sal_Int32 Level, const OUString& Message ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL logp( ::sal_Int32 Level, const OUString& SourceClass, const OUString& SourceMethod, const OUString& Message ) throw (RuntimeException, std::exception) SAL_OVERRIDE; protected: ~EventLogger(); @@ -123,9 +123,9 @@ namespace logging LoggerPool( const Reference< XComponentContext >& _rxContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; // helper for factories static Sequence< OUString > getSupportedServiceNames_static(); @@ -134,8 +134,8 @@ namespace logging static Reference< XInterface > Create( const Reference< XComponentContext >& _rxContext ); // XLoggerPool - virtual Reference< XLogger > SAL_CALL getNamedLogger( const OUString& Name ) throw (RuntimeException, std::exception); - virtual Reference< XLogger > SAL_CALL getDefaultLogger( ) throw (RuntimeException, std::exception); + virtual Reference< XLogger > SAL_CALL getNamedLogger( const OUString& Name ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XLogger > SAL_CALL getDefaultLogger( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; }; EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const OUString& _rName ) diff --git a/extensions/source/logging/plaintextformatter.cxx b/extensions/source/logging/plaintextformatter.cxx index be33e2a4183c..f33b7df5fe30 100644 --- a/extensions/source/logging/plaintextformatter.cxx +++ b/extensions/source/logging/plaintextformatter.cxx @@ -60,14 +60,14 @@ namespace logging virtual ~PlainTextFormatter(); // XLogFormatter - virtual OUString SAL_CALL getHead( ) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException, std::exception); - virtual OUString SAL_CALL getTail( ) throw (RuntimeException, std::exception); + virtual OUString SAL_CALL getHead( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL format( const LogRecord& Record ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getTail( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception); - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) SAL_OVERRIDE; public: // XServiceInfo - static version diff --git a/extensions/source/nsplugin/source/so_closelistener.hxx b/extensions/source/nsplugin/source/so_closelistener.hxx index ab54673f2493..2bd9cc98e7f0 100644 --- a/extensions/source/nsplugin/source/so_closelistener.hxx +++ b/extensions/source/nsplugin/source/so_closelistener.hxx @@ -44,11 +44,11 @@ public: void StopPreventClose() { m_bPreventClose = sal_False; } virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::util::CloseVetoException, std::exception ); + throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::util::CloseVetoException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& aEvent ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& aEvent ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - 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 ; }; #endif diff --git a/extensions/source/plugin/base/context.cxx b/extensions/source/plugin/base/context.cxx index 8ad3ceebe9ca..f795dc2bcce8 100644 --- a/extensions/source/plugin/base/context.cxx +++ b/extensions/source/plugin/base/context.cxx @@ -77,9 +77,9 @@ public: virtual ~FileSink(); // ::com::sun::star::io::XOutputStream - virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(std::exception); - virtual void SAL_CALL flush() throw(std::exception); - virtual void SAL_CALL closeOutput() throw(std::exception); + virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE; }; } @@ -95,14 +95,14 @@ public: virtual ~XPluginContext_Impl(); - virtual OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); - virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); - virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); - virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); - virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); - virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); - virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); - virtual OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ); + virtual OUString SAL_CALL getValue(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, ::com::sun::star::plugin::PluginVariable variable) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL getURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL getURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL postURLNotify(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file, const Reference< ::com::sun::star::lang::XEventListener > & listener) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL postURL(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& url, const OUString& target, const Sequence< sal_Int8 >& buf, sal_Bool file) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL newStream(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& mimetype, const OUString& target, const Reference< ::com::sun::star::io::XActiveDataSource > & source) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL displayStatusText(const Reference< ::com::sun::star::plugin::XPlugin > & plugin, const OUString& message) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL getUserAgent(const Reference< ::com::sun::star::plugin::XPlugin > & plugin) throw( ::com::sun::star::plugin::PluginException, RuntimeException, std::exception ) SAL_OVERRIDE; }; Reference< ::com::sun::star::plugin::XPluginContext > XPluginManager_Impl::createPluginContext() throw(std::exception) diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 2e1809539307..04c4c8e44a4b 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -71,7 +71,7 @@ class PluginDisposer : public salhelper::Timer private: XPlugin_Impl* m_pPlugin; - virtual void SAL_CALL onShot(); + virtual void SAL_CALL onShot() SAL_OVERRIDE; public: PluginDisposer( XPlugin_Impl* pPlugin ) : salhelper::Timer( salhelper::TTimeValue( 2, 0 ), diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx index 85be9c80653b..0ceb7cade826 100644 --- a/extensions/source/plugin/inc/plugin/impl.hxx +++ b/extensions/source/plugin/inc/plugin/impl.hxx @@ -237,32 +237,32 @@ public: // static const Reference< com::sun::star::reflection::XIdlClass > & staticGetIdlClass(); // XInterface - virtual Any SAL_CALL queryInterface( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL acquire() throw() + virtual Any SAL_CALL queryInterface( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + 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(); } // OWeakAggObject virtual Any SAL_CALL queryAggregation( const Type& ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // PluginContol_Impl - virtual void SAL_CALL dispose() throw(std::exception); - virtual void SAL_CALL createPeer( const Reference< com::sun::star::awt::XToolkit > & xToolkit, const Reference< com::sun::star::awt::XWindowPeer > & Parent) throw( RuntimeException, std::exception ); + virtual void SAL_CALL dispose() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL createPeer( const Reference< com::sun::star::awt::XToolkit > & xToolkit, const Reference< com::sun::star::awt::XWindowPeer > & Parent) throw( RuntimeException, std::exception ) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL setModel( const Reference< com::sun::star::awt::XControlModel > & Model ) throw( RuntimeException, std::exception ); - virtual Reference< com::sun::star::awt::XControlModel > SAL_CALL getModel()throw( RuntimeException, std::exception ) + virtual sal_Bool SAL_CALL setModel( const Reference< com::sun::star::awt::XControlModel > & Model ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual Reference< com::sun::star::awt::XControlModel > SAL_CALL getModel()throw( RuntimeException, std::exception ) SAL_OVERRIDE { return m_xModel; } - virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException, std::exception ); + virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; // com::sun::star::plugin::XPlugin - virtual sal_Bool SAL_CALL provideNewStream(const OUString& mimetype, const Reference< com::sun::star::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(std::exception); + virtual sal_Bool SAL_CALL provideNewStream(const OUString& mimetype, const Reference< com::sun::star::io::XActiveDataSource > & stream, const OUString& url, sal_Int32 length, sal_Int32 lastmodified, sal_Bool isfile) throw(std::exception) SAL_OVERRIDE; // com::sun::star::beans::XPropertyChangeListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rSource ) throw(std::exception); - virtual void SAL_CALL propertyChange( const com::sun::star::beans::PropertyChangeEvent& rEvent ) throw(std::exception); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& rSource ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL propertyChange( const com::sun::star::beans::PropertyChangeEvent& rEvent ) throw(std::exception) SAL_OVERRIDE; }; class PluginManager @@ -299,22 +299,22 @@ public: static XPlugin_Impl* getXPluginFromNPP( NPP ); static XPlugin_Impl* getPluginImplementation( const Reference< com::sun::star::plugin::XPlugin >& plugin ); - virtual Reference< com::sun::star::plugin::XPluginContext > SAL_CALL createPluginContext() throw(std::exception); + virtual Reference< com::sun::star::plugin::XPluginContext > SAL_CALL createPluginContext() throw(std::exception) SAL_OVERRIDE; // has to be implemented per system virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL impl_getPluginDescriptions(void) throw(); // calls system specific impl_getPluginDescriptions // checks whether plugins are disabled - virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions(void) throw(std::exception); + virtual Sequence< com::sun::star::plugin::PluginDescription > SAL_CALL getPluginDescriptions(void) throw(std::exception) SAL_OVERRIDE; - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException, std::exception ); + virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPlugin( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const com::sun::star::plugin::PluginDescription& plugintype) throw( RuntimeException,::com::sun::star::plugin::PluginException, std::exception ) SAL_OVERRIDE; - virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit, const Reference< com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw(std::exception); + virtual Reference< com::sun::star::plugin::XPlugin > SAL_CALL createPluginFromURL( const Reference< com::sun::star::plugin::XPluginContext > & acontext, sal_Int16 mode, const Sequence< OUString >& argn, const Sequence< OUString >& argv, const Reference< com::sun::star::awt::XToolkit > & toolkit, const Reference< com::sun::star::awt::XWindowPeer > & parent, const OUString& url ) throw(std::exception) SAL_OVERRIDE; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(); - virtual OUString SAL_CALL getImplementationName() throw(); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw() SAL_OVERRIDE; + virtual OUString SAL_CALL getImplementationName() throw() SAL_OVERRIDE; - Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ) SAL_OVERRIDE; static Sequence< OUString > getSupportedServiceNames_Static(void) throw( ); static OUString getImplementationName_Static() throw( ) { @@ -372,7 +372,7 @@ public: virtual ~PluginInputStream(); - virtual PluginStreamType getStreamType(); + virtual PluginStreamType getStreamType() SAL_OVERRIDE; void setMode( sal_Int32 nMode ); sal_uInt32 read( sal_uInt32 offset, sal_Int8* buffer, sal_uInt32 size ); @@ -385,19 +385,19 @@ public: { bool bRet = m_xSelf.is(); m_xSelf.clear(); return bRet; } // XOutputStream - virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(std::exception); - virtual void SAL_CALL flush() throw(std::exception); - virtual void SAL_CALL closeOutput() throw(std::exception); + virtual void SAL_CALL writeBytes( const Sequence<sal_Int8>& ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL flush() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL closeOutput() throw(std::exception) SAL_OVERRIDE; // XConnectable - virtual void SAL_CALL setPredecessor( const Reference< com::sun::star::io::XConnectable >& xPredecessor ) throw(std::exception) + virtual void SAL_CALL setPredecessor( const Reference< com::sun::star::io::XConnectable >& xPredecessor ) throw(std::exception) SAL_OVERRIDE { m_xPredecessor = xPredecessor; } - virtual Reference< com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) + virtual Reference< com::sun::star::io::XConnectable > SAL_CALL getPredecessor() throw(std::exception) SAL_OVERRIDE { return m_xPredecessor; } - virtual void SAL_CALL setSuccessor( const Reference< com::sun::star::io::XConnectable >& xSuccessor ) throw(std::exception) + virtual void SAL_CALL setSuccessor( const Reference< com::sun::star::io::XConnectable >& xSuccessor ) throw(std::exception) SAL_OVERRIDE { m_xSuccessor = xSuccessor; } - virtual Reference< com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) + virtual Reference< com::sun::star::io::XConnectable > SAL_CALL getSuccessor() throw(std::exception) SAL_OVERRIDE { return m_xSuccessor; } }; @@ -410,7 +410,7 @@ public: sal_uInt32 len, sal_uInt32 lastmod ); virtual ~PluginOutputStream(); - virtual PluginStreamType getStreamType(); + virtual PluginStreamType getStreamType() SAL_OVERRIDE; Reference< com::sun::star::io::XOutputStream > & getOutputStream() { return m_xStream; } }; @@ -436,7 +436,7 @@ public: void* getNotifyData() { return m_pNotifyData; } // com::sun::star::lang::XEventListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw(std::exception); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) throw(std::exception) SAL_OVERRIDE; }; #endif diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx index a2a9f9995ac4..cc516521e8d4 100644 --- a/extensions/source/plugin/inc/plugin/model.hxx +++ b/extensions/source/plugin/inc/plugin/model.hxx @@ -89,14 +89,14 @@ class PluginModel : public BroadcasterHelperHolder, void setMimeType( const OUString& rMime ) { m_aMimeType = rMime; } // XInterface - virtual Any SAL_CALL queryInterface( const Type& rType ) throw( com::sun::star::uno::RuntimeException, std::exception ) + virtual Any SAL_CALL queryInterface( const Type& rType ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return OWeakAggObject::queryInterface( rType ); } - 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 Any SAL_CALL queryAggregation( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual Any SAL_CALL queryAggregation( const Type& ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // com::sun::star::lang::XTypeProvider @@ -109,26 +109,26 @@ class PluginModel : public BroadcasterHelperHolder, } // OPropertySetHelper - virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); + virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() SAL_OVERRIDE; virtual sal_Bool SAL_CALL convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, - const Any& rValue ) throw(); + const Any& rValue ) throw() SAL_OVERRIDE; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw(::com::sun::star::uno::Exception, std::exception); - virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw(); - virtual Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(std::exception); + throw(::com::sun::star::uno::Exception, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const throw() SAL_OVERRIDE; + virtual Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(std::exception) SAL_OVERRIDE; // com::sun::star::io::XPersistObject - virtual OUString SAL_CALL getServiceName() throw(std::exception); - virtual void SAL_CALL write(const Reference< com::sun::star::io::XObjectOutputStream > & OutStream) throw(std::exception); - virtual void SAL_CALL read(const Reference< com::sun::star::io::XObjectInputStream > & InStream) throw(std::exception); + virtual OUString SAL_CALL getServiceName() throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL write(const Reference< com::sun::star::io::XObjectOutputStream > & OutStream) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL read(const Reference< com::sun::star::io::XObjectInputStream > & InStream) throw(std::exception) SAL_OVERRIDE; // com::sun::star::lang::XComponent - virtual void SAL_CALL addEventListener( const Reference< com::sun::star::lang::XEventListener > & l ) throw(std::exception); - virtual void SAL_CALL removeEventListener( const Reference< com::sun::star::lang::XEventListener > & l ) throw(std::exception); - virtual void SAL_CALL dispose() throw(std::exception); + virtual void SAL_CALL addEventListener( const Reference< com::sun::star::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const Reference< com::sun::star::lang::XEventListener > & l ) throw(std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw(std::exception) SAL_OVERRIDE; private: using cppu::OPropertySetHelper::getFastPropertyValue; }; diff --git a/extensions/source/plugin/inc/plugin/multiplx.hxx b/extensions/source/plugin/inc/plugin/multiplx.hxx index 6836ab09bb66..1f68d6508a9e 100644 --- a/extensions/source/plugin/inc/plugin/multiplx.hxx +++ b/extensions/source/plugin/inc/plugin/multiplx.hxx @@ -108,36 +108,36 @@ public: void unadvise(const Type& type, const Reference< XInterface > & listener); // ::com::sun::star::lang::XEventListener - void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(std::exception); + void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XFocusListener - void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception); - void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception); + void SAL_CALL focusGained(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL focusLost(const ::com::sun::star::awt::FocusEvent& e) throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XWindowListener - void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception); - void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception); - void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& e) throw(std::exception); - void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& e) throw(std::exception); + void SAL_CALL windowResized(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowMoved(const ::com::sun::star::awt::WindowEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowShown(const ::com::sun::star::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowHidden(const ::com::sun::star::lang::EventObject& e) throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XKeyListener - void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(std::exception); - void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(std::exception); + void SAL_CALL keyPressed( const ::com::sun::star::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL keyReleased( const ::com::sun::star::awt::KeyEvent& e ) throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XMouseListener - void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception); - void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception); - void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception); - void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception); + void SAL_CALL mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseReleased(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseEntered(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseExited(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XMouseMotionListener - void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception); - void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception); + void SAL_CALL mouseDragged(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL mouseMoved(const ::com::sun::star::awt::MouseEvent& e) throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XPaintListener - void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw(std::exception); + void SAL_CALL windowPaint(const ::com::sun::star::awt::PaintEvent& e) throw(std::exception) SAL_OVERRIDE; // ::com::sun::star::awt::XTopWindowListener - void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(std::exception); - void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(std::exception); - void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(std::exception); - void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception); - void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception); - void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception); - void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception); + void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; + void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw(std::exception) SAL_OVERRIDE; protected: /** * Remove the listener with the uik rUik from the peer rPeer. diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx index 8af8873db882..2928a11f34fa 100644 --- a/extensions/source/plugin/inc/plugin/plctrl.hxx +++ b/extensions/source/plugin/inc/plugin/plctrl.hxx @@ -74,72 +74,72 @@ class PluginControl_Impl : public ::cppu::WeakAggImplHelper4< { public: // ::com::sun::star::awt::XControl - virtual void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xContext ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) + virtual void SAL_CALL setContext( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xContext ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { _xContext = xContext; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getContext() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return _xContext; } - 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 ) = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) = 0; + 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 = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > SAL_CALL getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE = 0; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw( ::com::sun::star::uno::RuntimeException, std::exception ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XView > SAL_CALL getView() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return (::com::sun::star::awt::XView*)this; } - virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) + virtual sal_Bool SAL_CALL isTransparent() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_False; } - virtual void 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 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 { return _bInDesignMode; } - virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & xToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & Parent) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer() throw( ::com::sun::star::uno::RuntimeException, std::exception ) + virtual void SAL_CALL createPeer( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > & xToolkit, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > & Parent) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > SAL_CALL getPeer() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return _xPeer; } // ::com::sun::star::awt::XWindow - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setFocus(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - - virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - - virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setFocus(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + virtual void SAL_CALL setPosSize( sal_Int32 nX_, sal_Int32 nY_, sal_Int32 nWidth_, sal_Int32 nHeight_, sal_Int16 nFlags ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getPosSize(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + virtual void SAL_CALL addWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeWindowListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeFocusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeKeyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XKeyListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addMouseMotionListener( const Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeMouseMotionListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseMotionListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addPaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removePaintListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPaintListener > & l ) 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 & rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject & rSource ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::awt::XFocusListener - virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent & rEvt ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & l ) 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 > & l ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - 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::awt::XView - virtual sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > & /*aDevice*/ ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) + virtual sal_Bool SAL_CALL setGraphics( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > & /*aDevice*/ ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return sal_False; } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > SAL_CALL getGraphics(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > (); } - virtual ::com::sun::star::awt::Size SAL_CALL getSize(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) + virtual ::com::sun::star::awt::Size SAL_CALL getSize(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE { return ::com::sun::star::awt::Size(_nWidth, _nHeight); } - virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setZoom( float ZoomX, float ZoomY ) 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; + virtual void SAL_CALL setZoom( float ZoomX, float ZoomY ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; public: PluginControl_Impl(); diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx index 27a188dcc327..073a096b7425 100644 --- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx +++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx @@ -156,8 +156,8 @@ class MediatorListener : public osl::Thread MediatorListener( Mediator* ); ~MediatorListener(); - virtual void run(); - virtual void onTerminated(); + virtual void run() SAL_OVERRIDE; + virtual void onTerminated() SAL_OVERRIDE; }; #endif // _MEDIATOR_HXX diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx index a0528bf23f4e..1b17152d0e24 100644 --- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx +++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx @@ -160,7 +160,7 @@ public: PluginConnector( int nSocket ); virtual ~PluginConnector(); - virtual MediatorMessage* WaitForAnswer( sal_uLong nMessageID ); + virtual MediatorMessage* WaitForAnswer( sal_uLong nMessageID ) SAL_OVERRIDE; MediatorMessage* Transact( const char*, sal_uLong, ... ); MediatorMessage* Transact( sal_uInt32, ... ); void Respond( sal_uLong nID, char*, sal_uLong, ... ); diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx index 3865011cd5ed..fc9ab48a1dcd 100644 --- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx +++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx @@ -48,33 +48,33 @@ public: virtual ~UnxPluginComm(); using PluginComm::NPP_Destroy; - virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ); + virtual NPError NPP_Destroy( NPP instance, NPSavedData** save ) SAL_OVERRIDE; virtual NPError NPP_DestroyStream( NPP instance, NPStream* stream, - NPError reason ); - virtual void* NPP_GetJavaClass(); - virtual NPError NPP_Initialize(); + NPError reason ) SAL_OVERRIDE; + virtual void* NPP_GetJavaClass() SAL_OVERRIDE; + virtual NPError NPP_Initialize() SAL_OVERRIDE; virtual NPError NPP_New( NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, - char* argn[], char* argv[], NPSavedData *saved ); + char* argn[], char* argv[], NPSavedData *saved ) SAL_OVERRIDE; virtual NPError NPP_NewStream( NPP instance, NPMIMEType type, NPStream* stream, - NPBool seekable, uint16_t* stype ); - virtual void NPP_Print( NPP instance, NPPrint* platformPrint ); + NPBool seekable, uint16_t* stype ) SAL_OVERRIDE; + virtual void NPP_Print( NPP instance, NPPrint* platformPrint ) SAL_OVERRIDE; using PluginComm::NPP_SetWindow; - virtual NPError NPP_SetWindow( NPP instance, NPWindow* window ); - virtual void NPP_Shutdown(); + virtual NPError NPP_SetWindow( NPP instance, NPWindow* window ) SAL_OVERRIDE; + virtual void NPP_Shutdown() SAL_OVERRIDE; virtual void NPP_StreamAsFile( NPP instance, NPStream* stream, - const char* fname ); + const char* fname ) SAL_OVERRIDE; virtual void NPP_URLNotify( NPP instance, const char* url, NPReason reason, - void* notifyData ); + void* notifyData ) SAL_OVERRIDE; virtual int32_t NPP_Write( NPP instance, NPStream* stream, int32_t offset, - int32_t len, void* buffer ); - virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ); + int32_t len, void* buffer ) SAL_OVERRIDE; + virtual int32_t NPP_WriteReady( NPP instance, NPStream* stream ) SAL_OVERRIDE; virtual char* NPP_GetMIMEDescription(); - virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* value ); + virtual NPError NPP_GetValue( NPP instance, NPPVariable variable, void* value ) SAL_OVERRIDE; virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, - void *value); + void *value) SAL_OVERRIDE; static bool getPluginappPath(OString * path); }; diff --git a/extensions/source/resource/ResourceIndexAccess.cxx b/extensions/source/resource/ResourceIndexAccess.cxx index f1bce9a203df..4b78166abf46 100644 --- a/extensions/source/resource/ResourceIndexAccess.cxx +++ b/extensions/source/resource/ResourceIndexAccess.cxx @@ -46,10 +46,10 @@ namespace } // XIndexAccess - virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual ::sal_Int32 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_pResMgr.get() ? SAL_MAX_UINT16 : 0; }; // XElementAccess - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return static_cast<bool>(m_pResMgr.get()); }; protected: @@ -63,9 +63,9 @@ namespace ResourceStringIndexAccess( ::boost::shared_ptr<ResMgr> pResMgr) : ResourceIndexAccessBase(pResMgr) {} // XIndexAccess - 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 ::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; // XElementAccessBase - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) 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 { return ::getCppuType(static_cast< OUString*>(0)); }; }; @@ -75,9 +75,9 @@ namespace ResourceStringListIndexAccess( ::boost::shared_ptr<ResMgr> pResMgr) : ResourceIndexAccessBase(pResMgr) {} // XIndexAccess - 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 ::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; // XElementAccessBase - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) 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 { return ::getCppuType(static_cast<Sequence<PropertyValue> * >(0)); }; }; } diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx index 3428fe0646be..647d04387829 100644 --- a/extensions/source/resource/ResourceIndexAccess.hxx +++ b/extensions/source/resource/ResourceIndexAccess.hxx @@ -35,13 +35,13 @@ namespace extensions { namespace resource // The XNameAccess provides access to two named elements: // "String" returns a XIndexAccess to String resources // "StringList" returns a XIndexAccess to StringList/StringArray resources - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) 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 { return ::getCppuType(static_cast< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*>(0)); }; - virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return static_cast<bool>(m_pResMgr.get()); }; private: diff --git a/extensions/source/resource/oooresourceloader.cxx b/extensions/source/resource/oooresourceloader.cxx index 72f2ecc06cc6..11911d5ef64e 100644 --- a/extensions/source/resource/oooresourceloader.cxx +++ b/extensions/source/resource/oooresourceloader.cxx @@ -68,8 +68,8 @@ namespace extensions { namespace resource StringResourceAccess(); // IResourceType - virtual RESOURCE_TYPE getResourceType() const; - virtual Any getResource( SimpleResMgr& _resourceManager, sal_Int32 _resourceId ) const; + virtual RESOURCE_TYPE getResourceType() const SAL_OVERRIDE; + virtual Any getResource( SimpleResMgr& _resourceManager, sal_Int32 _resourceId ) const SAL_OVERRIDE; }; StringResourceAccess::StringResourceAccess() @@ -115,19 +115,19 @@ namespace extensions { namespace resource public: // XResourceBundle - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle > 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::resource::XResourceBundle >& _parent ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Any SAL_CALL getDirectElement( const OUString& key ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle > 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::resource::XResourceBundle >& _parent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Any SAL_CALL getDirectElement( const OUString& key ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameAccess (base of XResourceBundle) - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XElementAccess (base of 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; private: /** retrievs the element with the given key, without asking our parent bundle diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx index 38870d384863..cce19e4059c7 100644 --- a/extensions/source/resource/oooresourceloader.hxx +++ b/extensions/source/resource/oooresourceloader.hxx @@ -59,8 +59,8 @@ namespace extensions { namespace resource OpenOfficeResourceLoader(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const&); // XResourceBundleLoader - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle_Default( const OUString& aBaseName ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::resource::XResourceBundle> SAL_CALL loadBundle( const OUString& abaseName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::resource::MissingResourceException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: OpenOfficeResourceLoader(); // never implemented diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 33876f589a7c..c2e160979457 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -112,9 +112,9 @@ class GridWindow : public ModalDialog DECL_LINK( ClickButtonHdl, Button* ); - virtual void MouseMove( const MouseEvent& ); - virtual void MouseButtonDown( const MouseEvent& ); - virtual void MouseButtonUp( const MouseEvent& ); + virtual void MouseMove( const MouseEvent& ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& ) SAL_OVERRIDE; public: GridWindow( double* pXValues, double* pYValues, int nValues, Window* pParent, sal_Bool bCutValues = sal_True ); @@ -133,7 +133,7 @@ public: void drawLine( double x1, double y1, double x2, double y2 ); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; #endif // _EXTENSIONS_SCANNER_GRID_HXX diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx index 6b6942161245..2b93df6c875f 100644 --- a/extensions/source/scanner/sane.hxx +++ b/extensions/source/scanner/sane.hxx @@ -41,13 +41,13 @@ public: // XInterface - virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - virtual void SAL_CALL release() throw() { OWeakObject::release(); } + virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE { OWeakObject::acquire(); } + virtual void SAL_CALL release() throw() SAL_OVERRIDE { OWeakObject::release(); } - virtual css::awt::Size SAL_CALL getSize() throw(std::exception); - virtual Sequence< sal_Int8 > SAL_CALL getDIB() throw(std::exception); - virtual Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(std::exception) { return Sequence< sal_Int8 >(); } + virtual css::awt::Size SAL_CALL getSize() throw(std::exception) SAL_OVERRIDE; + virtual Sequence< sal_Int8 > SAL_CALL getDIB() throw(std::exception) SAL_OVERRIDE; + virtual Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(std::exception) SAL_OVERRIDE { return Sequence< sal_Int8 >(); } // Misc void lock() { m_aProtector.acquire(); } diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 22c1074b2ed3..f658d822766b 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -129,15 +129,15 @@ private: // helper sal_Bool SetAdjustedNumericalValue( const char* pOption, double fValue, int nElement = 0 ); - virtual void Paint( const Rectangle& ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& ) SAL_OVERRIDE; + virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; public: SaneDlg( Window*, Sane&, bool ); ~SaneDlg(); - virtual short Execute(); + virtual short Execute() SAL_OVERRIDE; bool getDoScan(); }; diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx index 278bc9115fdc..2deaf7a1f38a 100644 --- a/extensions/source/scanner/scanner.hxx +++ b/extensions/source/scanner/scanner.hxx @@ -53,22 +53,22 @@ public: virtual ~ScannerManager(); // XInterface - virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL acquire() throw() SAL_OVERRIDE; + virtual void SAL_CALL release() throw() SAL_OVERRIDE; // XScannerManager - virtual Sequence< ScannerContext > SAL_CALL getAvailableScanners() throw(std::exception); - virtual sal_Bool SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException, std::exception ); - virtual sal_Bool SAL_CALL configureScannerAndScan( ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw( ScannerException, std::exception ); - virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw( ScannerException, std::exception ); - virtual ScanError SAL_CALL getError( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ); - virtual Reference< css::awt::XBitmap > SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ); + virtual Sequence< ScannerContext > SAL_CALL getAvailableScanners() throw(std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL configureScanner( ScannerContext& scanner_context ) throw( ScannerException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL configureScannerAndScan( ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw( ScannerException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL startScan( const ScannerContext& scanner_context, const Reference< com::sun::star::lang::XEventListener >& rxListener ) throw( ScannerException, std::exception ) SAL_OVERRIDE; + virtual ScanError SAL_CALL getError( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) SAL_OVERRIDE; + virtual Reference< css::awt::XBitmap > SAL_CALL getBitmap( const ScannerContext& scanner_context ) throw( ScannerException, std::exception ) SAL_OVERRIDE; // XBitmap - virtual css::awt::Size SAL_CALL getSize() throw(std::exception); - virtual Sequence< sal_Int8 > SAL_CALL getDIB() throw(std::exception); - virtual Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(std::exception); + virtual css::awt::Size SAL_CALL getSize() throw(std::exception) SAL_OVERRIDE; + virtual Sequence< sal_Int8 > SAL_CALL getDIB() throw(std::exception) SAL_OVERRIDE; + virtual Sequence< sal_Int8 > SAL_CALL getMaskDIB() throw(std::exception) SAL_OVERRIDE; // Misc static OUString getImplementationName_Static() throw(); diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx index d7797c09949e..d8d421411bc0 100644 --- a/extensions/source/scanner/scanunx.cxx +++ b/extensions/source/scanner/scanunx.cxx @@ -150,8 +150,8 @@ class ScannerThread : public osl::Thread ScannerManager* m_pManager; // just for the disposing call public: - virtual void run(); - virtual void onTerminated() { delete this; } + virtual void run() SAL_OVERRIDE; + virtual void onTerminated() SAL_OVERRIDE { delete this; } public: ScannerThread( boost::shared_ptr<SaneHolder> pHolder, const Reference< com::sun::star::lang::XEventListener >& listener, diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 4b9038f18e73..d16e92b54ff2 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -237,15 +237,15 @@ public: UpdateCheckThread( osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext ); - virtual void SAL_CALL join(); - virtual void SAL_CALL terminate(); - virtual void cancel(); + virtual void SAL_CALL join() SAL_OVERRIDE; + virtual void SAL_CALL terminate() SAL_OVERRIDE; + virtual void cancel() SAL_OVERRIDE; protected: virtual ~UpdateCheckThread(); - virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; /* Wrapper around checkForUpdates */ bool runCheck( bool & rbExtensionsChecked ); @@ -296,7 +296,7 @@ public: ManualUpdateCheckThread( osl::Condition& rCondition, const uno::Reference<uno::XComponentContext>& xContext ) : UpdateCheckThread(rCondition, xContext) {}; - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; }; @@ -307,7 +307,7 @@ public: // XJob virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) - throw (lang::IllegalArgumentException, uno::Exception, std::exception); + throw (lang::IllegalArgumentException, uno::Exception, std::exception) SAL_OVERRIDE; private: rtl::Reference< UpdateCheck > m_aUpdateCheck; @@ -322,10 +322,10 @@ public: const rtl::Reference< DownloadInteractionHandler >& rHandler, const OUString& rURL ); - virtual void SAL_CALL run(); - virtual void cancel(); - virtual void SAL_CALL suspend(); - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void cancel() SAL_OVERRIDE; + virtual void SAL_CALL suspend() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; protected: ~DownloadThread(); @@ -343,8 +343,8 @@ class ShutdownThread : public osl::Thread public: ShutdownThread( const uno::Reference<uno::XComponentContext>& xContext ); - virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; protected: ~ShutdownThread(); diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx index 9df196065aa5..f4cd2cde36f7 100644 --- a/extensions/source/update/check/updatecheck.hxx +++ b/extensions/source/update/check/updatecheck.hxx @@ -91,13 +91,13 @@ public: bool hasOfficeUpdate() const { return (m_aUpdateInfo.BuildId.getLength() > 0); } // DownloadInteractionHandler - virtual bool downloadTargetExists(const OUString& rFileName); - virtual void downloadStalled(const OUString& rErrorMessage); - virtual void downloadProgressAt(sal_Int8 nProcent); - virtual void downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize); - virtual void downloadFinished(const OUString& rLocalFileName); + virtual bool downloadTargetExists(const OUString& rFileName) SAL_OVERRIDE; + virtual void downloadStalled(const OUString& rErrorMessage) SAL_OVERRIDE; + virtual void downloadProgressAt(sal_Int8 nProcent) SAL_OVERRIDE; + virtual void downloadStarted(const OUString& rLocalFileName, sal_Int64 nFileSize) SAL_OVERRIDE; + virtual void downloadFinished(const OUString& rLocalFileName) SAL_OVERRIDE; // checks if the download target already exists and asks user what to do next - virtual bool checkDownloadDestination( const OUString& rFile ); + virtual bool checkDownloadDestination( const OUString& rFile ) SAL_OVERRIDE; // Cancels the download action (and resumes checking if enabled) void cancelDownload(); @@ -106,20 +106,20 @@ public: SAL_DLLPUBLIC_EXPORT com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > getInteractionHandler() const; // UpdateCheckConfigListener - virtual void autoCheckStatusChanged(bool enabled); - virtual void autoCheckIntervalChanged(); + virtual void autoCheckStatusChanged(bool enabled) SAL_OVERRIDE; + virtual void autoCheckIntervalChanged() SAL_OVERRIDE; // IActionListener - void cancel(); - void download(); - void install(); - void pause(); - void resume(); - void closeAfterFailure(); + void cancel() SAL_OVERRIDE; + void download() SAL_OVERRIDE; + void install() SAL_OVERRIDE; + void pause() SAL_OVERRIDE; + void resume() SAL_OVERRIDE; + void closeAfterFailure() SAL_OVERRIDE; // rtl::IReference - virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(()); - virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()); + virtual oslInterlockedCount SAL_CALL acquire() SAL_THROW(()) SAL_OVERRIDE; + virtual oslInterlockedCount SAL_CALL release() SAL_THROW(()) SAL_OVERRIDE; private: diff --git a/extensions/source/update/check/updatecheckconfig.hxx b/extensions/source/update/check/updatecheckconfig.hxx index 842066a1f7c9..5648ee4a9f93 100644 --- a/extensions/source/update/check/updatecheckconfig.hxx +++ b/extensions/source/update/check/updatecheckconfig.hxx @@ -149,43 +149,43 @@ public: // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // 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); + ::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); + 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); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XNameReplace virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChangesBatch virtual void SAL_CALL commitChanges( ) throw (::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL hasPendingChanges( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::ElementChange > SAL_CALL getPendingChanges( ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx index 76a52cf61a44..4d785981d636 100644 --- a/extensions/source/update/check/updatecheckjob.cxx +++ b/extensions/source/update/check/updatecheckjob.cxx @@ -49,7 +49,7 @@ public: const uno::Sequence< beans::NamedValue > &xParameters, bool bShowDialog ); - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; void setTerminating(); @@ -83,25 +83,25 @@ public: // XJob virtual uno::Any SAL_CALL execute(const uno::Sequence<beans::NamedValue>&) - throw (lang::IllegalArgumentException, uno::Exception, std::exception); + throw (lang::IllegalArgumentException, uno::Exception, std::exception) SAL_OVERRIDE; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) - throw (::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTerminateListener virtual void SAL_CALL queryTermination( lang::EventObject const & evt ) - throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception ); + throw ( frame::TerminationVetoException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL notifyTermination( lang::EventObject const & evt ) - throw ( uno::RuntimeException, std::exception ); + throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: uno::Reference<uno::XComponentContext> m_xContext; diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx index 981c6478c07b..948f2b7215b7 100644 --- a/extensions/source/update/check/updatehdl.hxx +++ b/extensions/source/update/check/updatehdl.hxx @@ -186,25 +186,25 @@ public: { return const_cast< cppu::OWeakObject * > (static_cast< cppu::OWeakObject const * > (this)); }; // XActionListener - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject &rObj ) throw( com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL actionPerformed( com::sun::star::awt::ActionEvent const & rEvent) throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject &rObj ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL actionPerformed( com::sun::star::awt::ActionEvent const & rEvent) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTopWindowListener - virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowMinimized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowNormalized( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInteractionHandler virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& Request ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XTerminateListener - virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif /* INCLUDED_UPDATE_HDL_HXX */ diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 317437aaf6a8..fe41615e53a7 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -123,9 +123,9 @@ public: ActiveDataSink() {}; virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() - throw (uno::RuntimeException, std::exception) { return m_xStream; }; + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_xStream; }; virtual void SAL_CALL setInputStream( uno::Reference< io::XInputStream > const & rStream ) - throw (uno::RuntimeException, std::exception) { m_xStream = rStream; }; + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { m_xStream = rStream; }; }; @@ -150,40 +150,40 @@ public: getUpdateInformation( uno::Sequence< OUString > const & repositories, OUString const & extensionId - ) throw (uno::Exception, uno::RuntimeException, std::exception); + ) throw (uno::Exception, uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL cancel() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setInteractionHandler( uno::Reference< task::XInteractionHandler > const & handler ) - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Reference< container::XEnumeration > SAL_CALL getUpdateInformationEnumeration( uno::Sequence< OUString > const & repositories, OUString const & extensionId - ) throw (uno::Exception, uno::RuntimeException, std::exception); + ) throw (uno::Exception, uno::RuntimeException, std::exception) SAL_OVERRIDE; // XCommandEnvironment virtual uno::Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw ( uno::RuntimeException, std::exception ); + throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual uno::Reference< ucb::XProgressHandler > SAL_CALL getProgressHandler() - throw ( uno::RuntimeException, std::exception ) { return uno::Reference< ucb::XProgressHandler >(); }; + throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE { return uno::Reference< ucb::XProgressHandler >(); }; // XWebDAVCommandEnvironment virtual uno::Sequence< beans::StringPair > SAL_CALL getUserRequestHeaders( const OUString&, ucb::WebDAVHTTPMethod ) - throw ( uno::RuntimeException, std::exception ) { return m_aRequestHeaderList; }; + throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE { return m_aRequestHeaderList; }; // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: @@ -236,8 +236,8 @@ public: virtual ~UpdateInformationEnumeration() {}; // XEnumeration - sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) { return m_nCount < m_nNodes; }; - uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_nCount < m_nNodes; }; + uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { OSL_ASSERT( m_xNodeList.is() ); OSL_ASSERT( m_xUpdateInformationProvider.is() ); @@ -296,8 +296,8 @@ public: virtual ~SingleUpdateInformationEnumeration() {}; // XEnumeration - sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) { return 0 == m_nCount; }; - uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) + sal_Bool SAL_CALL hasMoreElements() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return 0 == m_nCount; }; + uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) SAL_OVERRIDE { if( m_nCount > 0 ) throw container::NoSuchElementException(OUString::number(m_nCount), *this); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index ce302c9d58fe..e4d13a7ad805 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -107,9 +107,9 @@ public: const OUString& rText, const Image& rImage ); ~BubbleWindow(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - void Resize(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + void Resize() SAL_OVERRIDE; void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = SHOW_NOACTIVATE ); void SetTipPosPixel( const Point& rTipPos ) { maTipPos = rTipPos; } void SetTitleAndText( const OUString& rTitle, const OUString& rText, @@ -161,38 +161,38 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & serviceName) - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL notifyEvent(const document::EventObject& Event) - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing(const lang::EventObject& Event) - throw (uno::RuntimeException, std::exception); + throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; //XPropertySet virtual uno::Reference< beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(void) - throw ( uno::RuntimeException, std::exception ); + throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ); + lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual uno::Any SAL_CALL getPropertyValue(const OUString& PropertyName) - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ); + throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const uno::Reference< beans::XPropertyChangeListener > & aListener) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ); + throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const uno::Reference< beans::XPropertyChangeListener > & aListener) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ); + throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener > & aListener) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ); + throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const uno::Reference< beans::XVetoableChangeListener > & aListener) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ); + throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; |