summaryrefslogtreecommitdiff
path: root/io/source/connector
diff options
context:
space:
mode:
Diffstat (limited to 'io/source/connector')
-rw-r--r--io/source/connector/connector.cxx16
-rw-r--r--io/source/connector/connector.hxx44
-rw-r--r--io/source/connector/ctr_pipe.cxx9
-rw-r--r--io/source/connector/ctr_socket.cxx13
4 files changed, 21 insertions, 61 deletions
diff --git a/io/source/connector/connector.cxx b/io/source/connector/connector.cxx
index d12296295700..c5f9c7935044 100644
--- a/io/source/connector/connector.cxx
+++ b/io/source/connector/connector.cxx
@@ -56,13 +56,12 @@ namespace stoc_connector
// Methods
virtual Reference< XConnection > SAL_CALL connect(
- const OUString& sConnectionDescription )
- throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception) override;
+ const OUString& sConnectionDescription ) override;
public: // XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(std::exception) override;
- virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
};
OConnector::OConnector(const Reference< XComponentContext > &xCtx)
@@ -71,7 +70,6 @@ namespace stoc_connector
{}
Reference< XConnection > SAL_CALL OConnector::connect( const OUString& sConnectionDescription )
- throw( NoConnectException, ConnectionSetupException, RuntimeException, std::exception)
{
// split string into tokens
try
@@ -174,17 +172,17 @@ namespace stoc_connector
return OUString( IMPLEMENTATION_NAME );
}
- OUString OConnector::getImplementationName() throw(std::exception)
+ OUString OConnector::getImplementationName()
{
return connector_getImplementationName();
}
- sal_Bool OConnector::supportsService(const OUString& ServiceName) throw(std::exception)
+ sal_Bool OConnector::supportsService(const OUString& ServiceName)
{
return cppu::supportsService(this, ServiceName);
}
- Sequence< OUString > OConnector::getSupportedServiceNames() throw(std::exception)
+ Sequence< OUString > OConnector::getSupportedServiceNames()
{
return connector_getSupportedServiceNames();
}
diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx
index 3381cf0cdc22..1c5b585c5e68 100644
--- a/io/source/connector/connector.hxx
+++ b/io/source/connector/connector.hxx
@@ -64,20 +64,11 @@ namespace stoc_connector
virtual ~PipeConnection() override;
virtual sal_Int32 SAL_CALL read( css::uno::Sequence< sal_Int8 >& aReadBytes,
- sal_Int32 nBytesToRead )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL flush( ) throw(
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL close( )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDescription( )
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nBytesToRead ) override;
+ virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData ) override;
+ virtual void SAL_CALL flush( ) override;
+ virtual void SAL_CALL close( ) override;
+ virtual OUString SAL_CALL getDescription( ) override;
public:
::osl::StreamPipe m_pipe;
oslInterlockedCount m_nStatus;
@@ -93,27 +84,16 @@ namespace stoc_connector
virtual ~SocketConnection() override;
virtual sal_Int32 SAL_CALL read( css::uno::Sequence< sal_Int8 >& aReadBytes,
- sal_Int32 nBytesToRead )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL flush( ) throw(
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL close( )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDescription( )
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nBytesToRead ) override;
+ virtual void SAL_CALL write( const css::uno::Sequence< sal_Int8 >& aData ) override;
+ virtual void SAL_CALL flush( ) override;
+ virtual void SAL_CALL close( ) override;
+ virtual OUString SAL_CALL getDescription( ) override;
// XConnectionBroadcaster
- virtual void SAL_CALL addStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener)
- throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener) override;
+ virtual void SAL_CALL removeStreamListener(const css::uno::Reference< css::io::XStreamListener>& aListener) override;
public:
void completeConnectionString();
diff --git a/io/source/connector/ctr_pipe.cxx b/io/source/connector/ctr_pipe.cxx
index df1529173ba6..48aad0b39260 100644
--- a/io/source/connector/ctr_pipe.cxx
+++ b/io/source/connector/ctr_pipe.cxx
@@ -44,8 +44,6 @@ namespace stoc_connector {
}
sal_Int32 PipeConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception)
{
if( ! m_nStatus )
{
@@ -61,8 +59,6 @@ namespace stoc_connector {
}
void PipeConnection::write( const Sequence < sal_Int8 > &seq )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception)
{
if( ! m_nStatus )
{
@@ -77,15 +73,11 @@ namespace stoc_connector {
}
void PipeConnection::flush( )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception)
{
}
void PipeConnection::close()
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception)
{
// ensure that close is called only once
if(1 == osl_atomic_increment( (&m_nStatus) ) )
@@ -95,7 +87,6 @@ namespace stoc_connector {
}
OUString PipeConnection::getDescription()
- throw( css::uno::RuntimeException, std::exception)
{
return m_sDescription;
}
diff --git a/io/source/connector/ctr_socket.cxx b/io/source/connector/ctr_socket.cxx
index 00f35eb627f3..53ce96ae3131 100644
--- a/io/source/connector/ctr_socket.cxx
+++ b/io/source/connector/ctr_socket.cxx
@@ -116,8 +116,6 @@ namespace stoc_connector {
}
sal_Int32 SocketConnection::read( Sequence < sal_Int8 > & aReadBytes , sal_Int32 nBytesToRead )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception)
{
if( ! m_nStatus )
{
@@ -162,8 +160,6 @@ namespace stoc_connector {
}
void SocketConnection::write( const Sequence < sal_Int8 > &seq )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception)
{
if( ! m_nStatus )
{
@@ -198,15 +194,11 @@ namespace stoc_connector {
}
void SocketConnection::flush( )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception)
{
}
void SocketConnection::close()
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception)
{
// ensure that close is called only once
if( 1 == osl_atomic_increment( (&m_nStatus) ) )
@@ -217,21 +209,20 @@ namespace stoc_connector {
}
OUString SocketConnection::getDescription()
- throw( css::uno::RuntimeException, std::exception)
{
return m_sDescription;
}
// XConnectionBroadcaster
- void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
+ void SAL_CALL SocketConnection::addStreamListener(const Reference<XStreamListener> & aListener)
{
MutexGuard guard(_mutex);
_listeners.insert(aListener);
}
- void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener) throw(RuntimeException, std::exception)
+ void SAL_CALL SocketConnection::removeStreamListener(const Reference<XStreamListener> & aListener)
{
MutexGuard guard(_mutex);
generated by cgit (git 2.34.1) at 2024-07-04 18:56:00 +0000