diff options
Diffstat (limited to 'odk/examples/cpp/complextoolbarcontrols')
10 files changed, 41 insertions, 92 deletions
diff --git a/odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx b/odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx index e02a5d69574a..38b3326c7754 100644 --- a/odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/CalcListener.cxx @@ -21,11 +21,11 @@ #include "MyListener.h" #include <com/sun/star/lang/XMultiServiceFactory.hpp> -void SAL_CALL CalcListener::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) +void SAL_CALL CalcListener::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) { } -void SAL_CALL CalcListener::disposing( const com::sun::star::lang::EventObject& aSource ) throw( com::sun::star::uno::RuntimeException ) +void SAL_CALL CalcListener::disposing( const com::sun::star::lang::EventObject& aSource ) { } diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx index 0ee09734a09a..a36e801382f7 100644 --- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.cxx @@ -120,7 +120,7 @@ void ListenerHelper::AddDispatch( xFrame->addEventListener( new ListenerItemEventListener( xFrame ) ); } -void SAL_CALL ListenerItemEventListener::disposing( const EventObject& aEvent) throw (RuntimeException) +void SAL_CALL ListenerItemEventListener::disposing( const EventObject& aEvent) { AllListeners::iterator aIter = aListeners.begin(); while ( aIter != aListeners.end() ) diff --git a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h index f24150df7c31..b053ccef3936 100644 --- a/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h +++ b/odk/examples/cpp/complextoolbarcontrols/ListenerHelper.h @@ -77,7 +77,7 @@ public: ListenerItemEventListener( const com::sun::star::uno::Reference < com::sun::star::frame::XFrame >& xFrame) : mxFrame(xFrame) {} - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ); }; #endif diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx index 656eb6942a81..b67d3c93fb68 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.cxx @@ -39,7 +39,6 @@ using com::sun::star::beans::NamedValue; using com::sun::star::document::XEventBroadcaster; Any SAL_CALL MyJob::execute( const Sequence< NamedValue >& aArguments ) - throw ( IllegalArgumentException, Exception, RuntimeException ) { Reference < XEventBroadcaster > xBrd( mxMSF->createInstance( "com.sun.star.frame.GlobalEventBroadcaster" ), UNO_QUERY ); @@ -51,7 +50,6 @@ Any SAL_CALL MyJob::execute( const Sequence< NamedValue >& aArguments ) } OUString MyJob_getImplementationName () - throw (RuntimeException) { return OUString( "com.sun.star.comp.Office.MyJob" ); } @@ -59,7 +57,6 @@ OUString MyJob_getImplementationName () #define SERVICE_NAME "com.sun.star.task.Job" Sequence< OUString > SAL_CALL MyJob_getSupportedServiceNames( ) - throw (RuntimeException) { Sequence < OUString > aRet(1); OUString* pArray = aRet.getArray(); @@ -70,26 +67,22 @@ Sequence< OUString > SAL_CALL MyJob_getSupportedServiceNames( ) #undef SERVICE_NAME Reference< XInterface > SAL_CALL MyJob_createInstance( const Reference< XMultiServiceFactory > & rSMgr) - throw( Exception ) { return (cppu::OWeakObject*) new MyJob( rSMgr ); } // XServiceInfo OUString SAL_CALL MyJob::getImplementationName( ) - throw (RuntimeException) { return MyJob_getImplementationName(); } sal_Bool SAL_CALL MyJob::supportsService( const OUString& rServiceName ) - throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL MyJob::getSupportedServiceNames( ) - throw (RuntimeException) { return MyJob_getSupportedServiceNames(); } diff --git a/odk/examples/cpp/complextoolbarcontrols/MyJob.h b/odk/examples/cpp/complextoolbarcontrols/MyJob.h index 0741e5eed21e..e9f505f1c8cb 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyJob.h +++ b/odk/examples/cpp/complextoolbarcontrols/MyJob.h @@ -61,30 +61,22 @@ public: // XJob virtual ::com::sun::star::uno::Any SAL_CALL execute( - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) - throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName( ); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ); }; -::rtl::OUString MyJob_getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); +::rtl::OUString MyJob_getImplementationName(); -sal_Bool SAL_CALL MyJob_supportsService( const ::rtl::OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); +sal_Bool SAL_CALL MyJob_supportsService( const ::rtl::OUString& ServiceName ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL MyJob_getSupportedServiceNames( ) - throw ( ::com::sun::star::uno::RuntimeException ); +::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL MyJob_getSupportedServiceNames( ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -SAL_CALL MyJob_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) - throw ( ::com::sun::star::uno::Exception ); +SAL_CALL MyJob_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr); #endif diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx index 82f8d01a303e..c49083a97b5e 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.cxx @@ -33,9 +33,6 @@ MyListener::~MyListener() {} css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) - throw (css::lang::IllegalArgumentException, - css::uno::Exception, - css::uno::RuntimeException) { css::uno::Sequence< css::beans::NamedValue > lEnv; @@ -105,13 +102,11 @@ css::uno::Any SAL_CALL MyListener::execute(const css::uno::Sequence< css::beans: } ::rtl::OUString SAL_CALL MyListener::getImplementationName() - throw (css::uno::RuntimeException) { return ::rtl::OUString( MYLISTENER_IMPLEMENTATIONNAME ); } css::uno::Sequence< ::rtl::OUString > SAL_CALL MyListener::getSupportedServiceNames() - throw (css::uno::RuntimeException) { css::uno::Sequence< ::rtl::OUString > lNames(1); lNames[0] = ::rtl::OUString( MYLISTENER_SERVICENAME ); @@ -119,7 +114,6 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL MyListener::getSupportedServiceNa } sal_Bool SAL_CALL MyListener::supportsService(const ::rtl::OUString& sServiceName) - throw (css::uno::RuntimeException) { return cppu::supportsService(this, sServiceName); } diff --git a/odk/examples/cpp/complextoolbarcontrols/MyListener.h b/odk/examples/cpp/complextoolbarcontrols/MyListener.h index 428693dacc76..203c81e0b792 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyListener.h +++ b/odk/examples/cpp/complextoolbarcontrols/MyListener.h @@ -52,20 +52,14 @@ class MyListener : public cppu::WeakImplHelper2< css::task::XJob , virtual ~MyListener(); // XJob - virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments) - throw (css::lang::IllegalArgumentException, - css::uno::Exception, - css::uno::RuntimeException); + virtual css::uno::Any SAL_CALL execute(const css::uno::Sequence< css::beans::NamedValue >& lArguments); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName(); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) - throw (css::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException); + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(); public: @@ -87,10 +81,8 @@ class CalcListener : public cppu::WeakImplHelper1< css::document::XEventListener {} // document.XEventListener - virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) - throw (css::uno::RuntimeException); - virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent); + virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent); }; class WriterListener : public cppu::WeakImplHelper1< css::document::XEventListener > @@ -105,10 +97,8 @@ class WriterListener : public cppu::WeakImplHelper1< css::document::XEventListen {} // document.XEventListener - virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent) - throw (css::uno::RuntimeException); - virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) - throw (css::uno::RuntimeException); + virtual void SAL_CALL notifyEvent(const css::document::EventObject& aEvent); + virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent); }; #endif diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index 4020953b68a8..3fd70340aebc 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -101,7 +101,7 @@ void BaseDispatch::SendCommandTo( const Reference< XStatusListener >& xControl, xControl->statusChanged( aEvent ); } -void SAL_CALL MyProtocolHandler::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException) +void SAL_CALL MyProtocolHandler::initialize( const Sequence< Any >& aArguments ) { Reference < XFrame > xFrame; if ( aArguments.getLength() ) @@ -114,7 +114,6 @@ void SAL_CALL MyProtocolHandler::initialize( const Sequence< Any >& aArguments ) } Reference< XDispatch > SAL_CALL MyProtocolHandler::queryDispatch( const URL& aURL, const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ) - throw( RuntimeException ) { Reference < XDispatch > xRet; if ( !mxFrame.is() ) @@ -151,7 +150,6 @@ Reference< XDispatch > SAL_CALL MyProtocolHandler::queryDispatch( const URL& a } Sequence < Reference< XDispatch > > SAL_CALL MyProtocolHandler::queryDispatches( const Sequence < DispatchDescriptor >& seqDescripts ) - throw( RuntimeException ) { sal_Int32 nCount = seqDescripts.getLength(); Sequence < Reference < XDispatch > > lDispatcher( nCount ); @@ -163,13 +161,11 @@ Sequence < Reference< XDispatch > > SAL_CALL MyProtocolHandler::queryDispatches( } ::rtl::OUString MyProtocolHandler_getImplementationName () - throw (RuntimeException) { return ::rtl::OUString( MYPROTOCOLHANDLER_IMPLEMENTATIONNAME ); } Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames( ) - throw (RuntimeException) { Sequence < ::rtl::OUString > aRet(1); aRet[0] = ::rtl::OUString( MYPROTOCOLHANDLER_SERVICENAME ); @@ -179,31 +175,27 @@ Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames( #undef SERVICE_NAME Reference< XInterface > SAL_CALL MyProtocolHandler_createInstance( const Reference< XComponentContext > & rSMgr) - throw( Exception ) { return (cppu::OWeakObject*) new MyProtocolHandler( rSMgr ); } // XServiceInfo ::rtl::OUString SAL_CALL MyProtocolHandler::getImplementationName( ) - throw (RuntimeException) { return MyProtocolHandler_getImplementationName(); } sal_Bool SAL_CALL MyProtocolHandler::supportsService( const ::rtl::OUString& rServiceName ) - throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler::getSupportedServiceNames( ) - throw (RuntimeException) { return MyProtocolHandler_getSupportedServiceNames(); } -void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < PropertyValue >& lArgs ) throw (RuntimeException) +void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < PropertyValue >& lArgs ) { /* It's necessary to hold this object alive, till this method finishes. May the outside dispatch cache (implemented by the menu/toolbar!) @@ -330,7 +322,7 @@ void SAL_CALL BaseDispatch::dispatch( const URL& aURL, const Sequence < Property } } -void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) throw (RuntimeException) +void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) { if ( aURL.Protocol == "vnd.demo.complextoolbarcontrols.demoaddon:" ) { @@ -449,12 +441,12 @@ void SAL_CALL BaseDispatch::addStatusListener( const Reference< XStatusListener } } -void SAL_CALL BaseDispatch::removeStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) throw (RuntimeException) +void SAL_CALL BaseDispatch::removeStatusListener( const Reference< XStatusListener >& xControl, const URL& aURL ) { aListenerHelper.RemoveListener( mxFrame, xControl, aURL.Path ); } -void SAL_CALL BaseDispatch::controlEvent( const ControlEvent& Event ) throw (RuntimeException) +void SAL_CALL BaseDispatch::controlEvent( const ControlEvent& Event ) { if ( Event.aURL.Protocol == "vnd.demo.complextoolbarcontrols.demoaddon:" ) { diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h index 4ee22a0fe0e5..49a2a4ecebdb 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.h @@ -67,38 +67,28 @@ public: // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, - const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ) - throw( ::com::sun::star::uno::RuntimeException ); + const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ); 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 >& seqDescriptor ) - throw( ::com::sun::star::uno::RuntimeException ); + const ::com::sun::star::uno::Sequence < ::com::sun::star::frame::DispatchDescriptor >& seqDescriptor ); // XInitialization - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) - throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) - throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) - throw (::com::sun::star::uno::RuntimeException); + virtual ::rtl::OUString SAL_CALL getImplementationName( ); + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ); + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ); }; -::rtl::OUString MyProtocolHandler_getImplementationName() - throw ( ::com::sun::star::uno::RuntimeException ); +::rtl::OUString MyProtocolHandler_getImplementationName(); -sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& ServiceName ) - throw ( ::com::sun::star::uno::RuntimeException ); +sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& ServiceName ); -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames( ) - throw ( ::com::sun::star::uno::RuntimeException ); +::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames( ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -SAL_CALL MyProtocolHandler_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext) - throw ( ::com::sun::star::uno::Exception ); +SAL_CALL MyProtocolHandler_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & rContext); class BaseDispatch : public cppu::WeakImplHelper2 < @@ -126,16 +116,14 @@ public: // XDispatch virtual void SAL_CALL dispatch( const ::com::sun::star::util::URL& aURL, - const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs ) - throw (::com::sun::star::uno::RuntimeException); + const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArgs ); 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); + const ::com::sun::star::util::URL& aURL ); 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); + const ::com::sun::star::util::URL& aURL ); // XControlNotificationListener - virtual void SAL_CALL controlEvent( const ::com::sun::star::frame::ControlEvent& Event ) - throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL controlEvent( const ::com::sun::star::frame::ControlEvent& Event ); }; class WriterDispatch : public BaseDispatch diff --git a/odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx b/odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx index 31be46c6aa9a..018ec1c8f4ec 100644 --- a/odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/WriterListener.cxx @@ -23,11 +23,11 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -void SAL_CALL WriterListener::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) +void SAL_CALL WriterListener::notifyEvent( const ::com::sun::star::document::EventObject& aEvent ) { } -void SAL_CALL WriterListener::disposing( const com::sun::star::lang::EventObject& aSource ) throw( com::sun::star::uno::RuntimeException ) +void SAL_CALL WriterListener::disposing( const com::sun::star::lang::EventObject& aSource ) { } |