diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-27 18:12:18 +0100 |
| commit | 567ef6d5782cdb729b49005caf6005610ce03e22 (patch) | |
| tree | 7e3be1da41382e555d9091914ef7e064852a4fd4 /sfx2 | |
| parent | c36daa01f444ebad799c1cc7a106f1b4bb3c3d12 (diff) | |
Second batch of adding SAL_OVERRIDE to overriding function declarations
...mostly done with a rewriting Clang plugin, with just some manual tweaking
necessary to fix poor macro usage.
Change-Id: Ie656f9d653fc716f72ac175925272696d509038f
Diffstat (limited to 'sfx2')
103 files changed, 740 insertions, 740 deletions
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 1038c6854345..9b6b7cca9eeb 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -53,8 +53,8 @@ public: SfxURLToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); virtual ~SfxURLToolBoxControl_Impl(); - virtual Window* CreateItemWindow( Window* pParent ); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; }; #endif diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index a0ac9a8e17bf..494f4e6529c5 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -34,10 +34,10 @@ public: SfxScriptOrganizerItem( const SfxScriptOrganizerItem& ); virtual ~SfxScriptOrganizerItem(); - virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual bool operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const SAL_OVERRIDE; + virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; OUString getLanguage() { return aLanguage; }; }; diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index a1bff758f80c..940e8f9e39d5 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -73,9 +73,9 @@ public: void SetFocusOnEdit(); - virtual bool Close(); - virtual void Move(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual bool Close() SAL_OVERRIDE; + virtual void Move() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; }; diff --git a/sfx2/qa/cppunit/test_metadatable.cxx b/sfx2/qa/cppunit/test_metadatable.cxx index 20ab115bab86..ad2c437ad303 100644 --- a/sfx2/qa/cppunit/test_metadatable.cxx +++ b/sfx2/qa/cppunit/test_metadatable.cxx @@ -44,8 +44,8 @@ class MetadatableTest : public ::CppUnit::TestFixture { public: - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() SAL_OVERRIDE; + virtual void tearDown() SAL_OVERRIDE; void test(); @@ -79,12 +79,12 @@ public: bool m_bInClipboard; bool m_bInUndo; bool m_bInContent; - virtual bool IsInClipboard() const { return m_bInClipboard; } - virtual bool IsInUndo() const { return m_bInUndo; } - virtual bool IsInContent() const { return m_bInContent; } - virtual ::sfx2::IXmlIdRegistry& GetRegistry() { return m_rRegistry; } + virtual bool IsInClipboard() const SAL_OVERRIDE { return m_bInClipboard; } + virtual bool IsInUndo() const SAL_OVERRIDE { return m_bInUndo; } + virtual bool IsInContent() const SAL_OVERRIDE { return m_bInContent; } + virtual ::sfx2::IXmlIdRegistry& GetRegistry() SAL_OVERRIDE { return m_rRegistry; } virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() { return 0; } + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE { return 0; } }; static bool operator==(beans::StringPair p1, beans::StringPair p2) diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index ced0510a84f4..7081848e706c 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -87,7 +87,7 @@ class SfxEventAsyncer_Impl : public SfxListener public: - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; SfxEventAsyncer_Impl( const SfxEventHint& rHint ); ~SfxEventAsyncer_Impl(); DECL_LINK( TimerHdl, Timer*); diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index e2627c3474aa..21ed0693202f 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -63,7 +63,7 @@ public: virtual ~SfxBasicManagerCreationListener(); - virtual void onBasicManagerCreated( const Reference< XModel >& _rxForDocument, BasicManager& _rBasicManager ); + virtual void onBasicManagerCreated( const Reference< XModel >& _rxForDocument, BasicManager& _rBasicManager ) SAL_OVERRIDE; }; SfxBasicManagerCreationListener::~SfxBasicManagerCreationListener() diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 6bcc99fa6edb..65080b598a1d 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -204,7 +204,7 @@ public: : DdeTopic( "TRIGGER" ) {} - virtual bool Execute( const OUString* ); + virtual bool Execute( const OUString* ) SAL_OVERRIDE; }; class SfxDdeDocTopic_Impl : public DdeTopic @@ -218,11 +218,11 @@ public: : DdeTopic( pShell->GetTitle(SFX_TITLE_FULLNAME) ), pSh( pShell ) {} - virtual DdeData* Get( sal_uIntPtr ); - virtual bool Put( const DdeData* ); - virtual bool Execute( const OUString* ); - virtual bool StartAdviseLoop(); - virtual bool MakeItem( const OUString& rItem ); + virtual DdeData* Get( sal_uIntPtr ) SAL_OVERRIDE; + virtual bool Put( const DdeData* ) SAL_OVERRIDE; + virtual bool Execute( const OUString* ) SAL_OVERRIDE; + virtual bool StartAdviseLoop() SAL_OVERRIDE; + virtual bool MakeItem( const OUString& rItem ) SAL_OVERRIDE; }; diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx index 8fe8bf8371a4..f7b6f16beea5 100644 --- a/sfx2/source/appl/appdispatchprovider.cxx +++ b/sfx2/source/appl/appdispatchprovider.cxx @@ -69,31 +69,31 @@ public: virtual void SAL_CALL initialize( css::uno::Sequence<css::uno::Any> const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception); + throw (css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName, FrameSearchFlags eSearchFlags ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedCommandGroups() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; void SfxAppDispatchProvider::initialize( diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 171e3bebc407..7e026060cbf1 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -77,14 +77,14 @@ class SfxTerminateListener_Impl : public ::cppu::WeakImplHelper2< XTerminateList public: // XTerminateListener - virtual void SAL_CALL queryTermination( const EventObject& aEvent ) throw( TerminationVetoException, RuntimeException, std::exception ); - virtual void SAL_CALL notifyTermination( const EventObject& aEvent ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const EventObject& Source ) throw( RuntimeException, std::exception ); + virtual void SAL_CALL queryTermination( const EventObject& aEvent ) throw( TerminationVetoException, RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL notifyTermination( const EventObject& aEvent ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& Source ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) throw (RuntimeException, std::exception); - virtual ::com::sun::star::uno::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& sServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (RuntimeException, std::exception) SAL_OVERRIDE; }; void SAL_CALL SfxTerminateListener_Impl::disposing( const EventObject& ) throw( RuntimeException, std::exception ) diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 2e73c243794d..d399d7f733d4 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -120,8 +120,8 @@ class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultLis public: sal_Bool bFinished; sal_Bool bSuccess; - virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& Event ) throw(RuntimeException, std::exception); - virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception); + virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& Event ) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception) SAL_OVERRIDE; SfxOpenDocStatusListener_Impl() : bFinished( sal_False ) , bSuccess( sal_False ) @@ -157,9 +157,9 @@ public: mxStorage( rxStorage ) {} virtual ::comphelper::DocPasswordVerifierResult - verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ); + verifyPassword( const OUString& rPassword, uno::Sequence< beans::NamedValue >& o_rEncryptionData ) SAL_OVERRIDE; virtual ::comphelper::DocPasswordVerifierResult - verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ); + verifyEncryptionData( const uno::Sequence< beans::NamedValue >& rEncryptionData ) SAL_OVERRIDE; private: diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 22f3624aa68d..9d8d21046bc0 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -1722,9 +1722,9 @@ class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< task::XInt public: RequestPackageReparation_Impl( const OUString& aName ); sal_Bool isApproved(); - virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ); + virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( uno::RuntimeException, std::exception ); + throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; RequestPackageReparation_Impl::RequestPackageReparation_Impl( const OUString& aName ) @@ -1790,9 +1790,9 @@ class NotifyBrokenPackage_Impl : public ::cppu::WeakImplHelper1< task::XInteract public: NotifyBrokenPackage_Impl( const OUString& aName ); - virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ); + virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( uno::RuntimeException, std::exception ); + throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; NotifyBrokenPackage_Impl::NotifyBrokenPackage_Impl( const OUString& aName ) diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index f9f7c1197b1b..88907de58580 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -67,7 +67,7 @@ class DisposeListener : public ::cppu::WeakImplHelper1< ::com::sun::star::lang:: , m_pData ( pData ) {} - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aSource ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xSelfHold( this ); diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index fc7b9dbefb89..6a1608041cc9 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -66,14 +66,14 @@ public: virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, const OUString & rMimeType, - bool bSynchron = false ); + bool bSynchron = false ) SAL_OVERRIDE; - virtual bool Connect( sfx2::SvBaseLink* ); - virtual void Edit( Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl ); + virtual bool Connect( sfx2::SvBaseLink* ) SAL_OVERRIDE; + virtual void Edit( Window *, sfx2::SvBaseLink *, const Link& rEndEditHdl ) SAL_OVERRIDE; // Ask whether you can access data directly or whether it has to be triggered - virtual bool IsPending() const; - virtual bool IsDataComplete() const; + virtual bool IsPending() const SAL_OVERRIDE; + virtual bool IsDataComplete() const SAL_OVERRIDE; void CancelTransfers(); }; diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx index 40904593853b..81a3915cddc6 100644 --- a/sfx2/source/appl/helpdispatch.hxx +++ b/sfx2/source/appl/helpdispatch.hxx @@ -37,9 +37,9 @@ public: ~HelpDispatch_Impl(); // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& 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); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif // #ifndef SFX_HELPDISPATCHER_HXX diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 7cdefe3d146e..e8cde3a363e0 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -86,26 +86,26 @@ public: // 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); + 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); + 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 >& xNewSlave ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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 >& xNewSlave ) 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); - virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMaster ) throw(::com::sun::star::uno::RuntimeException, std::exception); + 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 >& xNewMaster ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInterceptorInfo virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL - getInterceptedURLs( ) throw(::com::sun::star::uno::RuntimeException, std::exception); + getInterceptedURLs( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatch - virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& 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); + virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xControl, const ::com::sun::star::util::URL& aURL ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // extras void InitWaiter( SfxHelpWindow_Impl* pWindow ) @@ -126,9 +126,9 @@ public: HelpListener_Impl( HelpInterceptor_Impl* pInter ); 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; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void SetChangeHdl( const Link& rLink ) { aChangeLink = rLink; } OUString GetFactory() const { return aFactory; } @@ -149,9 +149,9 @@ public: ~HelpStatusListener_Impl(); 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; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& obj ) - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; const ::com::sun::star::frame::FeatureStateEvent& GetStateEvent() const {return aStateEvent;} }; diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index d940fedc9659..e3e60fe88161 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -59,7 +59,7 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star } virtual void SAL_CALL propertyChange(const com::sun::star::beans::PropertyChangeEvent &rEvent ) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); @@ -70,7 +70,7 @@ class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star // lang.XEventListener virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(), com::sun::star::uno::UNO_QUERY); diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx index acc03718ff51..7d7428f4cbe2 100644 --- a/sfx2/source/appl/imestatuswindow.hxx +++ b/sfx2/source/appl/imestatuswindow.hxx @@ -95,11 +95,11 @@ private: virtual void SAL_CALL disposing(com::sun::star::lang::EventObject const & rSource) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL propertyChange(com::sun::star::beans::PropertyChangeEvent const & rEvent) - throw (com::sun::star::uno::RuntimeException, std::exception); + throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > getConfig(); diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index 7e0f35b57c82..354ac9588ce2 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -56,13 +56,13 @@ public: virtual bool GetData( ::com::sun::star::uno::Any & rData /*out param*/, const OUString & aMimeType, - bool bSynchron = false ); + bool bSynchron = false ) SAL_OVERRIDE; - virtual bool Connect( SvBaseLink * ); - virtual void Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ); + virtual bool Connect( SvBaseLink * ) SAL_OVERRIDE; + virtual void Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link& rEndEditHdl ) SAL_OVERRIDE; - virtual bool IsPending() const; - virtual bool IsDataComplete() const; + virtual bool IsPending() const SAL_OVERRIDE; + virtual bool IsDataComplete() const SAL_OVERRIDE; }; } diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index 47a13febaf07..d61c2f169868 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -60,7 +60,7 @@ class SvxInternalLink : public sfx2::SvLinkSource public: SvxInternalLink() {} - virtual bool Connect( sfx2::SvBaseLink* ); + virtual bool Connect( sfx2::SvBaseLink* ) SAL_OVERRIDE; }; diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index 9817b18ac6db..3271237283f2 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -38,7 +38,7 @@ TYPEINIT0( SvLinkSource ) class SvLinkSourceTimer : public Timer { SvLinkSource * pOwner; - virtual void Timeout(); + virtual void Timeout() SAL_OVERRIDE; public: SvLinkSourceTimer( SvLinkSource * pOwn ); }; diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 7d9fee3eee80..75a8c3e83d5d 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -108,9 +108,9 @@ public: {} virtual ~ImplDdeItem(); - virtual DdeData* Get( sal_uIntPtr ); - virtual bool Put( const DdeData* ); - virtual void AdviseLoop( bool ); + virtual DdeData* Get( sal_uIntPtr ) SAL_OVERRIDE; + virtual bool Put( const DdeData* ) SAL_OVERRIDE; + virtual void AdviseLoop( bool ) SAL_OVERRIDE; void Notify() { diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index a8ef107401b5..d4ec1161f308 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -61,8 +61,8 @@ public: ~ContentListBox_Impl(); - virtual void RequestingChildren( SvTreeListEntry* pParent ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void RequestingChildren( SvTreeListEntry* pParent ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; inline void SetOpenHdl( const Link& rLink ) { SetDoubleClickHdl( rLink ); } OUString GetSelectEntry() const; @@ -94,8 +94,8 @@ private: public: ContentTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin); - virtual void ActivatePage(); - virtual Control* GetLastFocusControl(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual Control* GetLastFocusControl() SAL_OVERRIDE; void SetOpenHdl( const Link& rLink ) { m_pContentBox->SetOpenHdl( rLink ); } OUString GetSelectEntry() const { return m_pContentBox->GetSelectEntry(); } @@ -109,8 +109,8 @@ class IndexBox_Impl : public ComboBox public: IndexBox_Impl(Window* pParent, WinBits nStyle); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void SelectExecutableEntry(); }; @@ -140,8 +140,8 @@ public: IndexTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); ~IndexTabPage_Impl(); - virtual void ActivatePage(); - virtual Control* GetLastFocusControl(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual Control* GetLastFocusControl() SAL_OVERRIDE; void SetDoubleClickHdl( const Link& rLink ); void SetFactory( const OUString& rFactory ); @@ -173,8 +173,8 @@ public: SetDropDownLineCount(5); } - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void Select(); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Select() SAL_OVERRIDE; inline void SetSearchLink( const Link& rLink ) { aSearchLink = rLink; } }; @@ -187,7 +187,7 @@ public: { } - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; class SearchTabPage_Impl : public HelpTabPage_Impl @@ -216,8 +216,8 @@ public: SearchTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); ~SearchTabPage_Impl(); - virtual void ActivatePage(); - virtual Control* GetLastFocusControl(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual Control* GetLastFocusControl() SAL_OVERRIDE; void SetDoubleClickHdl( const Link& rLink ); inline void SetFactory( const OUString& rFactory ) { aFactory = rFactory; } @@ -241,7 +241,7 @@ public: BookmarksBox_Impl(Window* pParent, WinBits nStyle); ~BookmarksBox_Impl(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; class BookmarksTabPage_Impl : public HelpTabPage_Impl @@ -255,8 +255,8 @@ private: public: BookmarksTabPage_Impl( Window* pParent, SfxHelpIndexWindow_Impl* _pIdxWin ); - virtual void ActivatePage(); - virtual Control* GetLastFocusControl(); + virtual void ActivatePage() SAL_OVERRIDE; + virtual Control* GetLastFocusControl() SAL_OVERRIDE; void SetDoubleClickHdl( const Link& rLink ); OUString GetSelectEntry() const; @@ -312,9 +312,9 @@ public: SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent ); ~SfxHelpIndexWindow_Impl(); - virtual void Resize(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetDoubleClickHdl( const Link& rLink ); inline void SetSelectFactoryHdl( const Link& rLink ) { aSelectFactoryLink = rLink; } @@ -392,7 +392,7 @@ public: TextWin_Impl( Window* pParent ); virtual ~TextWin_Impl(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; // class SfxHelpTextWindow_Impl ------------------------------------------ @@ -450,10 +450,10 @@ public: SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ); ~SfxHelpTextWindow_Impl(); - virtual void Resize(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual void GetFocus(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; inline ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame2 > getFrame() const { return xFrame; } @@ -499,9 +499,9 @@ friend class SfxHelpIndexWindow_Impl; OUString sTitle; OUString sKeyword; - virtual void Resize(); - virtual void Split(); - virtual void GetFocus(); + virtual void Resize() SAL_OVERRIDE; + virtual void Split() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; void MakeLayout(); void InitSizes(); @@ -519,7 +519,7 @@ public: Window* pParent, WinBits nBits ); ~SfxHelpWindow_Impl(); - virtual bool PreNotify( NotifyEvent& rNEvt ); + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; void setContainerWindow( ::com::sun::star::uno::Reference < ::com::sun::star::awt::XWindow > xWin ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index ff10f76ea3be..b5f131d2cd4d 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -81,7 +81,7 @@ class NoHelpErrorBox : public ErrorBox public: NoHelpErrorBox( Window* _pParent ); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; }; NoHelpErrorBox::NoHelpErrorBox( Window* _pParent ) : diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 3752887eaac3..20c8dd9f2ae6 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -70,7 +70,7 @@ class StringLength : public ::cppu::WeakImplHelper1< XStringWidth > // XStringWidth sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) - throw (::com::sun::star::uno::RuntimeException, std::exception) + throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return aString.getLength(); } diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 51ab5d12feab..cb49f397c12d 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -87,8 +87,8 @@ extern "C" { static void SAL_CALL thisModule() {} } class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener > { public: - virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& aEvent ) throw( RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception ); + virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& aEvent ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) SAL_OVERRIDE; }; void SAL_CALL SfxNotificationListener_Impl::dispatchFinished( const DispatchResultEvent& ) throw( RuntimeException, std::exception ) @@ -219,7 +219,7 @@ public: *pModule = NULL; Start(); } - virtual void Timeout() + virtual void Timeout() SAL_OVERRIDE { delete m_pModule; delete this; @@ -235,7 +235,7 @@ public: m_xDesktop = xDesktop; Start(); } - virtual void Timeout() + virtual void Timeout() SAL_OVERRIDE { m_xDesktop->terminate(); delete this; diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index ed0bef28411c..d91ded524964 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -92,13 +92,13 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase virtual ~ShutdownIcon(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static ShutdownIcon* getInstance(); static ShutdownIcon* createInstance(); @@ -130,21 +130,21 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase static bool IsQuickstarterInstalled(); // Component Helper - force override - virtual void SAL_CALL disposing(); + virtual void SAL_CALL disposing() SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XTerminateListener virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent ) - throw(::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException, std::exception); + 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& aEvent ) - throw(::com::sun::star::uno::RuntimeException, std::exception); + throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw( ::com::sun::star::uno::Exception, std::exception ); + throw( ::com::sun::star::uno::Exception, std::exception ) SAL_OVERRIDE; // XFastPropertySet virtual void SAL_CALL setFastPropertyValue( ::sal_Int32 nHandle, @@ -153,11 +153,11 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( ::sal_Int32 nHandle ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, - ::com::sun::star::uno::RuntimeException, std::exception); + ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDesktop2 > m_xDesktop; diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index 7cd316dded9c..e22cf44e6942 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -45,12 +45,12 @@ public: OPackageStructureCreator() {} // XPackageStructureCreator - virtual void SAL_CALL convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) throw (io::IOException, uno::RuntimeException, std::exception); + virtual void SAL_CALL convertToPackage( const OUString& aFolderUrl, const uno::Reference< io::XOutputStream >& xTargetStream ) throw (io::IOException, uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; }; diff --git a/sfx2/source/bastyp/fltlst.cxx b/sfx2/source/bastyp/fltlst.cxx index 9afef3b390fd..6225afccfae4 100644 --- a/sfx2/source/bastyp/fltlst.cxx +++ b/sfx2/source/bastyp/fltlst.cxx @@ -54,14 +54,14 @@ class SfxRefreshListener : public ::cppu::WeakImplHelper1<com::sun::star::util:: // util.XRefreshListener virtual void SAL_CALL refreshed( const ::com::sun::star::lang::EventObject& rEvent ) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_pOwner->refreshed(rEvent); } // lang.XEventListener virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent) - throw(com::sun::star::uno::RuntimeException, std::exception) + throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { m_pOwner->disposing(rEvent); } diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index cc53a29610bc..21a6c4401584 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -53,10 +53,10 @@ class SfxQueryStatus_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusL SfxItemState QueryState( SfxPoolItem*& pPoolItem ); // XEventListener - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStatusListener - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: SfxQueryStatus_Impl( const SfxQueryStatus& ); diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index dfa357307301..2222856b8145 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -89,7 +89,7 @@ struct SfxRequest_Impl: public SfxListener void SetPool( SfxItemPool *pNewPool ); - virtual void Notify( SfxBroadcaster &rBC, const SfxHint &rHint ); + virtual void Notify( SfxBroadcaster &rBC, const SfxHint &rHint ) SAL_OVERRIDE; void Record( const uno::Sequence < beans::PropertyValue >& rArgs ); }; diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index 3034889cac45..a84621170e2d 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -77,55 +77,55 @@ public: void LoseFocus (void); // XComponent - virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL dispose()throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::dispose(); } - virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::addEventListener(xListener); } - virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener)throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { WeakComponentImplHelperBase::removeEventListener(xListener); } // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearAccessibleSelection( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL selectAllAccessibleChildren( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: ::std::vector< ::com::sun::star::uno::Reference< @@ -140,7 +140,7 @@ private: /** Tell all listeners that the object is dying. This callback is usually called from the WeakComponentImplHelper class. */ - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; /** Return the number of items. This takes the None-Item into account. */ @@ -200,38 +200,38 @@ public: public: // XAccessible - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeAccessibleEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleDescription( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getAccessibleName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL grabFocus( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Any SAL_CALL getAccessibleKeyBinding( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif // INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 2ed6c5d6b045..6cd44e22ef7b 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -57,8 +57,8 @@ class ResizableMultiLineEdit : public VclMultiLineEdit void SetInGrabFocus(bool bInGrabFocus) { mbIsInGrabFocus = bInGrabFocus; } - virtual bool PreNotify(NotifyEvent& rNEvt); - virtual void Modify(); + virtual bool PreNotify(NotifyEvent& rNEvt) SAL_OVERRIDE; + virtual void Modify() SAL_OVERRIDE; }; ResizableMultiLineEdit::ResizableMultiLineEdit (Window* pParent, ThumbnailViewItem* pItem) : diff --git a/sfx2/source/dialog/backingcomp.cxx b/sfx2/source/dialog/backingcomp.cxx index 4a97a13c847b..cd90996c2147 100644 --- a/sfx2/source/dialog/backingcomp.cxx +++ b/sfx2/source/dialog/backingcomp.cxx @@ -101,51 +101,51 @@ public: virtual ~BackingComp( ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL acquire ( ) throw( ); - virtual void SAL_CALL release ( ) throw( ); + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL acquire ( ) throw( ) SAL_OVERRIDE; + virtual void SAL_CALL release ( ) throw( ) SAL_OVERRIDE; // XTypeProvide - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception); + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName ( ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName ( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArgs ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArgs ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XController - virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw(css::uno::RuntimeException, std::exception); - virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getViewData() throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL restoreViewData( const css::uno::Any& aData ) throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw(css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL attachFrame( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL attachModel( const css::uno::Reference< css::frame::XModel >& xModel ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getViewData() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL restoreViewData( const css::uno::Any& aData ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XModel > SAL_CALL getModel() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::frame::XFrame > SAL_CALL getFrame() throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XKeyListener - virtual void SAL_CALL keyPressed ( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL keyPressed ( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XComponent - virtual void SAL_CALL dispose ( ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose ( ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addEventListener ( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XDispatchProvider - virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ); - virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException, std::exception ); + virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName , sal_Int32 nSearchFlags ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptions ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDispatch - virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ); + virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener, const css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; BackingComp::BackingComp( const css::uno::Reference< css::uno::XComponentContext >& xContext ) diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 90f4ff0baad0..7909f2bdf4a0 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -104,13 +104,13 @@ public: BackingWindow( Window* pParent ); ~BackingWindow(); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void GetFocus(); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; - virtual Size GetOptimalSize() const; + virtual Size GetOptimalSize() const SAL_OVERRIDE; void setOwningFrame( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& xFrame ); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 2e6cd64b5262..15cde96e43c9 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -51,7 +51,7 @@ public: OString aWinState; SfxChildWindow* pMgr; sal_Bool bConstructed; - void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; Timer aMoveTimer; }; @@ -77,7 +77,7 @@ public: sal_Bool bConstructed; Timer aMoveTimer; - void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; }; void SfxFloatingWindow_Impl::Notify( SfxBroadcaster&, const SfxHint& rHint ) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 2c9783826fbc..0ebf3197bf83 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -78,11 +78,11 @@ public: Window* GetWrappedWindow() const { return m_pWrappedWindow; } void SetWrappedWindow(Window* const pWindow); - virtual void StateChanged( StateChangedType nType ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual void Resize(); - virtual void Resizing( Size& rSize ); - virtual bool Close(); + virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void Resizing( Size& rSize ) SAL_OVERRIDE; + virtual bool Close() SAL_OVERRIDE; }; namespace diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 79df9c844e9a..1a9c8f5b4321 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1137,7 +1137,7 @@ class PickerThread_Impl : public ::osl::Thread { uno::Reference < XFilePicker > mxPicker; ::osl::Mutex maMutex; - virtual void SAL_CALL run(); + virtual void SAL_CALL run() SAL_OVERRIDE; sal_Int16 mnRet; public: PickerThread_Impl( const uno::Reference < XFilePicker >& rPicker ) diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index ba2741eac67a..c59cf8ca914e 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -155,17 +155,17 @@ namespace sfx2 public: // XFilePickerListener methods - virtual void SAL_CALL fileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL directoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - virtual void SAL_CALL dialogSizeChanged() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL fileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL directoryChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual OUString SAL_CALL helpRequested( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL controlStateChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL dialogSizeChanged() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XDialogClosedListener methods - virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL dialogClosed( const ::com::sun::star::ui::dialogs::DialogClosedEvent& _rEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener methods - 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; // handle XFilePickerListener events void handleFileSelectionChanged( const ::com::sun::star::ui::dialogs::FilePickerEvent& aEvent ); diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx index 9dd631f99034..f8d019d5fca5 100644 --- a/sfx2/source/dialog/infobar.cxx +++ b/sfx2/source/dialog/infobar.cxx @@ -34,7 +34,7 @@ namespace ~SfxCloseButton( ) { } - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; void SfxCloseButton::Paint( const Rectangle& ) diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index bdc1f7d68956..8c0a3b72b3db 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -96,11 +96,11 @@ public: // css.frame.XStatusListener virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; bool IsSet() const {return m_bState;} }; diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 7f975fe3436e..5bd7e950936a 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -140,9 +140,9 @@ friend class SfxSplitWindow; aTimer.Stop(); } - virtual void MouseMove( const MouseEvent& ); - virtual void AutoHide(); - virtual void FadeIn(); + virtual void MouseMove( const MouseEvent& ) SAL_OVERRIDE; + virtual void AutoHide() SAL_OVERRIDE; + virtual void FadeIn() SAL_OVERRIDE; void Actualize(); }; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index a87ac228be4b..d698048664e7 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -122,7 +122,7 @@ public: ~SfxTabDialogController(); - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; }; SfxTabDialogController::~SfxTabDialogController() diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index e86f06e52345..55bd0661c234 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -299,16 +299,16 @@ namespace sfx2 public: CustomToolPanel( const ::utl::OConfigurationNode& i_rPanelWindowState, const Reference< XFrame >& i_rFrame ); - virtual OUString GetDisplayName() const; - virtual Image GetImage() const; - virtual OString GetHelpID() const; - virtual void Activate( Window& i_rParentWindow ); - virtual void Deactivate(); - virtual void SetSizePixel( const Size& i_rPanelWindowSize ); - virtual void GrabFocus(); - virtual void Dispose(); + virtual OUString GetDisplayName() const SAL_OVERRIDE; + virtual Image GetImage() const SAL_OVERRIDE; + virtual OString GetHelpID() const SAL_OVERRIDE; + virtual void Activate( Window& i_rParentWindow ) SAL_OVERRIDE; + virtual void Deactivate() SAL_OVERRIDE; + virtual void SetSizePixel( const Size& i_rPanelWindowSize ) SAL_OVERRIDE; + virtual void GrabFocus() SAL_OVERRIDE; + virtual void Dispose() SAL_OVERRIDE; virtual Reference< XAccessible > - CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ); + CreatePanelAccessible( const Reference< XAccessible >& i_rParentAccessible ) SAL_OVERRIDE; const OUString& GetResourceURL() const { return m_sResourceURL; } @@ -859,11 +859,11 @@ namespace sfx2 protected: // IToolPanelDeckListener overridables - virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ); - virtual void PanelRemoved( const size_t i_nPosition ); - virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ); - virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ); - virtual void Dying(); + virtual void PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) SAL_OVERRIDE; + virtual void PanelRemoved( const size_t i_nPosition ) SAL_OVERRIDE; + virtual void ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) SAL_OVERRIDE; + virtual void LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) SAL_OVERRIDE; + virtual void Dying() SAL_OVERRIDE; private: DECL_LINK( OnToolboxClicked, ToolBox* ); diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx index f2ae8f4d2088..02da41c81f4d 100644 --- a/sfx2/source/doc/Metadatable.cxx +++ b/sfx2/source/doc/Metadatable.cxx @@ -220,14 +220,14 @@ public: virtual ~XmlIdRegistryDocument(); - virtual void RegisterMetadatableAndCreateID(Metadatable& i_xObject); + virtual void RegisterMetadatableAndCreateID(Metadatable& i_xObject) SAL_OVERRIDE; virtual bool TryRegisterMetadatable(Metadatable& i_xObject, - OUString const& i_rStreamName, OUString const& i_rIdref); + OUString const& i_rStreamName, OUString const& i_rIdref) SAL_OVERRIDE; - virtual void UnregisterMetadatable(Metadatable const&); + virtual void UnregisterMetadatable(Metadatable const&) SAL_OVERRIDE; - virtual void RemoveXmlIdForElement(Metadatable const&); + virtual void RemoveXmlIdForElement(Metadatable const&) SAL_OVERRIDE; /** register i_rCopy as a copy of i_rSource, with precedence iff i_bCopyPrecedesSource is true */ @@ -243,12 +243,12 @@ public: // unfortunately public, Metadatable::RegisterAsCopyOf needs this virtual bool LookupXmlId(const Metadatable& i_xObject, - OUString & o_rStream, OUString & o_rIdref) const; + OUString & o_rStream, OUString & o_rIdref) const SAL_OVERRIDE; private: virtual Metadatable* LookupElement(const OUString & i_rStreamName, - const OUString & i_rIdref) const; + const OUString & i_rIdref) const SAL_OVERRIDE; struct XmlIdRegistry_Impl; ::std::auto_ptr<XmlIdRegistry_Impl> m_pImpl; @@ -264,18 +264,18 @@ class MetadatableUndo : public Metadatable public: MetadatableUndo(const bool i_isInContent) : m_isInContent(i_isInContent) { } - virtual ::sfx2::XmlIdRegistry& GetRegistry() + virtual ::sfx2::XmlIdRegistry& GetRegistry() SAL_OVERRIDE { // N.B. for Undo, m_pReg is initialized by registering this as copy in // CreateUndo; it is never cleared OSL_ENSURE(m_pReg, "no m_pReg in MetadatableUndo ?"); return *m_pReg; } - virtual bool IsInClipboard() const { return false; } - virtual bool IsInUndo() const { return true; } - virtual bool IsInContent() const { return m_isInContent; } + virtual bool IsInClipboard() const SAL_OVERRIDE { return false; } + virtual bool IsInUndo() const SAL_OVERRIDE { return true; } + virtual bool IsInContent() const SAL_OVERRIDE { return m_isInContent; } virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE { OSL_FAIL("MetadatableUndo::MakeUnoObject"); throw; } }; @@ -289,18 +289,18 @@ class MetadatableClipboard : public Metadatable public: MetadatableClipboard(const bool i_isInContent) : m_isInContent(i_isInContent) { } - virtual ::sfx2::XmlIdRegistry& GetRegistry() + virtual ::sfx2::XmlIdRegistry& GetRegistry() SAL_OVERRIDE { // N.B. for Clipboard, m_pReg is initialized by registering this as copy in // RegisterAsCopyOf; it is only cleared by OriginNoLongerInBusinessAnymore OSL_ENSURE(m_pReg, "no m_pReg in MetadatableClipboard ?"); return *m_pReg; } - virtual bool IsInClipboard() const { return true; } - virtual bool IsInUndo() const { return false; } - virtual bool IsInContent() const { return m_isInContent; } + virtual bool IsInClipboard() const SAL_OVERRIDE { return true; } + virtual bool IsInUndo() const SAL_OVERRIDE { return false; } + virtual bool IsInContent() const SAL_OVERRIDE { return m_isInContent; } virtual ::com::sun::star::uno::Reference< - ::com::sun::star::rdf::XMetadatable > MakeUnoObject() + ::com::sun::star::rdf::XMetadatable > MakeUnoObject() SAL_OVERRIDE { OSL_FAIL("MetadatableClipboard::MakeUnoObject"); throw; } void OriginNoLongerInBusinessAnymore() { m_pReg = 0; } }; @@ -314,14 +314,14 @@ public: XmlIdRegistryClipboard(); virtual ~XmlIdRegistryClipboard(); - virtual void RegisterMetadatableAndCreateID(Metadatable& i_xObject); + virtual void RegisterMetadatableAndCreateID(Metadatable& i_xObject) SAL_OVERRIDE; virtual bool TryRegisterMetadatable(Metadatable& i_xObject, - OUString const& i_rStreamName, OUString const& i_rIdref); + OUString const& i_rStreamName, OUString const& i_rIdref) SAL_OVERRIDE; - virtual void UnregisterMetadatable(Metadatable const&); + virtual void UnregisterMetadatable(Metadatable const&) SAL_OVERRIDE; - virtual void RemoveXmlIdForElement(Metadatable const&); + virtual void RemoveXmlIdForElement(Metadatable const&) SAL_OVERRIDE; /** register i_rCopy as a copy of i_rSource */ MetadatableClipboard & RegisterCopyClipboard(Metadatable & i_rCopy, @@ -333,10 +333,10 @@ public: private: virtual bool LookupXmlId(const Metadatable& i_xObject, - OUString & o_rStream, OUString & o_rIdref) const; + OUString & o_rStream, OUString & o_rIdref) const SAL_OVERRIDE; virtual Metadatable* LookupElement(const OUString & i_rStreamName, - const OUString & i_rIdref) const; + const OUString & i_rIdref) const SAL_OVERRIDE; /** create a Clipboard Metadatable for i_rObject. */ ::boost::shared_ptr<MetadatableClipboard> CreateClipboard( diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 9e4d4dadfd58..3696aa6be32d 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -134,156 +134,156 @@ public: // ::com::sun::star::lang::XServiceInfo: virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Bool SAL_CALL supportsService( - const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception); + const OUString & ServiceName) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception); + getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XComponent: - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::document::XDocumentProperties: virtual OUString SAL_CALL getAuthor() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAuthor(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getGenerator() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setGenerator(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::DateTime SAL_CALL getCreationDate() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setCreationDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTitle() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTitle(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getSubject() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setSubject(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getDescription() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDescription(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< OUString > SAL_CALL getKeywords() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setKeywords( const css::uno::Sequence< OUString > & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::lang::Locale SAL_CALL getLanguage() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setLanguage(const css::lang::Locale & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getModifiedBy() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setModifiedBy(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::DateTime SAL_CALL getModificationDate() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setModificationDate( const css::util::DateTime & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getPrintedBy() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPrintedBy(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::DateTime SAL_CALL getPrintDate() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPrintDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTemplateName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTemplateName(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getTemplateURL() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTemplateURL(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::util::DateTime SAL_CALL getTemplateDate() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setTemplateDate(const css::util::DateTime & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getAutoloadURL() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAutoloadURL(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getAutoloadSecs() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setAutoloadSecs(::sal_Int32 the_value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getDefaultTarget() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDefaultTarget(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL - getDocumentStatistics() throw (css::uno::RuntimeException, std::exception); + getDocumentStatistics() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setDocumentStatistics( const css::uno::Sequence< css::beans::NamedValue > & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::sal_Int16 SAL_CALL getEditingCycles() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setEditingCycles(::sal_Int16 the_value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual ::sal_Int32 SAL_CALL getEditingDuration() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setEditingDuration(::sal_Int32 the_value) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception); + throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL resetUserData(const OUString & the_value) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Reference< css::beans::XPropertyContainer > SAL_CALL - getUserDefinedProperties() throw (css::uno::RuntimeException, std::exception); + getUserDefinedProperties() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage > & Storage, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, css::io::WrongFormatException, - css::lang::WrappedTargetException, css::io::IOException, std::exception); + css::lang::WrappedTargetException, css::io::IOException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL loadFromMedium(const OUString & URL, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, css::io::WrongFormatException, - css::lang::WrappedTargetException, css::io::IOException, std::exception); + css::lang::WrappedTargetException, css::io::IOException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage > & Storage, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::io::IOException, std::exception); + css::lang::WrappedTargetException, css::io::IOException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL storeToMedium(const OUString & URL, const css::uno::Sequence< css::beans::PropertyValue > & Medium) throw (css::uno::RuntimeException, - css::lang::WrappedTargetException, css::io::IOException, std::exception); + css::lang::WrappedTargetException, css::io::IOException, std::exception) SAL_OVERRIDE; // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any > & aArguments) - throw (css::uno::RuntimeException, css::uno::Exception, std::exception); + throw (css::uno::RuntimeException, css::uno::Exception, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XCloneable: virtual css::uno::Reference<css::util::XCloneable> SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XModifiable: virtual ::sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setModified( ::sal_Bool bModified ) - throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception); + throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::util::XModifyBroadcaster: virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ::com::sun::star::xml::sax::XSAXSerializable virtual void SAL_CALL serialize( const css::uno::Reference<css::xml::sax::XDocumentHandler>& i_xHandler, const css::uno::Sequence< css::beans::StringPair >& i_rNamespaces) - throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception); + throw (css::uno::RuntimeException, css::xml::sax::SAXException, std::exception) SAL_OVERRIDE; protected: SfxDocumentMetaData(SfxDocumentMetaData &); // not defined @@ -363,29 +363,29 @@ class CompatWriterDocPropsImpl : public CompatWriterDocPropsImpl_BASE OUString msCategory; OUString msCompany; protected: - virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) { return new CompatWriterDocPropsImpl( context ); }; + virtual SfxDocumentMetaData* createMe( css::uno::Reference< css::uno::XComponentContext > const & context ) SAL_OVERRIDE { return new CompatWriterDocPropsImpl( context ); }; public: CompatWriterDocPropsImpl( css::uno::Reference< css::uno::XComponentContext > const & context) : CompatWriterDocPropsImpl_BASE( context ) {} // XCompatWriterDocPropsImpl - virtual OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException, std::exception) { return msManager; } - virtual void SAL_CALL setManager( const OUString& _manager ) throw (::com::sun::star::uno::RuntimeException, std::exception) { msManager = _manager; } - virtual OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException, std::exception){ return msCategory; } - virtual void SAL_CALL setCategory( const OUString& _category ) throw (::com::sun::star::uno::RuntimeException, std::exception){ msCategory = _category; } - virtual OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException, std::exception){ return msCompany; } - virtual void SAL_CALL setCompany( const OUString& _company ) throw (::com::sun::star::uno::RuntimeException, std::exception){ msCompany = _company; } + virtual OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return msManager; } + virtual void SAL_CALL setManager( const OUString& _manager ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { msManager = _manager; } + virtual OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return msCategory; } + virtual void SAL_CALL setCategory( const OUString& _category ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { msCategory = _category; } + virtual OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return msCompany; } + virtual void SAL_CALL setCompany( const OUString& _company ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { msCompany = _company; } // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("CompatWriterDocPropsImpl"); } - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE { css::uno::Sequence< OUString > aServiceNames(1); aServiceNames[ 0 ] = "com.sun.star.writer.DocumentProperties"; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index fc4e07ebb8a1..844f78278bf5 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -174,7 +174,7 @@ class SfxMediumHandler_Impl : public ::cppu::WeakImplHelper1< com::sun::star::ta public: virtual void SAL_CALL handle( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionRequest >& xRequest ) - throw( com::sun::star::uno::RuntimeException, std::exception ); + throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; SfxMediumHandler_Impl( com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteraction ) : m_xInter( xInteraction ) diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 3c500c129e33..015ea7162fb6 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -140,7 +140,7 @@ class WaitWindow_Impl : public WorkWindow public: WaitWindow_Impl(); ~WaitWindow_Impl(); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; }; #define X_OFFSET 15 @@ -172,10 +172,10 @@ public: : m_xInteractionHandler( rxInteractionHandler ) {} - virtual uno::Reference<task::XInteractionHandler> SAL_CALL getInteractionHandler() throw (uno::RuntimeException, std::exception) + virtual uno::Reference<task::XInteractionHandler> SAL_CALL getInteractionHandler() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_xInteractionHandler; } - virtual uno::Reference<ucb::XProgressHandler> SAL_CALL getProgressHandler() throw (uno::RuntimeException, std::exception) + virtual uno::Reference<ucb::XProgressHandler> SAL_CALL getProgressHandler() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE { return m_xProgressHandler; } }; @@ -325,8 +325,8 @@ public: Updater_Impl( SfxDocTplService_Impl* pTemplates ); ~Updater_Impl(); - virtual void SAL_CALL run(); - virtual void SAL_CALL onTerminated(); + virtual void SAL_CALL run() SAL_OVERRIDE; + virtual void SAL_CALL onTerminated() SAL_OVERRIDE; }; @@ -2224,19 +2224,19 @@ public: ~SfxDocTplService(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.comp.sfx2.DocumentTemplates"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.DocumentTemplates"); @@ -2245,27 +2245,27 @@ public: // --- XLocalizable --- - void SAL_CALL setLocale( const css::lang::Locale & eLocale ) throw( css::uno::RuntimeException, std::exception ); - css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException, std::exception ); + void SAL_CALL setLocale( const css::lang::Locale & eLocale ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + css::lang::Locale SAL_CALL getLocale() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // --- XDocumentTemplates --- - css::uno::Reference< css::ucb::XContent > SAL_CALL getContent() throw( css::uno::RuntimeException, std::exception ); + css::uno::Reference< css::ucb::XContent > SAL_CALL getContent() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL storeTemplate( const OUString& GroupName, const OUString& TemplateName, - const css::uno::Reference< css::frame::XStorable >& Storable ) throw( css::uno::RuntimeException, std::exception ); + const css::uno::Reference< css::frame::XStorable >& Storable ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL addTemplate( const OUString& GroupName, const OUString& TemplateName, - const OUString& SourceURL ) throw( css::uno::RuntimeException, std::exception ); + const OUString& SourceURL ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL removeTemplate( const OUString& GroupName, - const OUString& TemplateName ) throw( css::uno::RuntimeException, std::exception ); + const OUString& TemplateName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL renameTemplate( const OUString& GroupName, const OUString& OldTemplateName, - const OUString& NewTemplateName ) throw( css::uno::RuntimeException, std::exception ); - sal_Bool SAL_CALL addGroup( const OUString& GroupName ) throw( css::uno::RuntimeException, std::exception ); - sal_Bool SAL_CALL removeGroup( const OUString& GroupName ) throw( css::uno::RuntimeException, std::exception ); + const OUString& NewTemplateName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + sal_Bool SAL_CALL addGroup( const OUString& GroupName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + sal_Bool SAL_CALL removeGroup( const OUString& GroupName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; sal_Bool SAL_CALL renameGroup( const OUString& OldGroupName, - const OUString& NewGroupName ) throw( css::uno::RuntimeException, std::exception ); - void SAL_CALL update() throw( css::uno::RuntimeException, std::exception ); + const OUString& NewGroupName ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + void SAL_CALL update() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index 5508477b35bf..1ec23641d7c0 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -64,14 +64,14 @@ public: throw( ::com::sun::star::uno::Exception ); // XDocumentHandler - virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index a915d11aedc1..1ff0e915cc81 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -97,8 +97,8 @@ namespace sfx2 SfxObjectShell* getObjectShell() { return rAntiImpl.getBaseModel().GetObjectShell(); } // IUndoManagerImplementation - virtual ::svl::IUndoManager& getImplUndoManager(); - virtual Reference< XUndoManager > getThis(); + virtual ::svl::IUndoManager& getImplUndoManager() SAL_OVERRIDE; + virtual Reference< XUndoManager > getThis() SAL_OVERRIDE; void disposing() { @@ -174,12 +174,12 @@ namespace sfx2 virtual ~SolarMutexFacade() {} - virtual void acquire() + virtual void acquire() SAL_OVERRIDE { Application::GetSolarMutex().acquire(); } - virtual void release() + virtual void release() SAL_OVERRIDE { Application::GetSolarMutex().release(); } @@ -202,12 +202,12 @@ namespace sfx2 { } - virtual void clear() + virtual void clear() SAL_OVERRIDE { m_guard.clear(); } - virtual ::framework::IMutex& getGuardedMutex() + virtual ::framework::IMutex& getGuardedMutex() SAL_OVERRIDE { // note that this means that we *know* that SfxModelGuard also locks the SolarMutex (nothing more, nothing less). // If this ever changes, we need to adjust this code here, too. diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 03941276ba14..ff7890bdab22 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -68,19 +68,19 @@ public: ~IFrameObject(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.comp.sfx2.IFrameObject"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.SpecialEmbeddedObject"); @@ -88,21 +88,21 @@ public: } virtual sal_Bool SAL_CALL load( const css::uno::Sequence < css::beans::PropertyValue >& lDescriptor, - const css::uno::Reference < css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) ; - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception); - virtual ::sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception); - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + const css::uno::Reference < css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class IFrameWindow_Impl : public Window diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index ac2457315db4..c33915591764 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -148,9 +148,9 @@ public: xIter( pSh->GetMedium()->GetHeaderAttributes_Impl() ), bAlert( false ) {} - virtual bool GetFirst( SvKeyValue& rKV ) { return xIter->GetFirst( rKV ); } - virtual bool GetNext( SvKeyValue& rKV ) { return xIter->GetNext( rKV ); } - virtual void Append( const SvKeyValue& rKV ); + virtual bool GetFirst( SvKeyValue& rKV ) SAL_OVERRIDE { return xIter->GetFirst( rKV ); } + virtual bool GetNext( SvKeyValue& rKV ) SAL_OVERRIDE { return xIter->GetNext( rKV ); } + virtual void Append( const SvKeyValue& rKV ) SAL_OVERRIDE; void ClearForSourceView() { xIter = new SvKeyValueIterator; bAlert = false; } void SetAttributes(); diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 6b5544cf06aa..085b69746ab7 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -155,11 +155,11 @@ public: void SetPreventClose( sal_Bool bPrevent ) { m_bPreventClose = bPrevent; } virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw ( uno::RuntimeException, util::CloseVetoException, std::exception ); + throw ( uno::RuntimeException, util::CloseVetoException, std::exception ) SAL_OVERRIDE; - virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE ; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException, std::exception ) ; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE ; } ; diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 84b16e49f7be..ebeeb6a8c6c7 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -157,9 +157,9 @@ class SfxModelListener_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star:: public: SfxModelListener_Impl( SfxObjectShell* pDoc ) : mpDoc(pDoc) {}; 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) ; - virtual void SAL_CALL notifyClosing( 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 ) ; + 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 ) SAL_OVERRIDE ; + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE ; }; diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx index 2f90e0da95a1..459b48495838 100644 --- a/sfx2/source/doc/oleprops.cxx +++ b/sfx2/source/doc/oleprops.cxx @@ -78,8 +78,8 @@ public: inline void SetValue( sal_Int32 nValue ) { mnValue = nValue; } private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; private: sal_Int32 mnValue; @@ -97,8 +97,8 @@ public: inline void SetValue( double fValue ) { mfValue = fValue; } private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; private: double mfValue; @@ -116,8 +116,8 @@ public: inline void SetValue( bool bValue ) { mbValue = bValue; } private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; private: bool mbValue; @@ -159,8 +159,8 @@ public: const OUString& rValue ); private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; }; @@ -172,8 +172,8 @@ public: explicit SfxOleString16Property( sal_Int32 nPropId ); private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; }; @@ -192,8 +192,8 @@ public: inline void SetValue( const util::DateTime& rDateTime ) { maDateTime = rDateTime; } private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; private: util::DateTime maDateTime; @@ -211,8 +211,8 @@ public: inline void SetValue( const util::Date& rDate ) { maDate = rDate; } private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; private: util::Date maDate; @@ -233,8 +233,8 @@ public: inline bool IsValid() const { return mData.getLength() > 0; } private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; private: uno::Sequence<sal_uInt8> mData; @@ -255,8 +255,8 @@ public: inline bool IsValid() const { return mData.getLength() > 0; } private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; private: uno::Sequence<sal_uInt8> mData; diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx index de15a66c079a..b93361075a59 100644 --- a/sfx2/source/doc/oleprops.hxx +++ b/sfx2/source/doc/oleprops.hxx @@ -237,8 +237,8 @@ public: explicit SfxOleCodePageProperty(); private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; }; @@ -260,8 +260,8 @@ public: void SetPropertyName( sal_Int32 nPropId, const OUString& rPropName ); private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; private: typedef ::std::map< sal_Int32, OUString > SfxOlePropNameMap; @@ -339,8 +339,8 @@ public: sal_Int32 GetFreePropertyId() const; private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; bool SeekToPropertyPos( SvStream& rStrm, sal_uInt32 nPropPos ) const; void LoadProperty( SvStream& rStrm, sal_Int32 nPropId ); @@ -390,8 +390,8 @@ public: SfxOleSection& AddSection( const SvGlobalName& rSectionGuid ); private: - virtual void ImplLoad( SvStream& rStrm ); - virtual void ImplSave( SvStream& rStrm ); + virtual void ImplLoad( SvStream& rStrm ) SAL_OVERRIDE; + virtual void ImplSave( SvStream& rStrm ) SAL_OVERRIDE; /** Returns the GUID for the specified section. */ static const SvGlobalName& GetSectionGuid( SfxOleSectionType eSection ); diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 4516624e2c65..1b92f71caa64 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -47,13 +47,13 @@ public: virtual ~OwnSubFilterService(); // XFilter - virtual ::sal_Bool SAL_CALL filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw (uno::RuntimeException, std::exception); - virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL filter( const uno::Sequence< beans::PropertyValue >& aDescriptor ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getImplementationName( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) SAL_OVERRIDE; }; OwnSubFilterService::OwnSubFilterService(const css::uno::Sequence< css::uno::Any >& aArguments) diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx index 9775dca4adef..5475d7923bdd 100644 --- a/sfx2/source/doc/plugin.cxx +++ b/sfx2/source/doc/plugin.cxx @@ -53,7 +53,7 @@ public: : Window( pParent, WB_CLIPCHILDREN ) {} - virtual void Resize(); + virtual void Resize() SAL_OVERRIDE; }; void PluginWindow_Impl::Resize() @@ -98,34 +98,34 @@ public: ~PluginObject(); virtual sal_Bool SAL_CALL load( const css::uno::Sequence < css::beans::PropertyValue >& lDescriptor, - const css::uno::Reference < css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) ; - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception); + const css::uno::Reference < css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( css::util::CloseVetoException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeCloseListener( const css::uno::Reference < css::util::XCloseListener >& xListener ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE ; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addPropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removePropertyChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL addVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL removeVetoableChangeListener(const OUString& aPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener > & aListener) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.comp.sfx2.PluginObject"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.SpecialEmbeddedObject"); diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 2b1c529862d2..1ab89faf9191 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -75,7 +75,7 @@ struct IMPL_PrintListener_DataContainer : public SfxListener void Notify( SfxBroadcaster& aBC , - const SfxHint& aHint ) ; + const SfxHint& aHint ) SAL_OVERRIDE ; }; awt::Size impl_Size_Object2Struct( const Size& aSize ) @@ -103,10 +103,10 @@ class SfxPrintJob_Impl : public cppu::WeakImplHelper1 public: SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData ); - virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrintOptions( ) throw (RuntimeException, std::exception); - virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (RuntimeException, std::exception); - virtual Reference< ::com::sun::star::view::XPrintable > SAL_CALL getPrintable( ) throw (RuntimeException, std::exception); - virtual void SAL_CALL cancelJob() throw (RuntimeException, std::exception); + virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrintOptions( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< ::com::sun::star::view::XPrintable > SAL_CALL getPrintable( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL cancelJob() throw (RuntimeException, std::exception) SAL_OVERRIDE; }; SfxPrintJob_Impl::SfxPrintJob_Impl( IMPL_PrintListener_DataContainer* pData ) @@ -492,7 +492,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread Note: Starting of the job is done outside this thread! But we have to free some of the given resources on heap! */ - void SAL_CALL run() + void SAL_CALL run() SAL_OVERRIDE { /* SAFE { */ { @@ -513,7 +513,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread /* nobody wait for this thread. We must kill ourself ... */ - void SAL_CALL onTerminated() + void SAL_CALL onTerminated() SAL_OVERRIDE { delete this; } diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx index 47529163502e..fdabc092a375 100644 --- a/sfx2/source/doc/printhelper.hxx +++ b/sfx2/source/doc/printhelper.hxx @@ -47,14 +47,14 @@ public: SfxPrintHelper() ; virtual ~SfxPrintHelper() ; - 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 addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException, std::exception); + 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; + virtual void SAL_CALL addPrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removePrintJobListener( const ::com::sun::star::uno::Reference< ::com::sun::star::view::XPrintJobListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getPrinter() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setPrinter( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& seqPrinter ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL print( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& seqOptions ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 829ae99795be..ee58298bfe31 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -154,9 +154,9 @@ public: ~SfxDocInfoListener_Impl(); virtual void SAL_CALL disposing( const lang::EventObject& ) - throw ( RuntimeException, std::exception ); + throw ( RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL modified( const lang::EventObject& ) - throw ( RuntimeException, std::exception ); + throw ( RuntimeException, std::exception ) SAL_OVERRIDE; }; SfxDocInfoListener_Impl::~SfxDocInfoListener_Impl() { @@ -246,7 +246,7 @@ struct IMPL_SfxBaseModel_DataContainer : public ::sfx2::IModifiableDocument } // ::sfx2::IModifiableDocument - virtual void storageIsModified() + virtual void storageIsModified() SAL_OVERRIDE { if ( m_pObjectShell.Is() && !m_pObjectShell->IsModified() ) m_pObjectShell->SetModified( true ); @@ -322,8 +322,8 @@ public: : m_pData( pData ) {} - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( RuntimeException, std::exception ) ; - virtual void SAL_CALL printJobEvent( const view::PrintJobEvent& rEvent ) throw ( RuntimeException, std::exception); + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw ( RuntimeException, std::exception ) SAL_OVERRIDE ; + virtual void SAL_CALL printJobEvent( const view::PrintJobEvent& rEvent ) throw ( RuntimeException, std::exception) SAL_OVERRIDE; }; void SAL_CALL SfxPrintHelperListener_Impl::disposing( const lang::EventObject& ) throw ( RuntimeException, std::exception ) @@ -1145,9 +1145,9 @@ namespace } // XUndoAction - virtual OUString SAL_CALL getTitle() throw (RuntimeException, std::exception); - virtual void SAL_CALL undo( ) throw (UndoFailedException, RuntimeException, std::exception); - virtual void SAL_CALL redo( ) throw (UndoFailedException, RuntimeException, std::exception); + virtual OUString SAL_CALL getTitle() throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL undo( ) throw (UndoFailedException, RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL redo( ) throw (UndoFailedException, RuntimeException, std::exception) SAL_OVERRIDE; private: const Reference< XModel > m_xModel; diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index e62283fafb4c..d890309ad8c2 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -76,13 +76,13 @@ namespace sfx2 ); // XSingleServiceFactory - virtual Reference< XInterface > SAL_CALL createInstance( ) throw (Exception, RuntimeException, std::exception); - virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception); + virtual Reference< XInterface > SAL_CALL createInstance( ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; + virtual Reference< XInterface > SAL_CALL createInstanceWithArguments( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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& ServiceName ) throw (RuntimeException, std::exception) SAL_OVERRIDE; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) SAL_OVERRIDE; protected: virtual ~SfxModelFactory(); diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index 47f72cecf26a..585e97dcdc7e 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -33,8 +33,8 @@ public: SfxDocumentFontsPage( Window* parent, const SfxItemSet& set ); static SfxTabPage* Create( Window* parent, const SfxItemSet& set ); protected: - virtual bool FillItemSet( SfxItemSet& set ); - virtual void Reset( const SfxItemSet& set ); + virtual bool FillItemSet( SfxItemSet& set ) SAL_OVERRIDE; + virtual void Reset( const SfxItemSet& set ) SAL_OVERRIDE; private: CheckBox* embedFontsCheckbox; }; diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index bc73fe7fdb47..5f81011f8df6 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -51,7 +51,7 @@ namespace sfx2 virtual ~DocumentUndoManager(); // SfxModelSubComponent overridables - virtual void disposing(); + virtual void disposing() SAL_OVERRIDE; // non-UNO API for our owner /** determines whether we have an open Undo context. No mutex locking within this method, no disposal check - this @@ -60,36 +60,36 @@ namespace sfx2 bool isInContext() const; // XInterface - virtual void SAL_CALL acquire( ) throw (); - virtual void SAL_CALL release( ) throw (); + virtual void SAL_CALL acquire( ) throw () SAL_OVERRIDE; + virtual void SAL_CALL release( ) throw () SAL_OVERRIDE; // XUndoManager - virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL undo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeUndoManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManagerListener >& i_listener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XLockable, base of XUndoManager - virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL lock( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL unlock( ) throw (::com::sun::star::util::NotLockedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::sal_Bool SAL_CALL isLocked( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XChild, base of XUndoManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: ::boost::scoped_ptr< DocumentUndoManager_Impl > m_pImpl; diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 45306be926c3..9962c1dcca51 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -67,26 +67,26 @@ public: // --- XNameReplace --- virtual void SAL_CALL replaceByName( const OUString & aName, const css::uno::Any & aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ); + css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // --- XNameAccess ( parent of XNameReplace ) --- virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ); - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw ( css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // --- XElementAccess ( parent of XNameAccess ) --- - virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException, std::exception ); - virtual sal_Bool SAL_CALL hasElements() throw ( css::uno::RuntimeException, std::exception ); + virtual css::uno::Type SAL_CALL getElementType() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL hasElements() throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // --- ::document::XEventListener --- virtual void SAL_CALL notifyEvent( const css::document::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // --- ::lang::XEventListener --- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; static SvxMacro* ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bNormalizeMacro ); static void NormalizeMacro( const css::uno::Any& rIn, css::uno::Any& rOut, SfxObjectShell* pDoc ); diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx index cb5740f455aa..248d0534b2ea 100644 --- a/sfx2/source/inc/fltoptint.hxx +++ b/sfx2/source/inc/fltoptint.hxx @@ -31,8 +31,8 @@ class FilterOptionsContinuation : public comphelper::OInteraction< ::com::sun::s ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties; public: - virtual void SAL_CALL setFilterOptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProp ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getFilterOptions( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFilterOptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rProp ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getFilterOptions( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; class RequestFilterOptions : public ::cppu::WeakImplHelper1< ::com::sun::star::task::XInteractionRequest > @@ -59,12 +59,12 @@ public: } virtual ::com::sun::star::uno::Any SAL_CALL getRequest() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations() - throw( ::com::sun::star::uno::RuntimeException, std::exception ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; #endif diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx index d5e1c8d845a9..92f8af2b2d63 100644 --- a/sfx2/source/inc/macroloader.hxx +++ b/sfx2/source/inc/macroloader.hxx @@ -54,39 +54,39 @@ public: throw (css::uno::Exception, css::uno::RuntimeException); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; static ErrCode loadMacro( const OUString& aURL, css::uno::Any& rRetval, SfxObjectShell* pDoc=NULL ) throw( css::uno::RuntimeException ); virtual css::uno::Reference < css::frame::XDispatch > SAL_CALL queryDispatch( const css::util::URL& aURL, const OUString& sTargetFrameName, FrameSearchFlags eSearchFlags ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual css::uno::Sequence< css::uno::Reference < css::frame::XDispatch > > SAL_CALL queryDispatches( const css::uno::Sequence < css::frame::DispatchDescriptor >& seqDescriptor ) - throw( css::uno::RuntimeException, std::exception ); + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL dispatchWithNotification( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs, const css::uno::Reference< css::frame::XDispatchResultListener >& Listener ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL dispatch( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL dispatchWithReturnValue( const css::util::URL& aURL, const css::uno::Sequence< css::beans::PropertyValue >& lArgs ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl, const css::util::URL& aURL ) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; #endif diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 22f9de356d77..da44481c9c31 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -144,16 +144,16 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess virtual ~SfxObjectShell_Impl(); // IMacroDocumentAccess overridables - virtual sal_Int16 getCurrentMacroExecMode() const; - virtual bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ); - virtual OUString getDocumentLocation() const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign(); - virtual bool documentStorageHasMacros() const; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const; - virtual sal_Int16 getScriptingSignatureState(); - - virtual bool hasTrustedScriptingSignature( bool bAllowUIToAddAuthor ); - virtual void showBrokenSignatureWarning( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction ) const; + virtual sal_Int16 getCurrentMacroExecMode() const SAL_OVERRIDE; + virtual bool setCurrentMacroExecMode( sal_uInt16 nMacroMode ) SAL_OVERRIDE; + virtual OUString getDocumentLocation() const SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign() SAL_OVERRIDE; + virtual bool documentStorageHasMacros() const SAL_OVERRIDE; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const SAL_OVERRIDE; + virtual sal_Int16 getScriptingSignatureState() SAL_OVERRIDE; + + virtual bool hasTrustedScriptingSignature( bool bAllowUIToAddAuthor ) SAL_OVERRIDE; + virtual void showBrokenSignatureWarning( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxInteraction ) const SAL_OVERRIDE; }; #endif diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index 0686b2115bba..794c45f44699 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -52,7 +52,7 @@ public: SFX_DECL_CHILDWINDOW(SfxPartChildWnd_Impl); ~SfxPartChildWnd_Impl(); - virtual bool QueryClose(); + virtual bool QueryClose() SAL_OVERRIDE; }; // class SfxExplorerDockWnd_Impl ----------------------------------------- @@ -60,8 +60,8 @@ public: class SfxPartDockWnd_Impl : public SfxDockingWindow { protected: - virtual void Resize(); - virtual bool Notify( NotifyEvent& rNEvt ); + virtual void Resize() SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: SfxPartDockWnd_Impl( SfxBindings* pBindings, @@ -71,7 +71,7 @@ public: ~SfxPartDockWnd_Impl(); sal_Bool QueryClose(); - virtual void FillInfo(SfxChildWinInfo&) const; + virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > ForgetFrame(); }; diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index 725ee3a59042..adc5de27dcc3 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -33,14 +33,14 @@ protected: public: SfxPreviewBase_Impl(Window* pParent, WinBits nStyle); void SetObjectShell( SfxObjectShell* pObj ); - virtual void Resize(); - virtual Size GetOptimalSize() const; + virtual void Resize() SAL_OVERRIDE; + virtual Size GetOptimalSize() const SAL_OVERRIDE; }; class SfxPreviewWin_Impl: public SfxPreviewBase_Impl { protected: - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; public: SfxPreviewWin_Impl(Window* pParent, WinBits nStyle) : SfxPreviewBase_Impl(pParent, nStyle) diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx index 88a481187856..f2f865a63f91 100644 --- a/sfx2/source/inc/recfloat.hxx +++ b/sfx2/source/inc/recfloat.hxx @@ -34,7 +34,7 @@ public: ~SfxRecordingFloatWrapper_Impl(); SFX_DECL_CHILDWINDOW(SfxRecordingFloatWrapper_Impl); - virtual bool QueryClose(); + virtual bool QueryClose() SAL_OVERRIDE; }; class SfxRecordingFloat_Impl : public SfxFloatingWindow @@ -46,9 +46,9 @@ public: SfxChildWindow* pChildWin , Window* pParent ); virtual ~SfxRecordingFloat_Impl(); - virtual bool Close(); - virtual void FillInfo( SfxChildWinInfo& rInfo ) const; - virtual void StateChanged( StateChangedType nStateChange ); + virtual bool Close() SAL_OVERRIDE; + virtual void FillInfo( SfxChildWinInfo& rInfo ) const SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; DECL_LINK( Select, ToolBox * ); }; diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx index b9a220113edb..77747e21375e 100644 --- a/sfx2/source/inc/sfxpicklist.hxx +++ b/sfx2/source/inc/sfxpicklist.hxx @@ -70,7 +70,7 @@ class SfxPickList : public SfxListener void ExecuteMenuEntry( sal_uInt16 nId ); void ExecuteEntry( sal_uInt32 nIndex ); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; }; #endif // INCLUDED_SFX2_SOURCE_INC_SFXPICKLIST_HXX diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index 6adb73def98e..40ed3dee6027 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -56,11 +56,11 @@ private: protected: - virtual void StartSplit(); - virtual void SplitResize(); - virtual void Split(); - virtual void Command ( const CommandEvent& rCEvt ); - virtual void MouseButtonDown ( const MouseEvent& ); + virtual void StartSplit() SAL_OVERRIDE; + virtual void SplitResize() SAL_OVERRIDE; + virtual void Split() SAL_OVERRIDE; + virtual void Command ( const CommandEvent& rCEvt ) SAL_OVERRIDE; + virtual void MouseButtonDown ( const MouseEvent& ) SAL_OVERRIDE; public: SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, @@ -109,9 +109,9 @@ public: sal_Bool IsAutoHide( sal_Bool bSelf = sal_False ) const; SplitWindow* GetSplitWindow(); - virtual void AutoHide(); - virtual void FadeOut(); - virtual void FadeIn(); + virtual void AutoHide() SAL_OVERRIDE; + virtual void FadeOut() SAL_OVERRIDE; + virtual void FadeIn() SAL_OVERRIDE; void Show_Impl(); void Pin_Impl( sal_Bool bPinned ); sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True ); diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 42a53a07de65..e472c404aaec 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -51,8 +51,8 @@ public: const ::com::sun::star::util::URL& rURL, SfxStateCache* pStateCache, const SfxSlot* pSlot ); - virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) 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 ); + virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; void Release(); const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const; diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx index f8c6e98501df..94a9977053ac 100644 --- a/sfx2/source/inc/templatesearchview.hxx +++ b/sfx2/source/inc/templatesearchview.hxx @@ -27,7 +27,7 @@ public: const OUString &rPath, const BitmapEx &rImage ); protected: - virtual void OnItemDblClicked(ThumbnailViewItem *pItem); + virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE; protected: Link maOpenTemplateHdl; diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index fc263f586df8..f2142e8e8def 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -71,14 +71,14 @@ public: , pDialog(pD) , nModifier(0) {} - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; using SvTreeListBox::ExecuteDrop; - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; sal_uInt16 GetModifier() const { return nModifier; } - virtual bool Notify( NotifyEvent& rNEvt ); + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; }; typedef std::vector<OUString> ExpandedEntries_t; @@ -98,15 +98,15 @@ private: OUString aStyle; protected: - virtual void Command( const CommandEvent& rMEvt ); - virtual bool Notify( NotifyEvent& rNEvt ); - virtual bool DoubleClickHdl(); - virtual bool ExpandingHdl(); - virtual void ExpandedHdl(); + virtual void Command( const CommandEvent& rMEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool DoubleClickHdl() SAL_OVERRIDE; + virtual bool ExpandingHdl() SAL_OVERRIDE; + virtual void ExpandedHdl() SAL_OVERRIDE; virtual sal_Bool NotifyMoving(SvTreeListEntry* pTarget, SvTreeListEntry* pEntry, SvTreeListEntry*& rpNewParent, - sal_uIntPtr& rNewChildPos); + sal_uIntPtr& rNewChildPos) SAL_OVERRIDE; public: StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle = 0); @@ -117,7 +117,7 @@ public: const OUString& GetStyle() const { return aStyle; } void MakeExpanded_Impl(ExpandedEntries_t& rEntries) const; - virtual PopupMenu* CreateContextMenu( void ); + virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; }; // class SfxActionListBox ------------------------------------------------ @@ -128,7 +128,7 @@ protected: public: SfxActionListBox( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinBits ); - virtual PopupMenu* CreateContextMenu( void ); + virtual PopupMenu* CreateContextMenu( void ) SAL_OVERRIDE; }; // class SfxCommonTemplateDialog_Impl ------------------------------------ @@ -146,8 +146,8 @@ private: public: ISfxTemplateCommon_Impl( SfxCommonTemplateDialog_Impl* pDialogP ) : pDialog( pDialogP ) {} virtual ~ISfxTemplateCommon_Impl() {} - virtual SfxStyleFamily GetActualFamily() const { return pDialog->GetActualFamily(); } - virtual OUString GetSelectedEntry() const { return pDialog->GetSelectedEntry(); } + virtual SfxStyleFamily GetActualFamily() const SAL_OVERRIDE { return pDialog->GetActualFamily(); } + virtual OUString GetSelectedEntry() const SAL_OVERRIDE { return pDialog->GetSelectedEntry(); } }; ISfxTemplateCommon_Impl aISfxTemplateCommon; @@ -262,7 +262,7 @@ protected: // information of the ith Family in the pStyleFamilies. sal_uInt16 StyleNrToInfoOffset( sal_uInt16 i ); - void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; void FamilySelect( sal_uInt16 nId ); void SetFamily( sal_uInt16 nId ); @@ -317,8 +317,8 @@ class DropToolBox_Impl : public ToolBox, public DropTargetHelper { SfxTemplateDialog_Impl& rParent; protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) SAL_OVERRIDE; + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) SAL_OVERRIDE; public: DropToolBox_Impl(Window* pParent, SfxTemplateDialog_Impl* pTemplateDialog); ~DropToolBox_Impl(); @@ -345,15 +345,15 @@ private: protected: virtual void Command( const CommandEvent& rMEvt ); - virtual void EnableEdit( sal_Bool = sal_True ); - virtual void EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True ); - virtual void CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True ); - virtual sal_Bool IsCheckedItem( sal_uInt16 nMesId ); - virtual void LoadedFamilies(); - virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ); - virtual void EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True ); - virtual void ClearFamilyList(); - virtual void ReplaceUpdateButtonByMenu(); + virtual void EnableEdit( sal_Bool = sal_True ) SAL_OVERRIDE; + virtual void EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True ) SAL_OVERRIDE; + virtual void CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True ) SAL_OVERRIDE; + virtual sal_Bool IsCheckedItem( sal_uInt16 nMesId ) SAL_OVERRIDE; + virtual void LoadedFamilies() SAL_OVERRIDE; + virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) SAL_OVERRIDE; + virtual void EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True ) SAL_OVERRIDE; + virtual void ClearFamilyList() SAL_OVERRIDE; + virtual void ReplaceUpdateButtonByMenu() SAL_OVERRIDE; void Resize(); Size GetMinOutputSizePixel(); diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx index 28515d1a644b..5ce731618b0b 100644 --- a/sfx2/source/inc/tplcitem.hxx +++ b/sfx2/source/inc/tplcitem.hxx @@ -33,7 +33,7 @@ class SfxTemplateControllerItem: public SfxControllerItem { SfxTemplateControllerItem*); protected: - virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ) SAL_OVERRIDE; public: SfxTemplateControllerItem( sal_uInt16 nId, SfxCommonTemplateDialog_Impl &rDlg, SfxBindings &); diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index f9201f23b19f..5170d537ae19 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -38,8 +38,8 @@ public: { } void setColSizes(); - virtual void Resize(); - virtual void KeyInput(const KeyEvent& rKeyEvent); + virtual void Resize() SAL_OVERRIDE; + virtual void KeyInput(const KeyEvent& rKeyEvent) SAL_OVERRIDE; }; class SfxVersionTableDtor; diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index 152a44e074dc..bc54c75cbfd5 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -185,19 +185,19 @@ class LayoutManagerListener : public ::cppu::WeakImplHelper2< // XComponent - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XLayoutManagerEventListener - virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: sal_Bool m_bHasFrame; @@ -334,9 +334,9 @@ class SfxFrameWorkWin_Impl : public SfxWorkWindow SfxFrame* pFrame; public: SfxFrameWorkWin_Impl( Window* pWin, SfxFrame* pFrm, SfxFrame* pMaster ); - virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True ); - virtual void UpdateObjectBars_Impl(); - virtual Rectangle GetTopRect_Impl(); + virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True ) SAL_OVERRIDE; + virtual void UpdateObjectBars_Impl() SAL_OVERRIDE; + virtual Rectangle GetTopRect_Impl() SAL_OVERRIDE; }; diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index f8552913312a..1c20ad246650 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -67,7 +67,7 @@ class SfxMenuImageControl_Impl : public SfxControllerItem sal_Bool bIsMirrored; protected: - virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; public: SfxMenuImageControl_Impl( sal_uInt16 nSlotId, SfxBindings& rBindings, SfxVirtualMenu* pVMenu ) : SfxControllerItem( nSlotId, rBindings ) diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 58771cccd618..13a8798529ba 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -70,12 +70,12 @@ public: // css.container.XEnumeration virtual sal_Bool SAL_CALL hasMoreElements() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL nextElement() throw(css::container::NoSuchElementException, css::lang::WrappedTargetException , - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; @@ -98,19 +98,19 @@ public: virtual ~SfxGlobalEvents_Impl(); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("com.sun.star.comp.sfx2.GlobalEventBroadcaster"); } virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { css::uno::Sequence< OUString > aSeq(1); aSeq[0] = OUString("com.sun.star.frame.GlobalEventBroadcaster"); @@ -119,54 +119,54 @@ public: // css.document.XEventBroadcaster virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL addEventListener(const css::uno::Reference< css::document::XEventListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::document::XEventListener >& xListener) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.document.XDocumentEventBroadcaster - virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception); - virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception); + virtual void SAL_CALL addDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL removeDocumentEventListener( const css::uno::Reference< css::document::XDocumentEventListener >& _Listener ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const css::uno::Reference< css::frame::XController2 >& _ViewController, const css::uno::Any& _Supplement ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.document.XEventListener virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.document.XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (css::uno::RuntimeException, std::exception); + virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.container.XSet virtual sal_Bool SAL_CALL has(const css::uno::Any& aElement) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL insert(const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException , css::container::ElementExistException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual void SAL_CALL remove(const css::uno::Any& aElement) throw(css::lang::IllegalArgumentException , css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception ); + css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; // css.container.XEnumerationAccess virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.container.XElementAccess virtual css::uno::Type SAL_CALL getElementType() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // css.lang.XEventListener virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception); + throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: diff --git a/sfx2/source/sidebar/Accessible.hxx b/sfx2/source/sidebar/Accessible.hxx index 6d1ab5d2369e..92f457ef119a 100644 --- a/sfx2/source/sidebar/Accessible.hxx +++ b/sfx2/source/sidebar/Accessible.hxx @@ -53,12 +53,12 @@ public: const cssu::Reference<css::accessibility::XAccessibleContext>& rxContext); virtual ~Accessible (void); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; // XAccessible virtual cssu::Reference<css::accessibility::XAccessibleContext> SAL_CALL getAccessibleContext (void) - throw (cssu::RuntimeException, std::exception); + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE; private: cssu::Reference<css::accessibility::XAccessibleContext> mxContext; diff --git a/sfx2/source/sidebar/AccessibleTitleBar.hxx b/sfx2/source/sidebar/AccessibleTitleBar.hxx index 4c6cb1117310..f8517f8adbd1 100644 --- a/sfx2/source/sidebar/AccessibleTitleBar.hxx +++ b/sfx2/source/sidebar/AccessibleTitleBar.hxx @@ -35,7 +35,7 @@ public: static cssu::Reference<css::accessibility::XAccessible> Create (TitleBar& rTitleBar); protected: - virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet); + virtual void FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) SAL_OVERRIDE; private: AccessibleTitleBar (VCLXWindow* pWindow); diff --git a/sfx2/source/sidebar/CommandInfoProvider.cxx b/sfx2/source/sidebar/CommandInfoProvider.cxx index e1ffbf3f4f17..54589df723ae 100644 --- a/sfx2/source/sidebar/CommandInfoProvider.cxx +++ b/sfx2/source/sidebar/CommandInfoProvider.cxx @@ -57,13 +57,13 @@ namespace virtual ~FrameListener (void) { } - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing (void) SAL_OVERRIDE { if (mxFrame.is()) mxFrame->removeEventListener(this); } virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE { (void)rEvent; mrInfoProvider.SetFrame(NULL); diff --git a/sfx2/source/sidebar/ControllerItem.cxx b/sfx2/source/sidebar/ControllerItem.cxx index 7ee4e702a1df..6caa99e32001 100644 --- a/sfx2/source/sidebar/ControllerItem.cxx +++ b/sfx2/source/sidebar/ControllerItem.cxx @@ -60,20 +60,20 @@ namespace virtual ~FrameActionListener (void) { } - virtual void SAL_CALL disposing (void) + virtual void SAL_CALL disposing (void) SAL_OVERRIDE { if (mxFrame.is()) mxFrame->removeFrameActionListener(this); } virtual void SAL_CALL disposing (const css::lang::EventObject& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE { (void)rEvent; mrControllerItem.ResetFrame(); mxFrame = NULL; } virtual void SAL_CALL frameAction (const css::frame::FrameActionEvent& rEvent) - throw (cssu::RuntimeException, std::exception) + throw (cssu::RuntimeException, std::exception) SAL_OVERRIDE { if (rEvent.Action == frame::FrameAction_CONTEXT_CHANGED) mrControllerItem.NotifyFrameContextChange(); diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx index 5a0850ce7a61..65aa238d9148 100644 --- a/sfx2/source/sidebar/Deck.hxx +++ b/sfx2/source/sidebar/Deck.hxx @@ -65,9 +65,9 @@ public: */ void ShowPanel (const Panel& rPanel); - virtual void Paint (const Rectangle& rUpdateArea); - virtual void DataChanged (const DataChangedEvent& rEvent); - virtual bool Notify (NotifyEvent& rEvent); + virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; + virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; void PrintWindowTree(); static void PrintWindowSubTree (Window* pRoot, int nIndentation); @@ -79,7 +79,7 @@ public: public: ScrollContainerWindow (Window* pParentWindow); virtual ~ScrollContainerWindow (void); - virtual void Paint (const Rectangle& rUpdateArea); + virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; void SetSeparators (const ::std::vector<sal_Int32>& rSeparators); private: ::std::vector<sal_Int32> maSeparators; diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx index 7b4be835b6c8..d70e148525ba 100644 --- a/sfx2/source/sidebar/DeckTitleBar.hxx +++ b/sfx2/source/sidebar/DeckTitleBar.hxx @@ -38,15 +38,15 @@ public: void SetCloserVisible (const bool bIsCloserVisible); - virtual void DataChanged (const DataChangedEvent& rEvent); + virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; protected: - virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox); - virtual void PaintDecoration (const Rectangle& rTitleBarBox); - virtual sidebar::Paint GetBackgroundPaint (void); - virtual Color GetTextColor (void); - virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex); - virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void); + virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) SAL_OVERRIDE; + virtual void PaintDecoration (const Rectangle& rTitleBarBox) SAL_OVERRIDE; + virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE; + virtual Color GetTextColor (void) SAL_OVERRIDE; + virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE; + virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; private: const sal_uInt16 mnCloserItemIndex; diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx index c7e855411fd9..268eff9a3da6 100644 --- a/sfx2/source/sidebar/MenuButton.hxx +++ b/sfx2/source/sidebar/MenuButton.hxx @@ -31,10 +31,10 @@ public: MenuButton (Window* pParentWindow); virtual ~MenuButton (void); - virtual void Paint (const Rectangle& rUpdateArea); - virtual void MouseMove (const MouseEvent& rEvent); - virtual void MouseButtonDown (const MouseEvent& rMouseEvent); - virtual void MouseButtonUp (const MouseEvent& rMouseEvent); + virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; + virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE; + virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE; protected: using CheckBox::FillLayoutData; diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx index fb902c8f1d0f..218f95373798 100644 --- a/sfx2/source/sidebar/Panel.hxx +++ b/sfx2/source/sidebar/Panel.hxx @@ -63,10 +63,10 @@ public: bool HasIdPredicate (const ::rtl::OUString& rsId) const; const ::rtl::OUString& GetId (void) const; - virtual void Paint (const Rectangle& rUpdateArea); - virtual void Resize (void); - virtual void DataChanged (const DataChangedEvent& rEvent); - virtual void Activate (void); + virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void Resize (void) SAL_OVERRIDE; + virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; + virtual void Activate (void) SAL_OVERRIDE; private: const ::rtl::OUString msPanelId; diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx index ba83173acd64..4d4a27f9c606 100644 --- a/sfx2/source/sidebar/PanelTitleBar.hxx +++ b/sfx2/source/sidebar/PanelTitleBar.hxx @@ -43,17 +43,17 @@ public: const ::rtl::OUString& rsCommandName, const ::cssu::Reference<css::frame::XFrame>& rxFrame); - virtual void DataChanged (const DataChangedEvent& rEvent); - virtual void MouseButtonDown (const MouseEvent& rMouseEvent); - virtual void MouseButtonUp (const MouseEvent& rMouseEvent); + virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; + virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE; + virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE; protected: - virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox); - virtual void PaintDecoration (const Rectangle& rTitleBarBox); - virtual sidebar::Paint GetBackgroundPaint (void); - virtual Color GetTextColor (void); - virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex); - virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void); + virtual Rectangle GetTitleArea (const Rectangle& rTitleBarBox) SAL_OVERRIDE; + virtual void PaintDecoration (const Rectangle& rTitleBarBox) SAL_OVERRIDE; + virtual sidebar::Paint GetBackgroundPaint (void) SAL_OVERRIDE; + virtual Color GetTextColor (void) SAL_OVERRIDE; + virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex) SAL_OVERRIDE; + virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; private: bool mbIsLeftButtonDown; diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx index 98dfbb197288..69f724254cda 100644 --- a/sfx2/source/sidebar/SidebarController.hxx +++ b/sfx2/source/sidebar/SidebarController.hxx @@ -92,23 +92,23 @@ public: // ui::XContextChangeEventListener virtual void SAL_CALL notifyContextChangeEvent (const css::ui::ContextChangeEventObject& rEvent) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; // XEventListener virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; // beans::XPropertyChangeListener virtual void SAL_CALL propertyChange (const css::beans::PropertyChangeEvent& rEvent) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; // frame::XStatusListener virtual void SAL_CALL statusChanged (const css::frame::FeatureStateEvent& rEvent) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; // ui::XSidebar virtual void SAL_CALL requestLayout (void) - throw(cssu::RuntimeException, std::exception); + throw(cssu::RuntimeException, std::exception) SAL_OVERRIDE; void NotifyResize (void); @@ -248,7 +248,7 @@ private: Context GetCurrentContext (void) const; - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; }; diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx index 8a0dfa4c910b..0fde50e6e8b0 100644 --- a/sfx2/source/sidebar/SidebarDockingWindow.hxx +++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx @@ -40,15 +40,15 @@ public: WinBits nBits); virtual ~SidebarDockingWindow (void); - virtual bool Close (void); + virtual bool Close (void) SAL_OVERRIDE; protected: // Window overridables - virtual void GetFocus (void); + virtual void GetFocus (void) SAL_OVERRIDE; virtual SfxChildAlignment CheckAlignment ( SfxChildAlignment eCurrentAlignment, - SfxChildAlignment eRequestedAlignment); + SfxChildAlignment eRequestedAlignment) SAL_OVERRIDE; private: ::rtl::Reference<sfx2::sidebar::SidebarController> mpSidebarController; diff --git a/sfx2/source/sidebar/SidebarPanel.hxx b/sfx2/source/sidebar/SidebarPanel.hxx index 2679c663b23a..29de65dc0c4b 100644 --- a/sfx2/source/sidebar/SidebarPanel.hxx +++ b/sfx2/source/sidebar/SidebarPanel.hxx @@ -59,7 +59,7 @@ protected: virtual void SAL_CALL disposing (const css::lang::EventObject& rEventObject) throw(cssu::RuntimeException); - virtual void SAL_CALL disposing (void); + virtual void SAL_CALL disposing (void) SAL_OVERRIDE; private: Panel* mpPanel; diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx index ef09a07544c8..b9d4e717c2f4 100644 --- a/sfx2/source/sidebar/TabBar.hxx +++ b/sfx2/source/sidebar/TabBar.hxx @@ -72,9 +72,9 @@ public: const PopupMenuProvider& rPopupMenuProvider); virtual ~TabBar (void); - virtual void Paint (const Rectangle& rUpdateArea); - virtual void DataChanged (const DataChangedEvent& rDataChangedEvent); - virtual bool Notify (NotifyEvent& rEvent); + virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void DataChanged (const DataChangedEvent& rDataChangedEvent) SAL_OVERRIDE; + virtual bool Notify (NotifyEvent& rEvent) SAL_OVERRIDE; static sal_Int32 GetDefaultWidth (void); diff --git a/sfx2/source/sidebar/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx index ae1755568873..32ee7d5394cb 100644 --- a/sfx2/source/sidebar/TabItem.hxx +++ b/sfx2/source/sidebar/TabItem.hxx @@ -36,10 +36,10 @@ public: TabItem (Window* pParentWindow); virtual ~TabItem (void); - virtual void Paint (const Rectangle& rUpdateArea); - virtual void MouseMove (const MouseEvent& rEvent); - virtual void MouseButtonDown (const MouseEvent& rMouseEvent); - virtual void MouseButtonUp (const MouseEvent& rMouseEvent); + virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void MouseMove (const MouseEvent& rEvent) SAL_OVERRIDE; + virtual void MouseButtonDown (const MouseEvent& rMouseEvent) SAL_OVERRIDE; + virtual void MouseButtonUp (const MouseEvent& rMouseEvent) SAL_OVERRIDE; private: bool mbIsLeftButtonDown; diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx index 6442333197c6..2ff949e47bcd 100644 --- a/sfx2/source/sidebar/TitleBar.hxx +++ b/sfx2/source/sidebar/TitleBar.hxx @@ -40,14 +40,14 @@ public: void SetTitle (const ::rtl::OUString& rsTitle); void SetIcon (const Image& rIcon); - virtual void Paint (const Rectangle& rUpdateArea); - virtual void DataChanged (const DataChangedEvent& rEvent); + virtual void Paint (const Rectangle& rUpdateArea) SAL_OVERRIDE; + virtual void DataChanged (const DataChangedEvent& rEvent) SAL_OVERRIDE; virtual void setPosSizePixel ( long nX, long nY, long nWidth, long nHeight, - sal_uInt16 nFlags = WINDOW_POSSIZE_ALL); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL) SAL_OVERRIDE; ToolBox& GetToolBox (void); const ToolBox& GetToolBox (void) const; @@ -62,7 +62,7 @@ protected: virtual sidebar::Paint GetBackgroundPaint (void) = 0; virtual Color GetTextColor (void) = 0; virtual void HandleToolBoxItemClick (const sal_uInt16 nItemIndex); - virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void); + virtual cssu::Reference<css::accessibility::XAccessible> CreateAccessible (void) SAL_OVERRIDE; private: Image maIcon; diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index 39bb8d273e41..e54977c4b556 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -70,12 +70,12 @@ public: SfxFrameWindow_Impl( SfxFrame* pF, Window& i_rContainerWindow ); ~SfxFrameWindow_Impl( ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual bool PreNotify( NotifyEvent& rNEvt ); - virtual bool Notify( NotifyEvent& rEvt ); - virtual void Resize(); - virtual void GetFocus(); + virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; + virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + virtual bool Notify( NotifyEvent& rEvt ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; + virtual void GetFocus() SAL_OVERRIDE; void DoResize(); }; diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index a73b754d6daf..9a8fc26203ae 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -109,19 +109,19 @@ public: SfxFrameLoader_Impl( const css::uno::Reference < css::uno::XComponentContext >& _rxContext ); virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception); + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XSynchronousFrameLoader - virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs, const css::uno::Reference< css::frame::XFrame >& _rxFrame ) throw( css::uno::RuntimeException, std::exception ); - virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& _rArgs, const css::uno::Reference< css::frame::XFrame >& _rxFrame ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL cancel() throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; protected: virtual ~SfxFrameLoader_Impl(); diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index 8c4db6a2743b..d63a635b8c9d 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -83,8 +83,8 @@ public: p->GetFrame().GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER ); } - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void Resize() SAL_OVERRIDE; + virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; }; #endif // INCLUDED_SFX2_SOURCE_VIEW_IMPVIEWFRAME_HXX diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index 8ef240eb8f09..38c9ad3e9057 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -127,36 +127,36 @@ public: uno::Reference < frame::XFrame > GetFrame() const; // XEmbeddedClient - virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException, std::exception ); - virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); + virtual void SAL_CALL saveObject() throw ( embed::ObjectSaveVetoException, uno::Exception, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL visibilityChanged( sal_Bool bVisible ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XInplaceClient - virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException, std::exception ); - virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ); - virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL canInplaceActivate() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL activatingInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL activatingUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL deactivatedInplace() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL deactivatedUI() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual uno::Reference< ::com::sun::star::frame::XLayoutManager > SAL_CALL getLayoutManager() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual uno::Reference< frame::XDispatchProvider > SAL_CALL getInplaceDispatchProvider() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual awt::Rectangle SAL_CALL getPlacement() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual awt::Rectangle SAL_CALL getClipRectangle() throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL translateAccelerators( const uno::Sequence< awt::KeyEvent >& aKeys ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL scrollObject( const awt::Size& aOffset ) throw ( embed::WrongStateException, uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual void SAL_CALL changedPlacement( const awt::Rectangle& aPosRect ) throw ( embed::WrongStateException, uno::Exception, uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XComponentSupplier - virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException, std::exception ); + virtual uno::Reference< util::XCloseable > SAL_CALL getComponent() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XWindowSupplier - virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException, std::exception ); + virtual uno::Reference< awt::XWindow > SAL_CALL getWindow() throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; // document::XEventListener - virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ); + virtual void SAL_CALL notifyEvent( const document::EventObject& aEvent ) throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XStateChangeListener - virtual void SAL_CALL changingState( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL stateChanged( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) 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); + virtual void SAL_CALL changingState( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (::com::sun::star::embed::WrongStateException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL stateChanged( const ::com::sun::star::lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) 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) SAL_OVERRIDE; }; SfxInPlaceClient_Impl::~SfxInPlaceClient_Impl() diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 641d43c2d3b2..f29093d4b698 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -207,13 +207,13 @@ public: --m_refCount; } - virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception); - virtual void SAL_CALL end(void) throw(RuntimeException, std::exception); - virtual void SAL_CALL setText(const OUString& aText) throw(RuntimeException, std::exception); - virtual void SAL_CALL setValue(sal_Int32 nValue) throw(RuntimeException, std::exception); - virtual void SAL_CALL reset() throw(RuntimeException, std::exception); + virtual void SAL_CALL start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL end(void) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setText(const OUString& aText) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL setValue(sal_Int32 nValue) throw(RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL reset() throw(RuntimeException, std::exception) SAL_OVERRIDE; - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw(RuntimeException, std::exception); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw(RuntimeException, std::exception) SAL_OVERRIDE; }; void SAL_CALL SfxStatusIndicator::start(const OUString& aText, sal_Int32 nRange) throw(RuntimeException, std::exception) @@ -315,8 +315,8 @@ class IMPL_SfxBaseController_ListenerHelper : public ::cppu::WeakImplHelper1< fr public: IMPL_SfxBaseController_ListenerHelper( SfxBaseController* pController ) ; virtual ~IMPL_SfxBaseController_ListenerHelper() ; - virtual void SAL_CALL frameAction( const frame::FrameActionEvent& aEvent ) throw (RuntimeException, std::exception) ; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) ; + virtual void SAL_CALL frameAction( const frame::FrameActionEvent& aEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE ; private: @@ -330,9 +330,9 @@ public: IMPL_SfxBaseController_CloseListenerHelper( SfxBaseController* pController ) ; virtual ~IMPL_SfxBaseController_CloseListenerHelper() ; virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) - throw (RuntimeException, util::CloseVetoException, std::exception) ; - virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) ; - virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) ; + throw (RuntimeException, util::CloseVetoException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL notifyClosing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE ; + virtual void SAL_CALL disposing( const lang::EventObject& aEvent ) throw (RuntimeException, std::exception) SAL_OVERRIDE ; private: diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 9e830f16793f..a271a92f6f5b 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -249,7 +249,7 @@ public: StartListening( *pFrame ); push_back( pFrame ); } - void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; }; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 6081a9b50a24..5e67a385ee5b 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -86,13 +86,13 @@ public: ); virtual ~SfxPrinterController(); - virtual void Notify( SfxBroadcaster&, const SfxHint& ); + virtual void Notify( SfxBroadcaster&, const SfxHint& ) SAL_OVERRIDE; - virtual int getPageCount() const; - virtual Sequence< beans::PropertyValue > getPageParameters( int i_nPage ) const; - virtual void printPage( int i_nPage ) const; - virtual void jobStarted(); - virtual void jobFinished( com::sun::star::view::PrintableState ); + virtual int getPageCount() const SAL_OVERRIDE; + virtual Sequence< beans::PropertyValue > getPageParameters( int i_nPage ) const SAL_OVERRIDE; + virtual void printPage( int i_nPage ) const SAL_OVERRIDE; + virtual void jobStarted() SAL_OVERRIDE; + virtual void jobFinished( com::sun::star::view::PrintableState ) SAL_OVERRIDE; }; SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_rPrinter, diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 424201586c36..5c063a545b29 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -101,11 +101,11 @@ public: // XEventListener virtual void SAL_CALL disposing( const lang::EventObject& rEventObject ) - throw ( uno::RuntimeException, std::exception ); + throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; // XClipboardListener virtual void SAL_CALL changedContents( const datatransfer::clipboard::ClipboardEvent& rEventObject ) - throw ( uno::RuntimeException, std::exception ); + throw ( uno::RuntimeException, std::exception ) SAL_OVERRIDE; void DisconnectViewShell() { m_pViewShell = NULL; } void ChangedContents(); |