summaryrefslogtreecommitdiffstats
path: root/ucb/source/ucp/ftp
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/ftp')
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.cxx20
-rw-r--r--ucb/source/ucp/ftp/ftpcontent.hxx47
-rw-r--r--ucb/source/ucp/ftp/ftpcontentidentifier.cxx11
-rw-r--r--ucb/source/ucp/ftp/ftpcontentidentifier.hxx23
-rw-r--r--ucb/source/ucp/ftp/ftpcontentprovider.cxx12
-rw-r--r--ucb/source/ucp/ftp/ftpcontentprovider.hxx29
-rw-r--r--ucb/source/ucp/ftp/ftpintreq.cxx4
-rw-r--r--ucb/source/ucp/ftp/ftpintreq.hxx7
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetbase.cxx80
-rw-r--r--ucb/source/ucp/ftp/ftpresultsetbase.hxx217
-rw-r--r--ucb/source/ucp/ftp/ftpurl.cxx16
-rw-r--r--ucb/source/ucp/ftp/ftpurl.hxx29
12 files changed, 96 insertions, 399 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx
index ca606c994b9c..2933e73820bb 100644
--- a/ucb/source/ucp/ftp/ftpcontent.cxx
+++ b/ucb/source/ucp/ftp/ftpcontent.cxx
@@ -125,7 +125,6 @@ void SAL_CALL FTPContent::release()
}
css::uno::Any SAL_CALL FTPContent::queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< XTypeProvider* >(this)),
@@ -141,15 +140,11 @@ css::uno::Any SAL_CALL FTPContent::queryInterface( const css::uno::Type & rType
// XTypeProvider methods.
css::uno::Sequence< sal_Int8 > SAL_CALL FTPContent::getImplementationId()
- throw( css::uno::RuntimeException,
- std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes()
- throw( css::uno::RuntimeException,
- std::exception )
{
static cppu::OTypeCollection* pCollection = nullptr;
if ( !pCollection )
@@ -175,19 +170,16 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes()
// XServiceInfo methods.
OUString SAL_CALL FTPContent::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString( "com.sun.star.comp.FTPContent");
}
sal_Bool SAL_CALL FTPContent::supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService( this, ServiceName );
}
css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return { "com.sun.star.ucb.FTPContent" };
}
@@ -197,7 +189,6 @@ css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames()
// virtual
OUString SAL_CALL FTPContent::getContentType()
- throw( RuntimeException, std::exception )
{
return OUString(FTP_CONTENT_TYPE);
}
@@ -206,7 +197,6 @@ OUString SAL_CALL FTPContent::getContentType()
//virtual
void SAL_CALL FTPContent::abort( sal_Int32 /*CommandId*/ )
- throw( RuntimeException, std::exception )
{
}
@@ -248,10 +238,6 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand,
sal_Int32 /*CommandId*/,
const Reference<
XCommandEnvironment >& Environment)
- throw( Exception,
- CommandAbortedException,
- RuntimeException,
- std::exception)
{
ACTION action(NOACTION);
Any aRet;
@@ -598,7 +584,6 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand,
Sequence<ContentInfo > SAL_CALL
FTPContent::queryCreatableContentsInfo( )
- throw (RuntimeException, std::exception)
{
return queryCreatableContentsInfo_Static();
}
@@ -606,7 +591,6 @@ FTPContent::queryCreatableContentsInfo( )
// static
Sequence<ContentInfo >
FTPContent::queryCreatableContentsInfo_Static( )
- throw (RuntimeException)
{
Sequence< ContentInfo > seq(2);
@@ -632,7 +616,6 @@ FTPContent::queryCreatableContentsInfo_Static( )
Reference<XContent > SAL_CALL
FTPContent::createNewContent( const ContentInfo& Info )
- throw (RuntimeException, std::exception)
{
if( Info.Type =="application/vnd.sun.staroffice.ftp-file" || Info.Type == "application/vnd.sun.staroffice.ftp-folder" )
return new FTPContent(m_xContext,
@@ -645,7 +628,6 @@ FTPContent::createNewContent( const ContentInfo& Info )
Reference<XInterface > SAL_CALL
FTPContent::getParent( )
- throw (RuntimeException, std::exception)
{
Reference<XContentIdentifier>
xIdent(new FTPContentIdentifier(m_aFTPURL.parent()));
@@ -655,8 +637,6 @@ FTPContent::getParent( )
void SAL_CALL
FTPContent::setParent(const Reference<XInterface >& /*Parent*/ )
- throw (NoSupportException,
- RuntimeException, std::exception)
{
throw NoSupportException();
}
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index bf9b53b3d4fe..74666dee9a0e 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -63,68 +63,49 @@ public:
virtual ~FTPContent() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( css::uno::RuntimeException,
- std::exception ) override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException,
- std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XContent
- virtual OUString SAL_CALL getContentType()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getContentType() override;
// XCommandProcessor
virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand,
sal_Int32 CommandId,
const css::uno::Reference<
- css::ucb::XCommandEnvironment >& Environment )
- throw( css::uno::Exception,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception ) override;
+ css::ucb::XCommandEnvironment >& Environment ) override;
- virtual void SAL_CALL abort(sal_Int32 CommandId)
- throw( css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL abort(sal_Int32 CommandId) override;
// XContentCreator
virtual css::uno::Sequence<
css::ucb::ContentInfo > SAL_CALL
- queryCreatableContentsInfo( )
- throw (css::uno::RuntimeException, std::exception) override;
+ queryCreatableContentsInfo( ) override;
virtual css::uno::Reference<
css::ucb::XContent > SAL_CALL
- createNewContent( const css::ucb::ContentInfo& Info )
- throw (css::uno::RuntimeException, std::exception) override;
+ createNewContent( const css::ucb::ContentInfo& Info ) override;
// XChild
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) override;
- virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent )
- throw (css::lang::NoSupportException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override;
/// @throws css::uno::RuntimeException
- static css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo_Static()
- throw (css::uno::RuntimeException);
+ static css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo_Static();
private:
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index bbc3e0b800d9..683422366703 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -49,9 +49,6 @@ Any SAL_CALL
FTPContentIdentifier::queryInterface(
const Type& rType
)
- throw(
- RuntimeException, std::exception
- )
{
Any aRet =
::cppu::queryInterface(rType,
@@ -74,7 +71,6 @@ void SAL_CALL FTPContentIdentifier::release() throw() {
Sequence<sal_Int8> SAL_CALL
FTPContentIdentifier::getImplementationId()
- throw(RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
@@ -82,7 +78,6 @@ FTPContentIdentifier::getImplementationId()
Sequence<Type> SAL_CALL
FTPContentIdentifier::getTypes()
- throw(RuntimeException, std::exception)
{
static cppu::OTypeCollection* pCollection = nullptr;
if ( !pCollection ) {
@@ -102,9 +97,6 @@ FTPContentIdentifier::getTypes()
OUString SAL_CALL
FTPContentIdentifier::getContentIdentifier(
)
- throw (
- css::uno::RuntimeException, std::exception
- )
{
return m_ident;
}
@@ -113,9 +105,6 @@ FTPContentIdentifier::getContentIdentifier(
OUString SAL_CALL
FTPContentIdentifier::getContentProviderScheme(
)
- throw (
- css::uno::RuntimeException, std::exception
- )
{
return OUString("ftp");
}
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index 99f13b31ef79..670f9fde74dc 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -53,8 +53,7 @@ namespace ftp {
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type& rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryInterface( const css::uno::Type& rType ) override;
virtual void SAL_CALL acquire() throw() override;
@@ -64,31 +63,19 @@ namespace ftp {
virtual
css::uno::Sequence<css::uno::Type> SAL_CALL
- getTypes()
- throw(
- css::uno::RuntimeException, std::exception
- ) override;
+ getTypes() override;
virtual css::uno::Sequence<sal_Int8> SAL_CALL
- getImplementationId()
- throw(
- css::uno::RuntimeException, std::exception
- ) override;
+ getImplementationId() override;
// XContentIdentifier
virtual OUString SAL_CALL
- getContentIdentifier()
- throw (
- css::uno::RuntimeException, std::exception
- ) override;
+ getContentIdentifier() override;
virtual OUString SAL_CALL
- getContentProviderScheme()
- throw (
- css::uno::RuntimeException, std::exception
- ) override;
+ getContentProviderScheme() override;
private:
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
index 1ee0fcc7c48c..d2628b9ae04a 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx
@@ -69,7 +69,6 @@ void SAL_CALL FTPContentProvider::release()
}
css::uno::Any SAL_CALL FTPContentProvider::queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< XTypeProvider* >(this)),
@@ -81,15 +80,11 @@ css::uno::Any SAL_CALL FTPContentProvider::queryInterface( const css::uno::Type
// XTypeProvider methods.
css::uno::Sequence< sal_Int8 > SAL_CALL FTPContentProvider::getImplementationId()
- throw( css::uno::RuntimeException,
- std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes()
- throw( css::uno::RuntimeException,
- std::exception )
{
static cppu::OTypeCollection* pCollection = nullptr;
if ( !pCollection )
@@ -112,7 +107,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes()
// XServiceInfo methods.
OUString SAL_CALL FTPContentProvider::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
@@ -123,13 +117,11 @@ OUString FTPContentProvider::getImplementationName_Static()
}
sal_Bool SAL_CALL FTPContentProvider::supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService( this, ServiceName );
}
css::uno::Sequence< OUString > SAL_CALL FTPContentProvider::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
@@ -138,7 +130,6 @@ css::uno::Sequence< OUString > SAL_CALL FTPContentProvider::getSupportedServiceN
static css::uno::Reference< css::uno::XInterface > SAL_CALL
FTPContentProvider_CreateInstance( const css::uno::Reference<
css::lang::XMultiServiceFactory> & rSMgr )
- throw( css::uno::Exception )
{
css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(
new FTPContentProvider( ucbhelper::getComponentContext(rSMgr) ));
@@ -171,9 +162,6 @@ FTPContentProvider::createServiceFactory( const css::uno::Reference<
// virtual
Reference<XContent> SAL_CALL FTPContentProvider::queryContent(
const Reference< XContentIdentifier >& xCanonicId)
- throw( IllegalIdentifierException,
- RuntimeException,
- std::exception)
{
// Check, if a content with given id already exists...
Reference<XContent> xContent = queryExistingContent(xCanonicId).get();
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index 1c93e7f58539..46db49efd062 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -50,32 +50,20 @@ namespace ftp
virtual ~FTPContentProvider() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException,
- std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( css::uno::RuntimeException,
- std::exception ) override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException,
- std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException,
- std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException,
- std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException,
- std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
static OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
@@ -86,10 +74,7 @@ namespace ftp
// XContentProvider
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
- queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
- throw( css::ucb::IllegalIdentifierException,
- css::uno::RuntimeException,
- std::exception ) override;
+ queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
CURL* handle();
diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx
index 380b7df711b1..e660153807c4 100644
--- a/ucb/source/ucp/ftp/ftpintreq.cxx
+++ b/ucb/source/ucp/ftp/ftpintreq.cxx
@@ -40,8 +40,6 @@ XInteractionApproveImpl::XInteractionApproveImpl()
}
void SAL_CALL XInteractionApproveImpl::select()
- throw (RuntimeException,
- std::exception)
{
m_bSelected = true;
}
@@ -55,8 +53,6 @@ XInteractionDisapproveImpl::XInteractionDisapproveImpl()
}
void SAL_CALL XInteractionDisapproveImpl::select()
- throw (RuntimeException,
- std::exception)
{
m_bSelected = true;
}
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 1816662558bb..50356454f05f 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -40,9 +40,7 @@ namespace ftp {
XInteractionApproveImpl();
- virtual void SAL_CALL select()
- throw (css::uno::RuntimeException,
- std::exception) override;
+ virtual void SAL_CALL select() override;
bool isSelected() const { return m_bSelected;}
@@ -59,8 +57,7 @@ namespace ftp {
XInteractionDisapproveImpl();
- virtual void SAL_CALL select()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL select() override;
private:
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 062ef471e0b8..00f0dc4c8238 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -73,7 +73,6 @@ ResultSetBase::release()
uno::Any SAL_CALL
ResultSetBase::queryInterface( const uno::Type& rType )
- throw( uno::RuntimeException, std::exception )
{
uno::Any aRet = cppu::queryInterface(
rType,
@@ -93,7 +92,6 @@ ResultSetBase::queryInterface( const uno::Type& rType )
void SAL_CALL
ResultSetBase::addEventListener(
const uno::Reference< lang::XEventListener >& Listener )
- throw( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -108,7 +106,6 @@ ResultSetBase::addEventListener(
void SAL_CALL
ResultSetBase::removeEventListener(
const uno::Reference< lang::XEventListener >& Listener )
- throw( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -119,7 +116,6 @@ ResultSetBase::removeEventListener(
void SAL_CALL
ResultSetBase::dispose()
- throw( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -145,8 +141,6 @@ ResultSetBase::dispose()
sal_Bool SAL_CALL
ResultSetBase::next()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
bool test;
if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -159,8 +153,6 @@ ResultSetBase::next()
sal_Bool SAL_CALL
ResultSetBase::isBeforeFirst()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return m_nRow == -1;
}
@@ -168,8 +160,6 @@ ResultSetBase::isBeforeFirst()
sal_Bool SAL_CALL
ResultSetBase::isAfterLast()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()); // Cannot happen, if m_aFolder.isOpen()
}
@@ -177,8 +167,6 @@ ResultSetBase::isAfterLast()
sal_Bool SAL_CALL
ResultSetBase::isFirst()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return m_nRow == 0;
}
@@ -186,8 +174,6 @@ ResultSetBase::isFirst()
sal_Bool SAL_CALL
ResultSetBase::isLast()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
if( m_nRow == sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1 )
return true;
@@ -198,8 +184,6 @@ ResultSetBase::isLast()
void SAL_CALL
ResultSetBase::beforeFirst()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
m_nRow = -1;
}
@@ -207,8 +191,6 @@ ResultSetBase::beforeFirst()
void SAL_CALL
ResultSetBase::afterLast()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
m_nRow = m_aItems.size();
}
@@ -216,8 +198,6 @@ ResultSetBase::afterLast()
sal_Bool SAL_CALL
ResultSetBase::first()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
m_nRow = -1;
return next();
@@ -226,8 +206,6 @@ ResultSetBase::first()
sal_Bool SAL_CALL
ResultSetBase::last()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
m_nRow = m_aItems.size() - 1;
return true;
@@ -236,8 +214,6 @@ ResultSetBase::last()
sal_Int32 SAL_CALL
ResultSetBase::getRow()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
// Test, whether behind last row
if( -1 == m_nRow || m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -248,7 +224,6 @@ ResultSetBase::getRow()
sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
- throw( sdbc::SQLException, uno::RuntimeException, std::exception)
{
if( row >= 0 )
m_nRow = row - 1;
@@ -266,8 +241,6 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
sal_Bool SAL_CALL
ResultSetBase::relative( sal_Int32 row )
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
if( isAfterLast() || isBeforeFirst() )
throw sdbc::SQLException();
@@ -285,8 +258,6 @@ ResultSetBase::relative( sal_Int32 row )
sal_Bool SAL_CALL
ResultSetBase::previous()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
if( m_nRow > sal::static_int_cast<sal_Int32>(m_aItems.size()) )
m_nRow = m_aItems.size(); // Correct Handling of afterLast
@@ -298,32 +269,24 @@ ResultSetBase::previous()
void SAL_CALL
ResultSetBase::refreshRow()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
}
sal_Bool SAL_CALL
ResultSetBase::rowUpdated()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return false;
}
sal_Bool SAL_CALL
ResultSetBase::rowInserted()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return false;
}
sal_Bool SAL_CALL
ResultSetBase::rowDeleted()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return false;
}
@@ -331,8 +294,6 @@ ResultSetBase::rowDeleted()
uno::Reference< uno::XInterface > SAL_CALL
ResultSetBase::getStatement()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
uno::Reference< uno::XInterface > test( nullptr );
return test;
@@ -343,15 +304,12 @@ ResultSetBase::getStatement()
void SAL_CALL
ResultSetBase::close()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
}
OUString SAL_CALL
ResultSetBase::queryContentIdentifierString()
- throw( uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aPath[m_nRow];
@@ -362,7 +320,6 @@ ResultSetBase::queryContentIdentifierString()
uno::Reference< ucb::XContentIdentifier > SAL_CALL
ResultSetBase::queryContentIdentifier()
- throw( uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
{
@@ -382,7 +339,6 @@ ResultSetBase::queryContentIdentifier()
uno::Reference< ucb::XContent > SAL_CALL
ResultSetBase::queryContent()
- throw( uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_xProvider->queryContent(queryContentIdentifier());
@@ -415,8 +371,7 @@ public:
OWeakObject::release();
}
- uno::Any SAL_CALL queryInterface( const uno::Type& rType )
- throw( uno::RuntimeException, std::exception ) override
+ uno::Any SAL_CALL queryInterface( const uno::Type& rType ) override
{
uno::Any aRet = cppu::queryInterface(
rType,
@@ -424,15 +379,12 @@ public:
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
- uno::Sequence< beans::Property > SAL_CALL getProperties()
- throw( uno::RuntimeException, std::exception ) override
+ uno::Sequence< beans::Property > SAL_CALL getProperties() override
{
return m_aSeq;
}
- beans::Property SAL_CALL getPropertyByName( const OUString& aName )
- throw( beans::UnknownPropertyException,
- uno::RuntimeException, std::exception) override
+ beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override
{
for( int i = 0; i < m_aSeq.getLength(); ++i )
if( aName == m_aSeq[i].Name )
@@ -440,8 +392,7 @@ public:
throw beans::UnknownPropertyException();
}
- sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
- throw( uno::RuntimeException, std::exception ) override
+ sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override
{
for( int i = 0; i < m_aSeq.getLength(); ++i )
if( Name == m_aSeq[i].Name )
@@ -458,7 +409,6 @@ private:
// XPropertySet
uno::Reference< beans::XPropertySetInfo > SAL_CALL
ResultSetBase::getPropertySetInfo()
- throw( uno::RuntimeException, std::exception)
{
uno::Sequence< beans::Property > seq(2);
seq[0].Name = "RowCount";
@@ -479,11 +429,6 @@ ResultSetBase::getPropertySetInfo()
void SAL_CALL ResultSetBase::setPropertyValue(
const OUString& aPropertyName, const uno::Any& /*aValue*/ )
- throw( beans::UnknownPropertyException,
- beans::PropertyVetoException,
- lang::IllegalArgumentException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
if( aPropertyName == "IsRowCountFinal" ||
aPropertyName == "RowCount" )
@@ -495,9 +440,6 @@ void SAL_CALL ResultSetBase::setPropertyValue(
uno::Any SAL_CALL ResultSetBase::getPropertyValue(
const OUString& PropertyName )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
if( PropertyName == "IsRowCountFinal" )
{
@@ -516,9 +458,6 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
void SAL_CALL ResultSetBase::addPropertyChangeListener(
const OUString& aPropertyName,
const uno::Reference< beans::XPropertyChangeListener >& xListener )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
if( aPropertyName == "IsRowCountFinal" )
{
@@ -545,9 +484,6 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
void SAL_CALL ResultSetBase::removePropertyChangeListener(
const OUString& aPropertyName,
const uno::Reference< beans::XPropertyChangeListener >& aListener )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
if( aPropertyName == "IsRowCountFinal" &&
m_pIsFinalListeners )
@@ -569,9 +505,6 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
void SAL_CALL ResultSetBase::addVetoableChangeListener(
const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
}
@@ -579,9 +512,6 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener(
void SAL_CALL ResultSetBase::removeVetoableChangeListener(
const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
}
@@ -589,8 +519,6 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener(
// XResultSetMetaDataSupplier
uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
ResultSetBase::getMetaData()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
::ucbhelper::ResultSetMetaData* p =
new ::ucbhelper::ResultSetMetaData( m_xContext, m_sProperty );
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 1b083eea9f38..93bcc8b6a6b6 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -58,8 +58,7 @@ namespace ftp {
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type& aType )
- throw( css::uno::RuntimeException, std::exception) override;
+ queryInterface( const css::uno::Type& aType ) override;
virtual void SAL_CALL
acquire()
@@ -71,24 +70,19 @@ namespace ftp {
// XComponent
virtual void SAL_CALL
- dispose()
- throw( css::uno::RuntimeException, std::exception ) override;
+ dispose() override;
virtual void SAL_CALL
addEventListener(
- const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
virtual void SAL_CALL
- removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XRow
virtual sal_Bool SAL_CALL
- wasNull()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ wasNull() override
{
if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
m_nWasNull = m_aItems[m_nRow]->wasNull();
@@ -98,9 +92,7 @@ namespace ftp {
}
virtual OUString SAL_CALL
- getString( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getString( sal_Int32 columnIndex ) override
{
OUString ret;
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -110,9 +102,7 @@ namespace ftp {
}
virtual sal_Bool SAL_CALL
- getBoolean( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getBoolean( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getBoolean( columnIndex );
@@ -121,9 +111,7 @@ namespace ftp {
}
virtual sal_Int8 SAL_CALL
- getByte( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getByte( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getByte( columnIndex );
@@ -132,10 +120,7 @@ namespace ftp {
}
virtual sal_Int16 SAL_CALL
- getShort( sal_Int32 columnIndex )
- throw(
- css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getShort( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getShort( columnIndex );
@@ -144,9 +129,7 @@ namespace ftp {
}
virtual sal_Int32 SAL_CALL
- getInt( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ getInt( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getInt( columnIndex );
@@ -155,9 +138,7 @@ namespace ftp {
}
virtual sal_Int64 SAL_CALL
- getLong( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getLong( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getLong( columnIndex );
@@ -166,9 +147,7 @@ namespace ftp {
}
virtual float SAL_CALL
- getFloat( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ getFloat( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getFloat( columnIndex );
@@ -177,9 +156,7 @@ namespace ftp {
}
virtual double SAL_CALL
- getDouble( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ getDouble( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getDouble( columnIndex );
@@ -188,9 +165,7 @@ namespace ftp {
}
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getBytes( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ getBytes( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getBytes( columnIndex );
@@ -199,9 +174,7 @@ namespace ftp {
}
virtual css::util::Date SAL_CALL
- getDate( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getDate( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getDate( columnIndex );
@@ -210,9 +183,7 @@ namespace ftp {
}
virtual css::util::Time SAL_CALL
- getTime( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getTime( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getTime( columnIndex );
@@ -221,9 +192,7 @@ namespace ftp {
}
virtual css::util::DateTime SAL_CALL
- getTimestamp( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getTimestamp( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getTimestamp( columnIndex );
@@ -233,9 +202,7 @@ namespace ftp {
virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
- getBinaryStream( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getBinaryStream( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getBinaryStream( columnIndex );
@@ -244,9 +211,7 @@ namespace ftp {
}
virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
- getCharacterStream( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getCharacterStream( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getCharacterStream( columnIndex );
@@ -256,9 +221,7 @@ namespace ftp {
virtual css::uno::Any SAL_CALL
getObject( sal_Int32 columnIndex,
- const css::uno::Reference< css::container::XNameAccess >& typeMap )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ const css::uno::Reference< css::container::XNameAccess >& typeMap ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getObject( columnIndex,typeMap );
@@ -267,9 +230,7 @@ namespace ftp {
}
virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
- getRef( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getRef( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getRef( columnIndex );
@@ -278,9 +239,7 @@ namespace ftp {
}
virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
- getBlob( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getBlob( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getBlob( columnIndex );
@@ -289,9 +248,7 @@ namespace ftp {
}
virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
- getClob( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getClob( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getClob( columnIndex );
@@ -300,9 +257,7 @@ namespace ftp {
}
virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
- getArray( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getArray( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
return m_aItems[m_nRow]->getArray( columnIndex );
@@ -315,177 +270,113 @@ namespace ftp {
// XResultSet
virtual sal_Bool SAL_CALL
- next()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ next() override;
virtual sal_Bool SAL_CALL
- isBeforeFirst()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ isBeforeFirst() override;
virtual sal_Bool SAL_CALL
- isAfterLast()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ isAfterLast() override;
virtual sal_Bool SAL_CALL
- isFirst()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ isFirst() override;
virtual sal_Bool SAL_CALL
- isLast()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ isLast() override;
virtual void SAL_CALL
- beforeFirst()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ beforeFirst() override;
virtual void SAL_CALL
- afterLast()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ afterLast() override;
virtual sal_Bool SAL_CALL
- first()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ first() override;
virtual sal_Bool SAL_CALL
- last()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ last() override;
virtual sal_Int32 SAL_CALL
- getRow()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ getRow() override;
virtual sal_Bool SAL_CALL
absolute(
- sal_Int32 row )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Int32 row ) override;
virtual sal_Bool SAL_CALL
relative(
- sal_Int32 rows )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Int32 rows ) override;
virtual sal_Bool SAL_CALL
- previous()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ previous() override;
virtual void SAL_CALL
- refreshRow()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ refreshRow() override;
virtual sal_Bool SAL_CALL
- rowUpdated()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ rowUpdated() override;
virtual sal_Bool SAL_CALL
- rowInserted()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ rowInserted() override;
virtual sal_Bool SAL_CALL
- rowDeleted()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ rowDeleted() override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- getStatement()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ getStatement() override;
// XCloseable
virtual void SAL_CALL
- close()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ close() override;
// XContentAccess
virtual OUString SAL_CALL
- queryContentIdentifierString()
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryContentIdentifierString() override;
virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
- queryContentIdentifier()
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryContentIdentifier() override;
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
- queryContent()
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryContent() override;
// XResultSetMetaDataSupplier
virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
- getMetaData()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ getMetaData() override;
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo()
- throw( css::uno::RuntimeException, std::exception) override;
+ getPropertySetInfo() 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) override;
+ const css::uno::Any& aValue ) override;
virtual css::uno::Any SAL_CALL
getPropertyValue(
- const OUString& PropertyName )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const OUString& PropertyName ) override;
virtual void SAL_CALL
addPropertyChangeListener(
const OUString& aPropertyName,
- const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
virtual void SAL_CALL
removePropertyChangeListener(
const OUString& aPropertyName,
- const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
virtual void SAL_CALL
addVetoableChangeListener(
const OUString& PropertyName,
- const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& PropertyName,
- const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
protected:
diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx
index 6c33c81a9b19..40c2872d6989 100644
--- a/ucb/source/ucp/ftp/ftpurl.cxx
+++ b/ucb/source/ucp/ftp/ftpurl.cxx
@@ -126,9 +126,6 @@ FTPURL::FTPURL(const FTPURL& r)
FTPURL::FTPURL(const OUString& url,
FTPContentProvider* pFCP)
- throw(
- malformed_exception
- )
: m_pFCP(pFCP),
m_aUsername("anonymous"),
m_bShowPassword(false),
@@ -144,9 +141,6 @@ FTPURL::~FTPURL()
void FTPURL::parse(const OUString& url)
- throw(
- malformed_exception
- )
{
OUString aPassword,aAccount;
OString aIdent(url.getStr(),
@@ -385,7 +379,6 @@ namespace ftp {
urlParAscii.getStr());
oslFileHandle FTPURL::open()
- throw(curl_exception, std::exception)
{
if(m_aPathSegmentVec.empty())
throw curl_exception(CURLE_FTP_COULDNT_RETR_FILE);
@@ -425,9 +418,6 @@ oslFileHandle FTPURL::open()
std::vector<FTPDirentry> FTPURL::list(
sal_Int16 nMode
) const
- throw(
- curl_exception
- )
{
CURL *curl = m_pFCP->handle();
@@ -512,7 +502,6 @@ std::vector<FTPDirentry> FTPURL::list(
OUString FTPURL::net_title() const
- throw(curl_exception, std::exception)
{
CURL *curl = m_pFCP->handle();
@@ -592,7 +581,6 @@ OUString FTPURL::net_title() const
FTPDirentry FTPURL::direntry() const
- throw (curl_exception, malformed_exception, std::exception)
{
OUString nettitle = net_title();
FTPDirentry aDirentry;
@@ -638,7 +626,6 @@ extern "C" {
void FTPURL::insert(bool replaceExisting,void* stream) const
- throw(curl_exception)
{
if(!replaceExisting) {
// FTPDirentry aDirentry(direntry());
@@ -670,7 +657,6 @@ void FTPURL::insert(bool replaceExisting,void* stream) const
void FTPURL::mkdir(bool ReplaceExisting) const
- throw (curl_exception, malformed_exception, std::exception)
{
OString title;
if(!m_aPathSegmentVec.empty()) {
@@ -720,7 +706,6 @@ void FTPURL::mkdir(bool ReplaceExisting) const
OUString FTPURL::ren(const OUString& NewTitle)
- throw(curl_exception, std::exception)
{
CURL *curl = m_pFCP->handle();
@@ -763,7 +748,6 @@ OUString FTPURL::ren(const OUString& NewTitle)
void FTPURL::del() const
- throw(curl_exception, malformed_exception, std::exception)
{
FTPDirentry aDirentry(direntry());
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index cedd41211976..a0bdf0abb281 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -85,7 +85,7 @@ namespace ftp {
FTPURL(
const OUString& aIdent,
FTPContentProvider* pFCP
- ) throw (malformed_exception);
+ );
FTPURL(const FTPURL& r);
@@ -115,36 +115,30 @@ namespace ftp {
OUString child() const;
/// @throws curl_exception
- std::vector<FTPDirentry> list(sal_Int16 nMode) const
- throw(curl_exception);
+ std::vector<FTPDirentry> list(sal_Int16 nMode) const;
// returns a pointer to an open tempfile,
// sought to the beginning of.
/// @throws curl_exception
- oslFileHandle open() throw(curl_exception, std::exception);
+ oslFileHandle open();
/// @throws curl_exception
/// @throws malformed_exception
- FTPDirentry direntry() const
- throw(curl_exception, malformed_exception, std::exception);
+ FTPDirentry direntry() const;
/// @throws curl_exception
- void insert(bool ReplaceExisting,void* stream) const
- throw(curl_exception);
+ void insert(bool ReplaceExisting,void* stream) const;
/// @throws curl_exception
/// @throws malformed_exception
- void mkdir(bool ReplaceExisting) const
- throw(curl_exception, malformed_exception, std::exception);
+ void mkdir(bool ReplaceExisting) const;
/// @throws curl_exception
- OUString ren(const OUString& NewTitle)
- throw(curl_exception, std::exception);
+ OUString ren(const OUString& NewTitle);
/// @throws curl_exception
/// @throws malformed_exception
- void del() const
- throw(curl_exception, malformed_exception, std::exception);
+ void del() const;
private:
@@ -162,13 +156,10 @@ namespace ftp {
std::vector<OUString> m_aPathSegmentVec;
/// @throws malformed_exception
- void parse(const OUString& url)
- throw(
- malformed_exception
- );
+ void parse(const OUString& url);
/// @throws curl_exception
- OUString net_title() const throw(curl_exception, std::exception);
+ OUString net_title() const;
};
}
generated by cgit (git 2.34.1) at 2024-06-30 09:20:11 +0000