summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/tdoc
diff options
context:
space:
mode:
Diffstat (limited to 'ucb/source/ucp/tdoc')
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.cxx34
-rw-r--r--ucb/source/ucp/tdoc/tdoc_content.hxx70
-rw-r--r--ucb/source/ucp/tdoc/tdoc_datasupplier.cxx1
-rw-r--r--ucb/source/ucp/tdoc/tdoc_datasupplier.hxx3
-rw-r--r--ucb/source/ucp/tdoc/tdoc_docmgr.cxx6
-rw-r--r--ucb/source/ucp/tdoc/tdoc_docmgr.hxx16
-rw-r--r--ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx5
-rw-r--r--ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx13
-rw-r--r--ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx24
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.cxx8
-rw-r--r--ucb/source/ucp/tdoc/tdoc_provider.hxx38
-rw-r--r--ucb/source/ucp/tdoc/tdoc_stgelems.cxx158
-rw-r--r--ucb/source/ucp/tdoc/tdoc_stgelems.hxx266
-rw-r--r--ucb/source/ucp/tdoc/tdoc_storage.cxx41
-rw-r--r--ucb/source/ucp/tdoc/tdoc_storage.hxx57
15 files changed, 109 insertions, 631 deletions
diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx
index 189d8d7365ce..5b5e5ec9f506 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.cxx
@@ -183,7 +183,6 @@ void SAL_CALL Content::release()
// virtual
uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
- throw ( uno::RuntimeException, std::exception )
{
uno::Any aRet = ContentImplHelper::queryInterface( rType );
@@ -210,7 +209,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
// virtual
uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
- throw( uno::RuntimeException, std::exception )
{
cppu::OTypeCollection * pCollection = nullptr;
@@ -289,7 +287,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
// virtual
OUString SAL_CALL Content::getImplementationName()
- throw( uno::RuntimeException, std::exception )
{
return OUString( "com.sun.star.comp.ucb.TransientDocumentsContent" );
}
@@ -297,7 +294,6 @@ OUString SAL_CALL Content::getImplementationName()
// virtual
uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
- throw( uno::RuntimeException, std::exception )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -321,7 +317,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
// virtual
OUString SAL_CALL Content::getContentType()
- throw( uno::RuntimeException, std::exception )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
return m_aProps.getContentType();
@@ -331,7 +326,6 @@ OUString SAL_CALL Content::getContentType()
// virtual
uno::Reference< ucb::XContentIdentifier > SAL_CALL
Content::getIdentifier()
- throw( uno::RuntimeException, std::exception )
{
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -355,9 +349,6 @@ uno::Any SAL_CALL Content::execute(
const ucb::Command& aCommand,
sal_Int32 /*CommandId*/,
const uno::Reference< ucb::XCommandEnvironment >& Environment )
- throw( uno::Exception,
- ucb::CommandAbortedException,
- uno::RuntimeException, std::exception )
{
uno::Any aRet;
@@ -649,7 +640,6 @@ uno::Any SAL_CALL Content::execute(
// virtual
void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
- throw( uno::RuntimeException, std::exception )
{
}
@@ -660,7 +650,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
// virtual
uno::Sequence< ucb::ContentInfo > SAL_CALL
Content::queryCreatableContentsInfo()
- throw( uno::RuntimeException, std::exception )
{
return m_aProps.getCreatableContentsInfo();
}
@@ -669,7 +658,6 @@ Content::queryCreatableContentsInfo()
// virtual
uno::Reference< ucb::XContent > SAL_CALL
Content::createNewContent( const ucb::ContentInfo& Info )
- throw( uno::RuntimeException, std::exception )
{
if ( m_aProps.isContentCreator() )
{
@@ -1108,7 +1096,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
uno::Sequence< uno::Any > Content::setPropertyValues(
const uno::Sequence< beans::PropertyValue >& rValues,
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
- throw( uno::Exception, std::exception )
{
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
@@ -1384,7 +1371,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
uno::Any Content::open(
const ucb::OpenCommandArgument2& rArg,
const uno::Reference< ucb::XCommandEnvironment >& xEnv )
- throw( uno::Exception )
{
if ( rArg.Mode == ucb::OpenMode::ALL ||
rArg.Mode == ucb::OpenMode::FOLDERS ||
@@ -1568,7 +1554,6 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
sal_Int32 nNameClashResolve,
const uno::Reference<
ucb::XCommandEnvironment > & xEnv )
- throw( uno::Exception )
{
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
@@ -1740,7 +1725,6 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData,
void Content::destroy( bool bDeletePhysical,
const uno::Reference<
ucb::XCommandEnvironment > & xEnv )
- throw( uno::Exception, std::exception )
{
// @@@ take care about bDeletePhysical -> trashcan support
@@ -1889,7 +1873,6 @@ void Content::notifyChildInserted( const OUString & rRelativeChildUri )
void Content::transfer(
const ucb::TransferInfo& rInfo,
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
- throw( uno::Exception, std::exception )
{
osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex );
@@ -2329,9 +2312,6 @@ bool Content::loadData( ContentProvider* pProvider,
bool Content::storeData( const uno::Reference< io::XInputStream >& xData,
const uno::Reference<
ucb::XCommandEnvironment >& xEnv )
- throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest,
- css::uno::RuntimeException )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
@@ -2726,8 +2706,6 @@ static OUString obtainPassword(
const OUString & rName,
task::PasswordRequestMode eMode,
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
- throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest )
{
rtl::Reference< DocumentPasswordRequest > xRequest
= new DocumentPasswordRequest( eMode, rName );
@@ -2781,9 +2759,6 @@ static OUString obtainPassword(
uno::Reference< io::XInputStream > Content::getInputStream(
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
- throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest,
- uno::RuntimeException )
{
OUString aUri;
OUString aPassword;
@@ -2827,9 +2802,6 @@ static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream(
const OUString & rUri,
ContentProvider * pProvider,
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
- throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest,
- uno::RuntimeException )
{
OUString aPassword;
bool bPasswordRequested = false;
@@ -2858,9 +2830,6 @@ static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream(
uno::Reference< io::XOutputStream > Content::getTruncatedOutputStream(
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
- throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest,
- css::uno::RuntimeException )
{
OSL_ENSURE( m_aProps.getType() == STREAM,
"Content::getTruncatedOutputStream - content is no stream!" );
@@ -2874,9 +2843,6 @@ uno::Reference< io::XOutputStream > Content::getTruncatedOutputStream(
uno::Reference< io::XStream > Content::getStream(
const uno::Reference< ucb::XCommandEnvironment > & xEnv )
- throw ( ucb::CommandFailedException,
- task::DocumentPasswordRequest,
- uno::RuntimeException )
{
osl::Guard< osl::Mutex > aGuard( m_aMutex );
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 45be23bc6bc3..25502ba5499b 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -124,10 +124,7 @@ private:
/// @throws css::task::DocumentPasswordRequest
/// @throws css::uno::RuntimeException
bool storeData( const css::uno::Reference< css::io::XInputStream >& xData,
- const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
- throw ( css::ucb::CommandFailedException,
- css::task::DocumentPasswordRequest,
- css::uno::RuntimeException );
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
void renameData( const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId,
const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId );
bool removeData();
@@ -150,30 +147,25 @@ private:
/// @throws css::uno::Exception
setPropertyValues(
const css::uno::Sequence< css::beans::PropertyValue >& rValues,
- const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
- throw( css::uno::Exception, std::exception );
+ const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
/// @throws css::uno::Exception
css::uno::Any
open( const css::ucb::OpenCommandArgument2& rArg,
- const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv )
- throw( css::uno::Exception );
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv );
/// @throws css::uno::Exception
void insert( const css::uno::Reference< css::io::XInputStream >& xData,
sal_Int32 nNameClashResolve,
- const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
- throw( css::uno::Exception );
+ const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
/// @throws css::uno::Exception
void destroy( bool bDeletePhysical,
- const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
- throw( css::uno::Exception, std::exception );
+ const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
/// @throws css::uno::Exception
void transfer( const css::ucb::TransferInfo& rInfo,
- const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
- throw( css::uno::Exception, std::exception );
+ const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
static css::uno::Reference< css::sdbc::XRow >
getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
@@ -193,20 +185,14 @@ private:
/// @throws css::task::DocumentPasswordRequest
/// @throws css::uno::RuntimeException
css::uno::Reference< css::io::XInputStream >
- getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
- throw ( css::ucb::CommandFailedException,
- css::task::DocumentPasswordRequest,
- css::uno::RuntimeException );
+ getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
/// @throws css::ucb::CommandFailedException
/// @throws css::task::DocumentPasswordRequest
/// @throws css::uno::RuntimeException
css::uno::Reference< css::io::XOutputStream >
getTruncatedOutputStream(
- const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
- throw ( css::ucb::CommandFailedException,
- css::task::DocumentPasswordRequest,
- css::uno::RuntimeException );
+ const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
css::uno::Reference< css::ucb::XContent >
queryChildContent( const OUString & rRelativeChildUri );
@@ -215,10 +201,7 @@ private:
/// @throws css::task::DocumentPasswordRequest
/// @throws css::uno::RuntimeException
css::uno::Reference< css::io::XStream >
- getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
- throw ( css::ucb::CommandFailedException,
- css::task::DocumentPasswordRequest,
- css::uno::RuntimeException );
+ getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
public:
// Create existing content. Fail, if not already exists.
@@ -237,46 +220,35 @@ public:
virtual ~Content() 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;
+ getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getSupportedServiceNames() override;
// XContent
virtual OUString SAL_CALL
- getContentType()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getContentType() override;
virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
- getIdentifier()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getIdentifier() 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;
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
virtual void SAL_CALL
- abort( sal_Int32 CommandId )
- throw( css::uno::RuntimeException, std::exception ) override;
+ abort( sal_Int32 CommandId ) override;
// Additional interfaces
@@ -284,11 +256,9 @@ public:
// 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;
// Non-interface methods.
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index c8213ae8e7f5..b9e4d3dae2db 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -378,7 +378,6 @@ void ResultSetDataSupplier::close()
// virtual
void ResultSetDataSupplier::validate()
- throw( ucb::ResultSetException )
{
if ( m_pImpl->m_bThrowException )
throw ucb::ResultSetException();
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
index a6cf5f1ba522..e83b48bd9a88 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
@@ -62,8 +62,7 @@ public:
virtual void close() override;
- virtual void validate()
- throw( css::ucb::ResultSetException ) override;
+ virtual void validate() override;
};
} // namespace tdoc_ucp
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
index 6994349dfdbe..cb1ffc7bfe07 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx
@@ -58,15 +58,12 @@ using namespace tdoc_ucp;
// virtual
void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::queryClosing(
const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ )
- throw ( util::CloseVetoException,
- uno::RuntimeException, std::exception )
{
}
void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosing(
const lang::EventObject& Source )
- throw ( uno::RuntimeException, std::exception )
{
if (!m_pManager) return; // disposed?
@@ -83,7 +80,6 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin
// virtual
void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing(
const lang::EventObject& /*Source*/ )
- throw ( uno::RuntimeException, std::exception )
{
}
@@ -171,7 +167,6 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc )
// virtual
void SAL_CALL OfficeDocumentsManager::documentEventOccured(
const document::DocumentEvent & Event )
- throw ( uno::RuntimeException, std::exception )
{
/*
Events documentation: OOo Developer's Guide / Writing UNO Components /
@@ -433,7 +428,6 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured(
// virtual
void SAL_CALL OfficeDocumentsManager::disposing(
const lang::EventObject& /*Source*/ )
- throw ( uno::RuntimeException, std::exception )
{
}
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index 7dd5a07459ec..7f21e4ce8658 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -71,18 +71,14 @@ namespace tdoc_ucp {
// util::XCloseListener
virtual void SAL_CALL queryClosing(
const css::lang::EventObject& Source,
- sal_Bool GetsOwnership )
- throw (css::util::CloseVetoException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Bool GetsOwnership ) override;
virtual void SAL_CALL notifyClosing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
// lang::XEventListener (base of util::XCloseListener)
virtual void SAL_CALL disposing(
- const css::lang::EventObject & Source )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ const css::lang::EventObject & Source ) override;
void Dispose() { m_pManager = nullptr; }
@@ -100,13 +96,11 @@ namespace tdoc_ucp {
// document::XDocumentEventListener
virtual void SAL_CALL documentEventOccured(
- const css::document::DocumentEvent & Event )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ const css::document::DocumentEvent & Event ) override;
// lang::XEventListener (base of document::XDocumentEventListener)
virtual void SAL_CALL disposing(
- const css::lang::EventObject & Source )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ const css::lang::EventObject & Source ) override;
// Non-interface
css::uno::Reference< css::embed::XStorage >
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
index b4a27a8951fb..0ec5fbfe00e3 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx
@@ -54,7 +54,6 @@ DocumentContentFactory::~DocumentContentFactory()
// virtual
OUString SAL_CALL DocumentContentFactory::getImplementationName()
- throw ( uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
@@ -62,7 +61,6 @@ OUString SAL_CALL DocumentContentFactory::getImplementationName()
// virtual
sal_Bool SAL_CALL
DocumentContentFactory::supportsService( const OUString& ServiceName )
- throw ( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
@@ -70,7 +68,6 @@ DocumentContentFactory::supportsService( const OUString& ServiceName )
// virtual
uno::Sequence< OUString > SAL_CALL
DocumentContentFactory::getSupportedServiceNames()
- throw ( uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
@@ -100,7 +97,6 @@ DocumentContentFactory::getSupportedServiceNames_Static()
uno::Reference< ucb::XContent > SAL_CALL
DocumentContentFactory::createDocumentContent(
const uno::Reference< frame::XModel >& Model )
- throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
{
uno::Reference< frame::XTransientDocumentsDocumentContentFactory > xDocFac;
try
@@ -129,7 +125,6 @@ DocumentContentFactory::createDocumentContent(
static uno::Reference< uno::XInterface > SAL_CALL
DocumentContentFactory_CreateInstance(
const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
- throw( uno::Exception )
{
lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >(
new DocumentContentFactory( rSMgr ) );
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
index 866c7a778c5f..61786dafb1ea 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
@@ -38,22 +38,17 @@ public:
virtual ~DocumentContentFactory() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL
- supportsService( const OUString& ServiceName )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ getSupportedServiceNames() override;
// XTransientDocumentsDocumentContentFactory
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
- createDocumentContent( const css::uno::Reference< css::frame::XModel >& Model )
- throw ( css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception ) override;
+ createDocumentContent( const css::uno::Reference< css::frame::XModel >& Model ) override;
// Non-UNO interfaces
static OUString
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
index 3e497f9a243b..439f60df4b34 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx
@@ -44,28 +44,22 @@ namespace tdoc_ucp
: InteractionContinuation( pRequest ) {}
// XInterface
- virtual uno::Any SAL_CALL queryInterface( const uno::Type & rType )
- throw ( uno::RuntimeException, std::exception ) override;
+ virtual uno::Any SAL_CALL queryInterface( const uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw () override;
virtual void SAL_CALL release()
throw () override;
// XTypeProvider
- virtual uno::Sequence< uno::Type > SAL_CALL getTypes()
- throw ( uno::RuntimeException, std::exception ) override;
- virtual uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw ( uno::RuntimeException, std::exception ) override;
+ virtual uno::Sequence< uno::Type > SAL_CALL getTypes() override;
+ virtual uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
// XInteractionContinuation
- virtual void SAL_CALL select()
- throw ( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL select() override;
// XInteractionPassword
- virtual void SAL_CALL setPassword( const OUString & aPasswd )
- throw ( uno::RuntimeException, std::exception ) override;
- virtual OUString SAL_CALL getPassword()
- throw ( uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL setPassword( const OUString & aPasswd ) override;
+ virtual OUString SAL_CALL getPassword() override;
private:
osl::Mutex m_aMutex;
@@ -99,7 +93,6 @@ void SAL_CALL InteractionSupplyPassword::release()
// virtual
uno::Any SAL_CALL
InteractionSupplyPassword::queryInterface( const uno::Type & rType )
- throw ( uno::RuntimeException, std::exception )
{
uno::Any aRet = cppu::queryInterface( rType,
static_cast< lang::XTypeProvider * >( this ),
@@ -117,7 +110,6 @@ InteractionSupplyPassword::queryInterface( const uno::Type & rType )
// virtual
uno::Sequence< sal_Int8 > SAL_CALL
InteractionSupplyPassword::getImplementationId()
- throw( uno::RuntimeException, std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
@@ -125,7 +117,6 @@ InteractionSupplyPassword::getImplementationId()
// virtual
uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes()
- throw( uno::RuntimeException, std::exception )
{
static cppu::OTypeCollection * pCollection = nullptr;
if ( !pCollection )
@@ -148,7 +139,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes()
// virtual
void SAL_CALL InteractionSupplyPassword::select()
- throw( uno::RuntimeException, std::exception )
{
recordSelection();
}
@@ -160,7 +150,6 @@ void SAL_CALL InteractionSupplyPassword::select()
// virtual
void SAL_CALL
InteractionSupplyPassword::setPassword( const OUString& aPasswd )
- throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
m_aPassword = aPasswd;
@@ -168,7 +157,6 @@ InteractionSupplyPassword::setPassword( const OUString& aPasswd )
// virtual
OUString SAL_CALL InteractionSupplyPassword::getPassword()
- throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
return m_aPassword;
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx
index 580a115e4a87..4c80a626035d 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx
@@ -77,7 +77,6 @@ void SAL_CALL ContentProvider::release()
}
css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< lang::XTypeProvider* >(this)),
@@ -105,7 +104,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider,
/// @throws css::uno::Exception
static css::uno::Reference< css::uno::XInterface > SAL_CALL
ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr )
- throw( css::uno::Exception )
{
css::lang::XServiceInfo* pX =
static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) ));
@@ -132,7 +130,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider );
uno::Reference< ucb::XContent > SAL_CALL
ContentProvider::queryContent(
const uno::Reference< ucb::XContentIdentifier >& Identifier )
- throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception )
{
Uri aUri( Identifier->getContentIdentifier() );
if ( !aUri.isValid() )
@@ -168,7 +165,6 @@ ContentProvider::queryContent(
uno::Reference< ucb::XContent > SAL_CALL
ContentProvider::createDocumentContent(
const uno::Reference< frame::XModel >& Model )
- throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception )
{
// model -> id -> content identifier -> queryContent
if ( m_xDocsMgr.is() )
@@ -403,7 +399,6 @@ ContentProvider::queryStorageClone( const OUString & rUri ) const
uno::Reference< io::XInputStream >
ContentProvider::queryInputStream( const OUString & rUri,
const OUString & rPassword ) const
- throw ( packages::WrongPasswordException, css::uno::RuntimeException )
{
if ( m_xStgElemFac.is() )
{
@@ -441,8 +436,6 @@ uno::Reference< io::XOutputStream >
ContentProvider::queryOutputStream( const OUString & rUri,
const OUString & rPassword,
bool bTruncate ) const
- throw ( packages::WrongPasswordException,
- uno::RuntimeException )
{
if ( m_xStgElemFac.is() )
{
@@ -482,7 +475,6 @@ uno::Reference< io::XStream >
ContentProvider::queryStream( const OUString & rUri,
const OUString & rPassword,
bool bTruncate ) const
- throw ( packages::WrongPasswordException, uno::RuntimeException )
{
if ( m_xStgElemFac.is() )
{
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 5e70d04e044c..e99f79301e8e 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -60,26 +60,20 @@ public:
virtual ~ContentProvider() 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();
@@ -90,16 +84,12 @@ public:
// 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;
// XTransientDocumentsDocumentContentFactory
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
createDocumentContent( const css::uno::Reference<
- css::frame::XModel >& Model )
- throw ( css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception ) override;
+ css::frame::XModel >& Model ) override;
// Non-UNO interfaces
css::uno::Reference< css::embed::XStorage >
@@ -112,27 +102,21 @@ public:
/// @throws css::uno::RuntimeException
css::uno::Reference< css::io::XInputStream >
queryInputStream( const OUString & rUri,
- const OUString & rPassword ) const
- throw ( css::packages::WrongPasswordException,
- css::uno::RuntimeException );
+ const OUString & rPassword ) const;
/// @throws css::packages::WrongPasswordException
/// @throws css::uno::RuntimeException
css::uno::Reference< css::io::XOutputStream >
queryOutputStream( const OUString & rUri,
const OUString & rPassword,
- bool bTruncate ) const
- throw ( css::packages::WrongPasswordException,
- css::uno::RuntimeException );
+ bool bTruncate ) const;
/// @throws css::packages::WrongPasswordException
/// @throws css::uno::RuntimeException
css::uno::Reference< css::io::XStream >
queryStream( const OUString & rUri,
const OUString & rPassword,
- bool bTruncate ) const
- throw ( css::packages::WrongPasswordException,
- css::uno::RuntimeException );
+ bool bTruncate ) const;
bool queryNamesOfChildren(
const OUString & rUri,
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
index 4eb418dba25c..8046f938de2a 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx
@@ -146,7 +146,6 @@ Storage::~Storage()
// virtual
uno::Any SAL_CALL Storage::queryInterface( const uno::Type& aType )
- throw ( uno::RuntimeException, std::exception )
{
// First, try to use interfaces implemented by myself and base class(es)
uno::Any aRet = StorageUNOBase::queryInterface( aType );
@@ -187,7 +186,6 @@ void SAL_CALL Storage::release()
// virtual
uno::Sequence< uno::Type > SAL_CALL Storage::getTypes()
- throw ( uno::RuntimeException, std::exception )
{
return m_xWrappedTypeProv->getTypes();
}
@@ -195,7 +193,6 @@ uno::Sequence< uno::Type > SAL_CALL Storage::getTypes()
// virtual
uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId()
- throw ( uno::RuntimeException, std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
@@ -206,7 +203,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId()
// virtual
void SAL_CALL Storage::dispose()
- throw ( uno::RuntimeException, std::exception )
{
m_xWrappedStorage->dispose();
}
@@ -215,7 +211,6 @@ void SAL_CALL Storage::dispose()
// virtual
void SAL_CALL Storage::addEventListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
m_xWrappedStorage->addEventListener( xListener );
}
@@ -223,7 +218,6 @@ void SAL_CALL Storage::addEventListener(
// virtual
void SAL_CALL Storage::removeEventListener(
const uno::Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_xWrappedStorage->removeEventListener( aListener );
}
@@ -234,7 +228,6 @@ void SAL_CALL Storage::removeEventListener(
// virtual
uno::Type SAL_CALL Storage::getElementType()
- throw ( uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->getElementType();
}
@@ -242,7 +235,6 @@ uno::Type SAL_CALL Storage::getElementType()
// virtual
sal_Bool SAL_CALL Storage::hasElements()
- throw ( uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->hasElements();
}
@@ -253,9 +245,6 @@ sal_Bool SAL_CALL Storage::hasElements()
// virtual
uno::Any SAL_CALL Storage::getByName( const OUString& aName )
- throw ( container::NoSuchElementException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->getByName( aName );
}
@@ -263,7 +252,6 @@ uno::Any SAL_CALL Storage::getByName( const OUString& aName )
// virtual
uno::Sequence< OUString > SAL_CALL Storage::getElementNames()
- throw ( uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->getElementNames();
}
@@ -271,7 +259,6 @@ uno::Sequence< OUString > SAL_CALL Storage::getElementNames()
// virtual
sal_Bool SAL_CALL Storage::hasByName( const OUString& aName )
- throw ( uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->hasByName( aName );
}
@@ -283,11 +270,6 @@ sal_Bool SAL_CALL Storage::hasByName( const OUString& aName )
// virtual
void SAL_CALL Storage::copyToStorage(
const uno::Reference< embed::XStorage >& xDest )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
m_xWrappedStorage->copyToStorage( xDest );
}
@@ -296,12 +278,6 @@ void SAL_CALL Storage::copyToStorage(
// virtual
uno::Reference< io::XStream > SAL_CALL Storage::openStreamElement(
const OUString& aStreamName, sal_Int32 nOpenMode )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->openStreamElement( aStreamName, nOpenMode );
}
@@ -312,13 +288,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement(
const OUString& aStreamName,
sal_Int32 nOpenMode,
const OUString& aPassword )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::NoEncryptionException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->openEncryptedStreamElement(
aStreamName, nOpenMode, aPassword );
@@ -328,11 +297,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement(
// virtual
uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement(
const OUString& aStorName, sal_Int32 nOpenMode )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->openStorageElement( aStorName, nOpenMode );
}
@@ -341,12 +305,6 @@ uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement(
// virtual
uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement(
const OUString& aStreamName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->cloneStreamElement( aStreamName );
}
@@ -356,13 +314,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement(
uno::Reference< io::XStream > SAL_CALL Storage::cloneEncryptedStreamElement(
const OUString& aStreamName,
const OUString& aPassword )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::NoEncryptionException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->cloneEncryptedStreamElement( aStreamName,
aPassword );
@@ -372,11 +323,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneEncryptedStreamElement(
// virtual
void SAL_CALL Storage::copyLastCommitTo(
const uno::Reference< embed::XStorage >& xTargetStorage )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception)
{
m_xWrappedStorage->copyLastCommitTo( xTargetStorage );
}
@@ -386,11 +332,6 @@ void SAL_CALL Storage::copyLastCommitTo(
void SAL_CALL Storage::copyStorageElementLastCommitTo(
const OUString& aStorName,
const uno::Reference< embed::XStorage >& xTargetStorage )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception)
{
m_xWrappedStorage->copyStorageElementLastCommitTo( aStorName, xTargetStorage );
}
@@ -399,10 +340,6 @@ void SAL_CALL Storage::copyStorageElementLastCommitTo(
// virtual
sal_Bool SAL_CALL Storage::isStreamElement(
const OUString& aElementName )
- throw ( container::NoSuchElementException,
- lang::IllegalArgumentException,
- embed::InvalidStorageException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->isStreamElement( aElementName );
}
@@ -411,10 +348,6 @@ sal_Bool SAL_CALL Storage::isStreamElement(
// virtual
sal_Bool SAL_CALL Storage::isStorageElement(
const OUString& aElementName )
- throw ( container::NoSuchElementException,
- lang::IllegalArgumentException,
- embed::InvalidStorageException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedStorage->isStorageElement( aElementName );
}
@@ -422,12 +355,6 @@ sal_Bool SAL_CALL Storage::isStorageElement(
// virtual
void SAL_CALL Storage::removeElement( const OUString& aElementName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- container::NoSuchElementException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
m_xWrappedStorage->removeElement( aElementName );
}
@@ -436,13 +363,6 @@ void SAL_CALL Storage::removeElement( const OUString& aElementName )
// virtual
void SAL_CALL Storage::renameElement( const OUString& aEleName,
const OUString& aNewName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- container::NoSuchElementException,
- container::ElementExistException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
m_xWrappedStorage->renameElement( aEleName, aNewName );
}
@@ -453,13 +373,6 @@ void SAL_CALL Storage::copyElementTo(
const OUString& aElementName,
const uno::Reference< embed::XStorage >& xDest,
const OUString& aNewName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- container::NoSuchElementException,
- container::ElementExistException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
m_xWrappedStorage->copyElementTo( aElementName, xDest, aNewName );
}
@@ -470,13 +383,6 @@ void SAL_CALL Storage::moveElementTo(
const OUString& aElementName,
const uno::Reference< embed::XStorage >& xDest,
const OUString& rNewName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- container::NoSuchElementException,
- container::ElementExistException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
m_xWrappedStorage->moveElementTo( aElementName, xDest, rNewName );
}
@@ -487,9 +393,6 @@ void SAL_CALL Storage::moveElementTo(
// virtual
void SAL_CALL Storage::commit()
- throw ( io::IOException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
// Never commit a root storage (-> has no parent)!
// Would lead in writing the whole document to disk.
@@ -519,9 +422,6 @@ void SAL_CALL Storage::commit()
// virtual
void SAL_CALL Storage::revert()
- throw ( io::IOException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
uno::Reference< embed::XStorage > xParentStorage = getParentStorage();
if ( xParentStorage.is() )
@@ -614,7 +514,6 @@ OutputStream::~OutputStream()
// virtual
uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType )
- throw ( uno::RuntimeException, std::exception )
{
uno::Any aRet = OutputStreamUNOBase::queryInterface( aType );
@@ -633,7 +532,6 @@ uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType )
// virtual
uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes()
- throw ( uno::RuntimeException, std::exception )
{
return m_xWrappedTypeProv->getTypes();
}
@@ -641,7 +539,6 @@ uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes()
// virtual
uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId()
- throw ( uno::RuntimeException, std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
@@ -653,10 +550,6 @@ uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId()
// virtual
void SAL_CALL
OutputStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
- throw ( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
m_xWrappedStream->writeBytes( aData );
}
@@ -665,10 +558,6 @@ OutputStream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
// virtual
void SAL_CALL
OutputStream::flush()
- throw ( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
m_xWrappedStream->flush();
}
@@ -677,10 +566,6 @@ OutputStream::flush()
// virtual
void SAL_CALL
OutputStream::closeOutput( )
- throw ( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
m_xWrappedStream->closeOutput();
@@ -696,7 +581,6 @@ OutputStream::closeOutput( )
// virtual
void SAL_CALL
OutputStream::dispose()
- throw ( uno::RuntimeException, std::exception )
{
m_xWrappedComponent->dispose();
@@ -710,7 +594,6 @@ OutputStream::dispose()
void SAL_CALL
OutputStream::addEventListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
m_xWrappedComponent->addEventListener( xListener );
}
@@ -720,7 +603,6 @@ OutputStream::addEventListener(
void SAL_CALL
OutputStream::removeEventListener(
const uno::Reference< lang::XEventListener >& aListener )
- throw ( uno::RuntimeException, std::exception )
{
m_xWrappedComponent->removeEventListener( aListener );
}
@@ -797,7 +679,6 @@ Stream::~Stream()
// virtual
uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType )
- throw ( uno::RuntimeException, std::exception )
{
uno::Any aRet = StreamUNOBase::queryInterface( aType );
@@ -816,7 +697,6 @@ uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType )
// virtual
uno::Sequence< uno::Type > SAL_CALL Stream::getTypes()
- throw ( uno::RuntimeException, std::exception )
{
return m_xWrappedTypeProv->getTypes();
}
@@ -824,7 +704,6 @@ uno::Sequence< uno::Type > SAL_CALL Stream::getTypes()
// virtual
uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId()
- throw ( uno::RuntimeException, std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
@@ -835,7 +714,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId()
// virtual
uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream()
- throw( uno::RuntimeException, std::exception )
{
return uno::Reference< io::XInputStream >( this );
}
@@ -843,7 +721,6 @@ uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream()
// virtual
uno::Reference< io::XOutputStream > SAL_CALL Stream::getOutputStream()
- throw( uno::RuntimeException, std::exception )
{
return uno::Reference< io::XOutputStream >( this );
}
@@ -854,10 +731,6 @@ uno::Reference< io::XOutputStream > SAL_CALL Stream::getOutputStream()
// virtual
void SAL_CALL Stream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
if ( m_xWrappedOutputStream.is() )
{
@@ -869,10 +742,6 @@ void SAL_CALL Stream::writeBytes( const uno::Sequence< sal_Int8 >& aData )
// virtual
void SAL_CALL Stream::flush()
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
if ( m_xWrappedOutputStream.is() )
{
@@ -884,9 +753,6 @@ void SAL_CALL Stream::flush()
// virtual
void SAL_CALL Stream::closeOutput()
- throw( io::NotConnectedException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
if ( m_xWrappedOutputStream.is() )
{
@@ -905,8 +771,6 @@ void SAL_CALL Stream::closeOutput()
// virtual
void SAL_CALL Stream::truncate()
- throw( io::IOException,
- uno::RuntimeException, std::exception )
{
if ( m_xWrappedTruncate.is() )
{
@@ -922,10 +786,6 @@ void SAL_CALL Stream::truncate()
// virtual
sal_Int32 SAL_CALL Stream::readBytes( uno::Sequence< sal_Int8 >& aData,
sal_Int32 nBytesToRead )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedInputStream->readBytes( aData, nBytesToRead );
}
@@ -934,10 +794,6 @@ sal_Int32 SAL_CALL Stream::readBytes( uno::Sequence< sal_Int8 >& aData,
// virtual
sal_Int32 SAL_CALL Stream::readSomeBytes( uno::Sequence< sal_Int8 >& aData,
sal_Int32 nMaxBytesToRead )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedInputStream->readSomeBytes( aData, nMaxBytesToRead );
}
@@ -945,10 +801,6 @@ sal_Int32 SAL_CALL Stream::readSomeBytes( uno::Sequence< sal_Int8 >& aData,
// virtual
void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
m_xWrappedInputStream->skipBytes( nBytesToSkip );
}
@@ -956,9 +808,6 @@ void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip )
// virtual
sal_Int32 SAL_CALL Stream::available()
- throw( io::NotConnectedException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
return m_xWrappedInputStream->available();
}
@@ -966,9 +815,6 @@ sal_Int32 SAL_CALL Stream::available()
// virtual
void SAL_CALL Stream::closeInput()
- throw( io::NotConnectedException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
m_xWrappedInputStream->closeInput();
}
@@ -979,7 +825,6 @@ void SAL_CALL Stream::closeInput()
// virtual
void SAL_CALL Stream::dispose()
- throw ( uno::RuntimeException, std::exception )
{
m_xWrappedComponent->dispose();
@@ -992,7 +837,6 @@ void SAL_CALL Stream::dispose()
// virtual
void SAL_CALL Stream::addEventListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
m_xWrappedComponent->addEventListener( xListener );
}
@@ -1001,7 +845,6 @@ void SAL_CALL Stream::addEventListener(
// virtual
void SAL_CALL Stream::removeEventListener(
const uno::Reference< lang::XEventListener >& aListener )
- throw ( uno::RuntimeException, std::exception )
{
m_xWrappedComponent->removeEventListener( aListener );
}
@@ -1011,7 +854,6 @@ void SAL_CALL Stream::removeEventListener(
void Stream::commitChanges()
- throw( io::IOException )
{
uno::Reference< embed::XTransactedObject >
xParentTA( getParentStorage(), uno::UNO_QUERY );
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 33f8302ba8d9..28994800424b 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -83,8 +83,7 @@ public:
// XInterface
virtual css::uno::Any SAL_CALL queryInterface(
- const css::uno::Type& aType )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Type& aType ) override;
virtual void SAL_CALL acquire()
throw () override;
virtual void SAL_CALL release()
@@ -93,178 +92,79 @@ public:
// XTypeProvider (implemnented by base, but needs to be overridden for
// delegating to aggregate)
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;
// XComponent ( one of XStorage bases )
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;
+ addEventListener( 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;
// XNameAccess ( one of XStorage bases )
virtual css::uno::Any SAL_CALL
- getByName( const OUString& aName )
- throw ( css::container::NoSuchElementException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ getByName( const OUString& aName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getElementNames()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ getElementNames() override;
virtual sal_Bool SAL_CALL
- hasByName( const OUString& aName )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ hasByName( const OUString& aName ) override;
// XElementAccess (base of XNameAccess)
virtual css::uno::Type SAL_CALL
- getElementType()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ getElementType() override;
virtual sal_Bool SAL_CALL
- hasElements()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ hasElements() override;
// XStorage
virtual void SAL_CALL
- copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) override;
virtual css::uno::Reference< css::io::XStream > SAL_CALL
openStreamElement( const OUString& aStreamName,
- sal_Int32 nOpenMode )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::packages::WrongPasswordException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ sal_Int32 nOpenMode ) override;
virtual css::uno::Reference< css::io::XStream > SAL_CALL
openEncryptedStreamElement( const OUString& aStreamName,
sal_Int32 nOpenMode,
- const OUString& aPassword )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::packages::NoEncryptionException,
- css::packages::WrongPasswordException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const OUString& aPassword ) override;
virtual css::uno::Reference< css::embed::XStorage > SAL_CALL
openStorageElement( const OUString& aStorName,
- sal_Int32 nOpenMode )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ sal_Int32 nOpenMode ) override;
virtual css::uno::Reference< css::io::XStream > SAL_CALL
- cloneStreamElement( const OUString& aStreamName )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::packages::WrongPasswordException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ cloneStreamElement( const OUString& aStreamName ) override;
virtual css::uno::Reference< css::io::XStream > SAL_CALL
cloneEncryptedStreamElement( const OUString& aStreamName,
- const OUString& aPassword )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::packages::NoEncryptionException,
- css::packages::WrongPasswordException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const OUString& aPassword ) override;
virtual void SAL_CALL
copyLastCommitTo( const css::uno::Reference<
- css::embed::XStorage >& xTargetStorage )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ css::embed::XStorage >& xTargetStorage ) override;
virtual void SAL_CALL
copyStorageElementLastCommitTo( const OUString& aStorName,
const css::uno::Reference<
css::embed::XStorage > &
- xTargetStorage )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ xTargetStorage ) override;
virtual sal_Bool SAL_CALL
- isStreamElement( const OUString& aElementName )
- throw ( css::container::NoSuchElementException,
- css::lang::IllegalArgumentException,
- css::embed::InvalidStorageException,
- css::uno::RuntimeException, std::exception ) override;
+ isStreamElement( const OUString& aElementName ) override;
virtual sal_Bool SAL_CALL
- isStorageElement( const OUString& aElementName )
- throw ( css::container::NoSuchElementException,
- css::lang::IllegalArgumentException,
- css::embed::InvalidStorageException,
- css::uno::RuntimeException, std::exception ) override;
+ isStorageElement( const OUString& aElementName ) override;
virtual void SAL_CALL
- removeElement( const OUString& aElementName )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ removeElement( const OUString& aElementName ) override;
virtual void SAL_CALL
renameElement( const OUString& aEleName,
- const OUString& aNewName )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::container::ElementExistException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const OUString& aNewName ) override;
virtual void SAL_CALL
copyElementTo( const OUString& aElementName,
const css::uno::Reference< css::embed::XStorage >& xDest,
- const OUString& aNewName )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::container::ElementExistException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const OUString& aNewName ) override;
virtual void SAL_CALL
moveElementTo( const OUString& aElementName,
const css::uno::Reference< css::embed::XStorage >& xDest,
- const OUString& rNewName )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::container::ElementExistException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const OUString& rNewName ) override;
// XTransactedObject
- virtual void SAL_CALL commit()
- throw ( css::io::IOException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
- virtual void SAL_CALL revert()
- throw ( css::io::IOException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL commit() override;
+ virtual void SAL_CALL revert() override;
private:
rtl::Reference< StorageElementFactory > m_xFactory;
@@ -299,50 +199,32 @@ public:
// 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;
// XTypeProvider (implemnented by base, but needs to be overridden for
// delegating to aggregate)
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;
// XOutputStream
virtual void SAL_CALL
- writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
- throw ( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
virtual void SAL_CALL
- flush( )
- throw ( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ flush( ) override;
// Note: We need to intercept this one.
virtual void SAL_CALL
- closeOutput( )
- throw ( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ closeOutput( ) override;
// XComponent
// Note: We need to intercept this one.
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;
+ addEventListener( 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;
private:
css::uno::Reference<
@@ -376,106 +258,66 @@ public:
// 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;
// XTypeProvider (implemnented by base, but needs to be overridden for
// delegating to aggregate)
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;
// XStream
virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
- getInputStream()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getInputStream() override;
virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL
- getOutputStream()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getOutputStream() override;
// XOutputStream
virtual void SAL_CALL
- writeBytes( const css::uno::Sequence< sal_Int8 >& aData )
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
virtual void SAL_CALL
- flush()
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ flush() override;
virtual void SAL_CALL
- closeOutput()
- throw( css::io::NotConnectedException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ closeOutput() override;
// XTruncate
virtual void SAL_CALL
- truncate()
- throw( css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ truncate() override;
// XInputStream
virtual sal_Int32 SAL_CALL
readBytes( css::uno::Sequence< sal_Int8 >& aData,
- sal_Int32 nBytesToRead )
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ sal_Int32 nBytesToRead ) override;
virtual sal_Int32 SAL_CALL
readSomeBytes( css::uno::Sequence< sal_Int8 >& aData,
- sal_Int32 nMaxBytesToRead )
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nMaxBytesToRead ) override;
virtual void SAL_CALL
- skipBytes( sal_Int32 nBytesToSkip )
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ skipBytes( sal_Int32 nBytesToSkip ) override;
virtual sal_Int32 SAL_CALL
- available()
- throw( css::io::NotConnectedException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ available() override;
virtual void SAL_CALL
- closeInput()
- throw( css::io::NotConnectedException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ closeInput() override;
// XComponent
// Note: We need to intercept this one.
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;
+ addEventListener( 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;
private:
/// @throws css::io::IOException
- void commitChanges()
- throw( css::io::IOException );
+ void commitChanges();
css::uno::Reference<
css::uno::XAggregation > m_xAggProxy;
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx
index 8bba2180a939..a8055241522b 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx
@@ -56,8 +56,6 @@ StorageElementFactory::~StorageElementFactory()
uno::Reference< embed::XStorage >
StorageElementFactory::createTemporaryStorage()
- throw ( uno::Exception,
- uno::RuntimeException )
{
uno::Reference< embed::XStorage > xStorage;
uno::Reference< lang::XSingleServiceFactory > xStorageFac;
@@ -80,11 +78,6 @@ StorageElementFactory::createTemporaryStorage()
uno::Reference< embed::XStorage >
StorageElementFactory::createStorage( const OUString & rUri,
StorageAccessMode eMode )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -233,12 +226,6 @@ StorageElementFactory::createStorage( const OUString & rUri,
uno::Reference< io::XInputStream >
StorageElementFactory::createInputStream( const OUString & rUri,
const OUString & rPassword )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- packages::WrongPasswordException,
- uno::RuntimeException )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -263,12 +250,6 @@ uno::Reference< io::XOutputStream >
StorageElementFactory::createOutputStream( const OUString & rUri,
const OUString & rPassword,
bool bTruncate )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- packages::WrongPasswordException,
- uno::RuntimeException )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -308,12 +289,6 @@ uno::Reference< io::XStream >
StorageElementFactory::createStream( const OUString & rUri,
const OUString & rPassword,
bool bTruncate )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- packages::WrongPasswordException,
- uno::RuntimeException )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -358,11 +333,6 @@ void StorageElementFactory::releaseElement( Storage * pElement )
uno::Reference< embed::XStorage > StorageElementFactory::queryParentStorage(
const OUString & rUri, StorageAccessMode eMode )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException )
{
uno::Reference< embed::XStorage > xParentStorage;
@@ -384,11 +354,6 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage(
const uno::Reference< embed::XStorage > & xParentStorage,
const OUString & rUri,
StorageAccessMode eMode )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException )
{
uno::Reference< embed::XStorage > xStorage;
@@ -529,12 +494,6 @@ StorageElementFactory::queryStream(
const OUString & rPassword,
StorageAccessMode eMode,
bool bTruncate )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- packages::WrongPasswordException,
- uno::RuntimeException )
{
osl::MutexGuard aGuard( m_aMutex );
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx
index c47717a49623..15e315ee4d18 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx
@@ -51,9 +51,7 @@ namespace tdoc_ucp {
/// @throws css::uno::Exception
/// @throws css::uno::RuntimeException
css::uno::Reference< css::embed::XStorage >
- createTemporaryStorage()
- throw ( css::uno::Exception,
- css::uno::RuntimeException );
+ createTemporaryStorage();
/// @throws css::embed::InvalidStorageException
/// @throws css::lang::IllegalArgumentException
@@ -61,12 +59,7 @@ namespace tdoc_ucp {
/// @throws css::embed::StorageWrappedTargetException
/// @throws css::uno::RuntimeException
css::uno::Reference< css::embed::XStorage >
- createStorage( const OUString & rUri, StorageAccessMode eMode )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException );
+ createStorage( const OUString & rUri, StorageAccessMode eMode );
/// @throws css::embed::InvalidStorageException
/// @throws css::lang::IllegalArgumentException
@@ -76,13 +69,7 @@ namespace tdoc_ucp {
/// @throws css::uno::RuntimeException
css::uno::Reference< css::io::XInputStream >
createInputStream( const OUString & rUri,
- const OUString & rPassword )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::packages::WrongPasswordException,
- css::uno::RuntimeException );
+ const OUString & rPassword );
/// @throws css::embed::InvalidStorageException
/// @throws css::lang::IllegalArgumentException
@@ -93,13 +80,7 @@ namespace tdoc_ucp {
css::uno::Reference< css::io::XOutputStream >
createOutputStream( const OUString & rUri,
const OUString & rPassword,
- bool bTruncate )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::packages::WrongPasswordException,
- css::uno::RuntimeException );
+ bool bTruncate );
/// @throws css::embed::InvalidStorageException
/// @throws css::lang::IllegalArgumentException
@@ -110,13 +91,7 @@ namespace tdoc_ucp {
css::uno::Reference< css::io::XStream >
createStream( const OUString & rUri,
const OUString & rPassword,
- bool bTruncate )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::packages::WrongPasswordException,
- css::uno::RuntimeException );
+ bool bTruncate );
private:
friend class Storage;
@@ -130,12 +105,7 @@ namespace tdoc_ucp {
/// @throws css::uno::RuntimeException
css::uno::Reference< css::embed::XStorage >
queryParentStorage( const OUString & rUri,
- StorageAccessMode eMode )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException );
+ StorageAccessMode eMode );
/// @throws css::embed::InvalidStorageException
/// @throws css::lang::IllegalArgumentException
@@ -146,12 +116,7 @@ namespace tdoc_ucp {
queryStorage( const css::uno::Reference<
css::embed::XStorage > & xParentStorage,
const OUString & rUri,
- StorageAccessMode eMode )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException );
+ StorageAccessMode eMode );
/// @throws css::embed::InvalidStorageException
/// @throws css::lang::IllegalArgumentException
@@ -165,13 +130,7 @@ namespace tdoc_ucp {
const OUString & rPassword,
const OUString & rUri,
StorageAccessMode eMode,
- bool bTruncate /* ignored for read-only streams */ )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::packages::WrongPasswordException,
- css::uno::RuntimeException );
+ bool bTruncate /* ignored for read-only streams */ );
struct ltstrbool
{