summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
Diffstat (limited to 'svl')
-rw-r--r--svl/qa/unit/test_URIHelper.cxx30
-rw-r--r--svl/source/config/itemholder2.cxx1
-rw-r--r--svl/source/config/itemholder2.hxx3
-rw-r--r--svl/source/fsstor/fsfactory.cxx7
-rw-r--r--svl/source/fsstor/fsstorage.cxx134
-rw-r--r--svl/source/fsstor/fsstorage.hxx216
-rw-r--r--svl/source/fsstor/oinputstreamcontainer.cxx32
-rw-r--r--svl/source/fsstor/oinputstreamcontainer.hxx35
-rw-r--r--svl/source/fsstor/ostreamcontainer.cxx49
-rw-r--r--svl/source/fsstor/ostreamcontainer.hxx49
-rw-r--r--svl/source/inc/fsfactory.hxx10
-rw-r--r--svl/source/inc/passwordcontainer.hxx90
-rw-r--r--svl/source/items/itemprop.cxx17
-rw-r--r--svl/source/items/style.cxx2
-rw-r--r--svl/source/numbers/numfmuno.cxx68
-rw-r--r--svl/source/numbers/numfmuno.hxx188
-rw-r--r--svl/source/numbers/numuno.cxx4
-rw-r--r--svl/source/numbers/supservs.cxx16
-rw-r--r--svl/source/numbers/supservs.hxx18
-rw-r--r--svl/source/passwordcontainer/passwordcontainer.cxx61
-rw-r--r--svl/source/uno/pathservice.cxx21
21 files changed, 232 insertions, 819 deletions
diff --git a/svl/qa/unit/test_URIHelper.cxx b/svl/qa/unit/test_URIHelper.cxx
index 1a8e029519ef..70e6fcc69da4 100644
--- a/svl/qa/unit/test_URIHelper.cxx
+++ b/svl/qa/unit/test_URIHelper.cxx
@@ -73,40 +73,33 @@ public:
css::uno::Reference< css::ucb::XContentIdentifier > const & identifier);
virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
- getIdentifier() throw (css::uno::RuntimeException, std::exception) override {
+ getIdentifier() override {
return m_identifier;
}
- virtual OUString SAL_CALL getContentType()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getContentType() override
{
return OUString();
}
virtual void SAL_CALL addContentEventListener(
- css::uno::Reference< css::ucb::XContentEventListener > const &)
- throw (css::uno::RuntimeException, std::exception) override
+ css::uno::Reference< css::ucb::XContentEventListener > const &) override
{}
virtual void SAL_CALL removeContentEventListener(
- css::uno::Reference< css::ucb::XContentEventListener > const &)
- throw (css::uno::RuntimeException, std::exception) override
+ css::uno::Reference< css::ucb::XContentEventListener > const &) override
{}
- virtual sal_Int32 SAL_CALL createCommandIdentifier()
- throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int32 SAL_CALL createCommandIdentifier() override
{
return 0;
}
virtual css::uno::Any SAL_CALL execute(
css::ucb::Command const & command, sal_Int32 commandId,
- css::uno::Reference< css::ucb::XCommandEnvironment > const &)
- throw (
- css::uno::Exception, css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Reference< css::ucb::XCommandEnvironment > const &) override;
- virtual void SAL_CALL abort(sal_Int32) throw (css::uno::RuntimeException, std::exception) override {}
+ virtual void SAL_CALL abort(sal_Int32) override {}
private:
static char const m_prefix[];
@@ -132,9 +125,6 @@ Content::Content(
css::uno::Any Content::execute(
css::ucb::Command const & command, sal_Int32,
css::uno::Reference< css::ucb::XCommandEnvironment > const &)
- throw (
- css::uno::Exception, css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception)
{
if ( command.Name != "getCasePreservingURL" )
{
@@ -171,16 +161,14 @@ css::uno::Any Content::execute(
class Provider: public cppu::WeakImplHelper< css::ucb::XContentProvider > {
public:
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent(
- css::uno::Reference< css::ucb::XContentIdentifier > const & identifier)
- throw (css::ucb::IllegalIdentifierException, css::uno::RuntimeException, std::exception) override
+ css::uno::Reference< css::ucb::XContentIdentifier > const & identifier) override
{
return new Content(identifier);
}
virtual sal_Int32 SAL_CALL compareContentIds(
css::uno::Reference< css::ucb::XContentIdentifier > const & id1,
- css::uno::Reference< css::ucb::XContentIdentifier > const & id2)
- throw (css::uno::RuntimeException, std::exception) override
+ css::uno::Reference< css::ucb::XContentIdentifier > const & id2) override
{
assert(id1.is() && id2.is());
return
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index 1c0d52b8e391..27344aa60878 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.cxx
@@ -74,7 +74,6 @@ void ItemHolder2::holdConfigItem(EItem eItem)
}
void SAL_CALL ItemHolder2::disposing(const css::lang::EventObject&)
- throw(css::uno::RuntimeException, std::exception)
{
impl_releaseAllItems();
}
diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx
index 8a5ba35ad473..d0348ef6e0f5 100644
--- a/svl/source/config/itemholder2.hxx
+++ b/svl/source/config/itemholder2.hxx
@@ -42,8 +42,7 @@ class ItemHolder2 : private ItemHolderMutexBase
// uno interface
public:
- virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override;
// helper
private:
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 9c482eb3f157..e644dafc459f 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -56,8 +56,6 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::impl_staticCreateSe
}
uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance()
- throw ( uno::Exception,
- uno::RuntimeException, std::exception )
{
OUString aTempURL;
@@ -86,8 +84,6 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstance()
*/
uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithArguments(
const uno::Sequence< uno::Any >& aArguments )
- throw ( uno::Exception,
- uno::RuntimeException, std::exception )
{
sal_Int32 nArgNum = aArguments.getLength();
OSL_ENSURE( nArgNum < 4, "Wrong parameter number" );
@@ -159,19 +155,16 @@ uno::Reference< uno::XInterface > SAL_CALL FSStorageFactory::createInstanceWithA
}
OUString SAL_CALL FSStorageFactory::getImplementationName()
- throw ( uno::RuntimeException, std::exception )
{
return impl_staticGetImplementationName();
}
sal_Bool SAL_CALL FSStorageFactory::supportsService( const OUString& ServiceName )
- throw ( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL FSStorageFactory::getSupportedServiceNames()
- throw ( uno::RuntimeException, std::exception )
{
return impl_staticGetSupportedServiceNames();
}
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 4ba7d18a2347..4cd54393eefe 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -252,7 +252,6 @@ void FSStorage::CopyContentToStorage_Impl( ::ucbhelper::Content* pContent, const
// XInterface
uno::Any SAL_CALL FSStorage::queryInterface( const uno::Type& rType )
- throw( uno::RuntimeException, std::exception )
{
uno::Any aReturn;
aReturn = ::cppu::queryInterface
@@ -284,7 +283,6 @@ void SAL_CALL FSStorage::release() throw()
// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes()
- throw( uno::RuntimeException, std::exception )
{
if ( m_pImpl->m_pTypeCollection == nullptr )
{
@@ -304,7 +302,6 @@ uno::Sequence< uno::Type > SAL_CALL FSStorage::getTypes()
}
uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId()
- throw( uno::RuntimeException, std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
@@ -312,11 +309,6 @@ uno::Sequence< sal_Int8 > SAL_CALL FSStorage::getImplementationId()
// XStorage
void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >& xDest )
- throw ( embed::InvalidStorageException,
- io::IOException,
- lang::IllegalArgumentException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -364,12 +356,6 @@ void SAL_CALL FSStorage::copyToStorage( const uno::Reference< embed::XStorage >&
uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
const OUString& aStreamName, sal_Int32 nOpenMode )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -473,24 +459,12 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::openStreamElement(
uno::Reference< io::XStream > SAL_CALL FSStorage::openEncryptedStreamElement(
const OUString&, sal_Int32, const OUString& )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::NoEncryptionException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
throw packages::NoEncryptionException();
}
uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement(
const OUString& aStorName, sal_Int32 nStorageMode )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -577,12 +551,6 @@ uno::Reference< embed::XStorage > SAL_CALL FSStorage::openStorageElement(
}
uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUString& aStreamName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -651,24 +619,12 @@ uno::Reference< io::XStream > SAL_CALL FSStorage::cloneStreamElement( const OUSt
uno::Reference< io::XStream > SAL_CALL FSStorage::cloneEncryptedStreamElement(
const OUString&,
const OUString& )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::NoEncryptionException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
throw packages::NoEncryptionException();
}
void SAL_CALL FSStorage::copyLastCommitTo(
const uno::Reference< embed::XStorage >& xTargetStorage )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
copyToStorage( xTargetStorage );
}
@@ -676,11 +632,6 @@ void SAL_CALL FSStorage::copyLastCommitTo(
void SAL_CALL FSStorage::copyStorageElementLastCommitTo(
const OUString& aStorName,
const uno::Reference< embed::XStorage >& xTargetStorage )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -693,10 +644,6 @@ void SAL_CALL FSStorage::copyStorageElementLastCommitTo(
}
sal_Bool SAL_CALL FSStorage::isStreamElement( const OUString& aElementName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- container::NoSuchElementException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -713,10 +660,6 @@ sal_Bool SAL_CALL FSStorage::isStreamElement( const OUString& aElementName )
}
sal_Bool SAL_CALL FSStorage::isStorageElement( const OUString& aElementName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- container::NoSuchElementException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -733,12 +676,6 @@ sal_Bool SAL_CALL FSStorage::isStorageElement( const OUString& aElementName )
}
void SAL_CALL FSStorage::removeElement( const OUString& aElementName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- container::NoSuchElementException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -759,13 +696,6 @@ void SAL_CALL FSStorage::removeElement( const OUString& aElementName )
}
void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUString& aNewName )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- container::NoSuchElementException,
- container::ElementExistException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -840,13 +770,6 @@ void SAL_CALL FSStorage::renameElement( const OUString& aElementName, const OUSt
void SAL_CALL FSStorage::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 )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -924,13 +847,6 @@ void SAL_CALL FSStorage::copyElementTo( const OUString& aElementName,
void SAL_CALL FSStorage::moveElementTo( 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 )
{
::osl::MutexGuard aGuard( m_aMutex );
copyElementTo( aElementName, xDest, aNewName );
@@ -944,9 +860,6 @@ void SAL_CALL FSStorage::moveElementTo( const OUString& aElementName,
// XNameAccess
uno::Any SAL_CALL FSStorage::getByName( const OUString& aName )
- throw ( container::NoSuchElementException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1002,7 +915,6 @@ uno::Any SAL_CALL FSStorage::getByName( const OUString& aName )
uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1062,7 +974,6 @@ uno::Sequence< OUString > SAL_CALL FSStorage::getElementNames()
}
sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName )
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1097,7 +1008,6 @@ sal_Bool SAL_CALL FSStorage::hasByName( const OUString& aName )
}
uno::Type SAL_CALL FSStorage::getElementType()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1109,7 +1019,6 @@ uno::Type SAL_CALL FSStorage::getElementType()
}
sal_Bool SAL_CALL FSStorage::hasElements()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1139,7 +1048,6 @@ sal_Bool SAL_CALL FSStorage::hasElements()
// XDisposable
void SAL_CALL FSStorage::dispose()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1158,7 +1066,6 @@ void SAL_CALL FSStorage::dispose()
void SAL_CALL FSStorage::addEventListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1173,7 +1080,6 @@ void SAL_CALL FSStorage::addEventListener(
void SAL_CALL FSStorage::removeEventListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1187,7 +1093,6 @@ void SAL_CALL FSStorage::removeEventListener(
// XPropertySet
uno::Reference< beans::XPropertySetInfo > SAL_CALL FSStorage::getPropertySetInfo()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1200,11 +1105,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL FSStorage::getPropertySetInfo
void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const uno::Any& )
- throw ( beans::UnknownPropertyException,
- beans::PropertyVetoException,
- lang::IllegalArgumentException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1219,9 +1119,6 @@ void SAL_CALL FSStorage::setPropertyValue( const OUString& aPropertyName, const
uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName )
- throw ( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1240,9 +1137,6 @@ uno::Any SAL_CALL FSStorage::getPropertyValue( const OUString& aPropertyName )
void SAL_CALL FSStorage::addPropertyChangeListener(
const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
- throw ( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1256,9 +1150,6 @@ void SAL_CALL FSStorage::addPropertyChangeListener(
void SAL_CALL FSStorage::removePropertyChangeListener(
const OUString& /*aPropertyName*/,
const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
- throw ( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1272,9 +1163,6 @@ void SAL_CALL FSStorage::removePropertyChangeListener(
void SAL_CALL FSStorage::addVetoableChangeListener(
const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
- throw ( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1288,9 +1176,6 @@ void SAL_CALL FSStorage::addVetoableChangeListener(
void SAL_CALL FSStorage::removeVetoableChangeListener(
const OUString& /*PropertyName*/,
const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
- throw ( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1302,12 +1187,6 @@ void SAL_CALL FSStorage::removeVetoableChangeListener(
// XHierarchicalStorageAccess
uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1424,24 +1303,11 @@ uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openStreamEl
}
uno::Reference< embed::XExtendedStorageStream > SAL_CALL FSStorage::openEncryptedStreamElementByHierarchicalName( const OUString& /*sStreamName*/, ::sal_Int32 /*nOpenMode*/, const OUString& /*sPassword*/ )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- packages::NoEncryptionException,
- packages::WrongPasswordException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
throw packages::NoEncryptionException();
}
void SAL_CALL FSStorage::removeStreamElementByHierarchicalName( const OUString& sStreamPath )
- throw ( embed::InvalidStorageException,
- lang::IllegalArgumentException,
- container::NoSuchElementException,
- io::IOException,
- embed::StorageWrappedTargetException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index 5cf83891d9ff..a3ba6b2ffc65 100644
--- a/svl/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.hxx
@@ -68,8 +68,7 @@ public:
// 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;
@@ -77,236 +76,103 @@ public:
// XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() 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;
+ virtual void SAL_CALL 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;
+ const OUString& aStreamName, sal_Int32 nOpenMode ) override;
virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStreamElement(
- const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPass )
- 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& aStreamName, sal_Int32 nOpenMode, const OUString& aPass ) override;
virtual css::uno::Reference< css::embed::XStorage > SAL_CALL openStorageElement(
- const OUString& aStorName, sal_Int32 nStorageMode )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ const OUString& aStorName, sal_Int32 nStorageMode ) 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;
+ const OUString& aStreamName ) override;
virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStreamElement(
- const OUString& aStreamName, const OUString& aPass )
- 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& aStreamName, const OUString& aPass ) 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;
+ const css::uno::Reference< 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;
-
- 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;
-
- 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;
-
- 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;
-
- virtual void SAL_CALL renameElement( const OUString& rEleName, 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 css::uno::Reference< css::embed::XStorage >& xTargetStorage ) override;
+
+ virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) override;
+
+ virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) override;
+
+ virtual void SAL_CALL removeElement( const OUString& aElementName ) override;
+
+ virtual void SAL_CALL renameElement( const OUString& rEleName, const OUString& rNewName ) 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;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName )
- throw ( css::container::NoSuchElementException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
- virtual css::uno::Type SAL_CALL getElementType()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
- virtual sal_Bool SAL_CALL hasElements()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual sal_Bool SAL_CALL hasElements() override;
// XComponent
- virtual void SAL_CALL dispose()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL 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 >& xListener )
- throw ( css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
// XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL 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;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, 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;
+ virtual css::uno::Any SAL_CALL getPropertyValue( 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;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
// XHierarchicalStorageAccess
- virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::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;
-
- virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword )
- 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;
-
- virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath )
- throw ( css::embed::InvalidStorageException,
- css::lang::IllegalArgumentException,
- css::container::NoSuchElementException,
- css::io::IOException,
- css::embed::StorageWrappedTargetException,
- css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openStreamElementByHierarchicalName( const OUString& sStreamPath, ::sal_Int32 nOpenMode ) override;
+
+ virtual css::uno::Reference< css::embed::XExtendedStorageStream > SAL_CALL openEncryptedStreamElementByHierarchicalName( const OUString& sStreamName, ::sal_Int32 nOpenMode, const OUString& sPassword ) override;
+
+ virtual void SAL_CALL removeStreamElementByHierarchicalName( const OUString& sElementPath ) override;
};
#endif
diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index 33eccd7fc789..a68e449c7f47 100644
--- a/svl/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.cxx
@@ -44,7 +44,6 @@ OFSInputStreamContainer::~OFSInputStreamContainer()
}
uno::Sequence< uno::Type > SAL_CALL OFSInputStreamContainer::getTypes()
- throw ( uno::RuntimeException, std::exception )
{
static ::cppu::OTypeCollection* pTypeCollection = nullptr ;
@@ -79,7 +78,6 @@ uno::Sequence< uno::Type > SAL_CALL OFSInputStreamContainer::getTypes()
}
uno::Any SAL_CALL OFSInputStreamContainer::queryInterface( const uno::Type& rType )
- throw( uno::RuntimeException, std::exception )
{
// Attention:
// Don't use mutex or guard in this method!!! Is a method of XInterface.
@@ -114,10 +112,6 @@ void SAL_CALL OFSInputStreamContainer::release()
}
sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
- throw ( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -131,10 +125,6 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readBytes( uno::Sequence< sal_Int8 >
}
sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
- throw ( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -148,10 +138,6 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::readSomeBytes( uno::Sequence< sal_In
}
void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
- throw ( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -165,9 +151,6 @@ void SAL_CALL OFSInputStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
}
sal_Int32 SAL_CALL OFSInputStreamContainer::available( )
- throw ( io::NotConnectedException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -181,9 +164,6 @@ sal_Int32 SAL_CALL OFSInputStreamContainer::available( )
}
void SAL_CALL OFSInputStreamContainer::closeInput( )
- throw ( io::NotConnectedException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -197,7 +177,6 @@ void SAL_CALL OFSInputStreamContainer::closeInput( )
}
uno::Reference< io::XInputStream > SAL_CALL OFSInputStreamContainer::getInputStream()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -211,7 +190,6 @@ uno::Reference< io::XInputStream > SAL_CALL OFSInputStreamContainer::getInputStr
}
uno::Reference< io::XOutputStream > SAL_CALL OFSInputStreamContainer::getOutputStream()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -222,9 +200,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OFSInputStreamContainer::getOutputS
}
void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location )
- throw ( lang::IllegalArgumentException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -238,8 +213,6 @@ void SAL_CALL OFSInputStreamContainer::seek( sal_Int64 location )
}
sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition()
- throw ( io::IOException,
- uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -253,8 +226,6 @@ sal_Int64 SAL_CALL OFSInputStreamContainer::getPosition()
}
sal_Int64 SAL_CALL OFSInputStreamContainer::getLength()
- throw ( io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -268,7 +239,6 @@ sal_Int64 SAL_CALL OFSInputStreamContainer::getLength()
}
void SAL_CALL OFSInputStreamContainer::dispose( )
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -290,7 +260,6 @@ void SAL_CALL OFSInputStreamContainer::dispose( )
}
void SAL_CALL OFSInputStreamContainer::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -304,7 +273,6 @@ void SAL_CALL OFSInputStreamContainer::addEventListener( const uno::Reference< l
}
void SAL_CALL OFSInputStreamContainer::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx
index 13c983d7c355..130f8120f9fd 100644
--- a/svl/source/fsstor/oinputstreamcontainer.hxx
+++ b/svl/source/fsstor/oinputstreamcontainer.hxx
@@ -50,36 +50,31 @@ public:
virtual ~OFSInputStreamContainer() override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() 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;
// 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;
- 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;
- virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
- throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL available( )
- throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL closeInput( )
- throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+ virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+ virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+ virtual sal_Int32 SAL_CALL available( ) override;
+ virtual void SAL_CALL closeInput( ) override;
//XStream
- virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) override;
+ virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) override;
//XSeekable
- virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL seek( sal_Int64 location ) override;
+ virtual sal_Int64 SAL_CALL getPosition() override;
+ virtual sal_Int64 SAL_CALL getLength() override;
//XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
};
diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index 9e5d0c501c1d..8b22d3bec84f 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.cxx
@@ -65,7 +65,6 @@ OFSStreamContainer::~OFSStreamContainer()
// XInterface
uno::Any SAL_CALL OFSStreamContainer::queryInterface( const uno::Type& rType )
- throw( uno::RuntimeException, std::exception )
{
uno::Any aReturn;
@@ -143,7 +142,6 @@ void SAL_CALL OFSStreamContainer::release()
// XTypeProvider
uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes()
- throw( uno::RuntimeException, std::exception )
{
if ( m_pTypeCollection == nullptr )
{
@@ -184,14 +182,12 @@ uno::Sequence< uno::Type > SAL_CALL OFSStreamContainer::getTypes()
}
uno::Sequence< sal_Int8 > SAL_CALL OFSStreamContainer::getImplementationId()
- throw( uno::RuntimeException, std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
// XStream
uno::Reference< io::XInputStream > SAL_CALL OFSStreamContainer::getInputStream()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -208,7 +204,6 @@ uno::Reference< io::XInputStream > SAL_CALL OFSStreamContainer::getInputStream()
}
uno::Reference< io::XOutputStream > SAL_CALL OFSStreamContainer::getOutputStream()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -226,7 +221,6 @@ uno::Reference< io::XOutputStream > SAL_CALL OFSStreamContainer::getOutputStream
// XComponent
void SAL_CALL OFSStreamContainer::dispose()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -258,7 +252,6 @@ void SAL_CALL OFSStreamContainer::dispose()
}
void SAL_CALL OFSStreamContainer::addEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -272,7 +265,6 @@ void SAL_CALL OFSStreamContainer::addEventListener( const uno::Reference< lang::
}
void SAL_CALL OFSStreamContainer::removeEventListener( const uno::Reference< lang::XEventListener >& xListener )
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -286,9 +278,6 @@ void SAL_CALL OFSStreamContainer::removeEventListener( const uno::Reference< lan
// XSeekable
void SAL_CALL OFSStreamContainer::seek( sal_Int64 location )
- throw ( lang::IllegalArgumentException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -302,8 +291,6 @@ void SAL_CALL OFSStreamContainer::seek( sal_Int64 location )
}
sal_Int64 SAL_CALL OFSStreamContainer::getPosition()
- throw ( io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -317,8 +304,6 @@ sal_Int64 SAL_CALL OFSStreamContainer::getPosition()
}
sal_Int64 SAL_CALL OFSStreamContainer::getLength()
- throw ( io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -334,10 +319,6 @@ sal_Int64 SAL_CALL OFSStreamContainer::getLength()
// XInputStream
sal_Int32 SAL_CALL OFSStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -351,10 +332,6 @@ sal_Int32 SAL_CALL OFSStreamContainer::readBytes( uno::Sequence< sal_Int8 >& aDa
}
sal_Int32 SAL_CALL OFSStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -368,10 +345,6 @@ sal_Int32 SAL_CALL OFSStreamContainer::readSomeBytes( uno::Sequence< sal_Int8 >&
}
void SAL_CALL OFSStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -385,9 +358,6 @@ void SAL_CALL OFSStreamContainer::skipBytes( sal_Int32 nBytesToSkip )
}
sal_Int32 SAL_CALL OFSStreamContainer::available()
- throw( io::NotConnectedException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -401,9 +371,6 @@ sal_Int32 SAL_CALL OFSStreamContainer::available()
}
void SAL_CALL OFSStreamContainer::closeInput()
- throw( io::NotConnectedException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -425,10 +392,6 @@ void SAL_CALL OFSStreamContainer::closeInput()
// XOutputStream
void SAL_CALL OFSStreamContainer::writeBytes( const uno::Sequence< sal_Int8 >& aData )
- throw ( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -442,10 +405,6 @@ void SAL_CALL OFSStreamContainer::writeBytes( const uno::Sequence< sal_Int8 >& a
}
void SAL_CALL OFSStreamContainer::flush()
- throw ( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -459,10 +418,6 @@ void SAL_CALL OFSStreamContainer::flush()
}
void SAL_CALL OFSStreamContainer::closeOutput()
- throw ( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -485,8 +440,6 @@ void SAL_CALL OFSStreamContainer::closeOutput()
// XTruncate
void SAL_CALL OFSStreamContainer::truncate()
- throw ( io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -502,8 +455,6 @@ void SAL_CALL OFSStreamContainer::truncate()
// XAsyncOutputMonitor
void SAL_CALL OFSStreamContainer::waitForCompletion()
- throw ( io::IOException,
- uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index feac66ebef58..e0668a5bcd5e 100644
--- a/svl/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.hxx
@@ -64,52 +64,45 @@ public:
virtual ~OFSStreamContainer() 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< css::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
- 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() override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
// XStream
- virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getInputStream( ) override;
+ virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL getOutputStream( ) override;
// XComponent
- virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XSeekable
- virtual void SAL_CALL seek( sal_Int64 location ) throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Int64 SAL_CALL getPosition() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Int64 SAL_CALL getLength() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL seek( sal_Int64 location ) override;
+ virtual sal_Int64 SAL_CALL getPosition() override;
+ virtual sal_Int64 SAL_CALL getLength() 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;
- 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;
- virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip )
- throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL available( )
- throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL closeInput( )
- throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override;
+ virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override;
+ virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
+ virtual sal_Int32 SAL_CALL available( ) override;
+ virtual void SAL_CALL closeInput( ) 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;
- virtual void SAL_CALL flush( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL closeOutput( ) throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override;
+ virtual void SAL_CALL flush( ) override;
+ virtual void SAL_CALL closeOutput( ) override;
// XTruncate
- virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL truncate() override;
// XAsyncOutputMonitor
- virtual void SAL_CALL waitForCompletion( ) throw (css::io::IOException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL waitForCompletion( ) override;
};
diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx
index a06045163491..77451966b8e4 100644
--- a/svl/source/inc/fsfactory.hxx
+++ b/svl/source/inc/fsfactory.hxx
@@ -50,13 +50,13 @@ public:
// XSingleServiceFactory
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance() override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const css::uno::Sequence< css::uno::Any >& aArguments ) 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;
};
diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index bfba71cad786..477e5f640428 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.hxx
@@ -222,8 +222,7 @@ private:
/// @throws css::uno::RuntimeException
css::uno::Sequence< css::task::UserRecord > CopyToUserRecordSequence(
const ::std::list< NamePassRecord >& original,
- const css::uno::Reference< css::task::XInteractionHandler >& Handler )
- throw(css::uno::RuntimeException, std::exception);
+ const css::uno::Reference< css::task::XInteractionHandler >& Handler );
css::task::UserRecord CopyToUserRecord(
const NamePassRecord& aRecord,
@@ -234,23 +233,21 @@ private:
css::uno::Sequence< css::task::UserRecord > FindUsr(
const ::std::list< NamePassRecord >& userlist,
const OUString& name,
- const css::uno::Reference< css::task::XInteractionHandler >& Handler )
- throw(css::uno::RuntimeException, std::exception);
+ const css::uno::Reference< css::task::XInteractionHandler >& Handler );
/// @throws css::uno::RuntimeException
bool createUrlRecord(
const PassMap::iterator & rIter,
bool bName,
const OUString & aName,
const css::uno::Reference< css::task::XInteractionHandler >& aHandler,
- css::task::UrlRecord & rRec )
- throw( css::uno::RuntimeException );
+ css::task::UrlRecord & rRec );
/// @throws css::uno::RuntimeException
css::task::UrlRecord find(
const OUString& aURL,
const OUString& aName,
bool bName, // only needed to support empty user names
- const css::uno::Reference< css::task::XInteractionHandler >& aHandler ) throw(css::uno::RuntimeException, std::exception);
+ const css::uno::Reference< css::task::XInteractionHandler >& aHandler );
static OUString GetDefaultMasterPassword();
@@ -259,28 +256,23 @@ css::task::UrlRecord find(
const css::uno::Reference< css::task::XInteractionHandler >& xHandler );
/// @throws css::uno::RuntimeException
- OUString const & GetMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& Handler )
- throw(css::uno::RuntimeException, std::exception);
+ OUString const & GetMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& Handler );
/// @throws css::uno::RuntimeException
- void UpdateVector( const OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile )
- throw(css::uno::RuntimeException);
+ void UpdateVector( const OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile );
/// @throws css::uno::RuntimeException
void PrivateAdd( const OUString& aUrl,
const OUString& aUserName,
const css::uno::Sequence< OUString >& aPasswords,
char aMode,
- const css::uno::Reference< css::task::XInteractionHandler >& Handler )
- throw(css::uno::RuntimeException, std::exception);
+ const css::uno::Reference< css::task::XInteractionHandler >& Handler );
/// @throws css::uno::RuntimeException
- static ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword )
- throw(css::uno::RuntimeException, std::exception);
+ static ::std::vector< OUString > DecodePasswords( const OUString& aLine, const OUString& aMasterPassword );
/// @throws css::uno::RuntimeException
- static OUString EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPassword )
- throw(css::uno::RuntimeException);
+ static OUString EncodePasswords(const std::vector< OUString >& lines, const OUString& aMasterPassword );
public:
PasswordContainer( const css::uno::Reference< css::lang::XMultiServiceFactory >& );
@@ -289,82 +281,74 @@ public:
virtual void SAL_CALL add( const OUString& aUrl,
const OUString& aUserName,
const css::uno::Sequence< OUString >& aPasswords,
- const css::uno::Reference< css::task::XInteractionHandler >& Handler )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
virtual void SAL_CALL addPersistent( const OUString& aUrl,
const OUString& aUserName,
const css::uno::Sequence< OUString >& aPasswords,
- const css::uno::Reference< css::task::XInteractionHandler >& Handler )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
virtual css::task::UrlRecord SAL_CALL
find( const OUString& aUrl,
- const css::uno::Reference< css::task::XInteractionHandler >& Handler )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
virtual css::task::UrlRecord SAL_CALL
findForName( const OUString& aUrl,
const OUString& aUserName,
- const css::uno::Reference< css::task::XInteractionHandler >& Handler )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
virtual void SAL_CALL remove( const OUString& aUrl,
- const OUString& aUserName )
- throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& aUserName ) override;
virtual void SAL_CALL removePersistent( const OUString& aUrl,
- const OUString& aUserName )
- throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& aUserName ) override;
- virtual void SAL_CALL removeAllPersistent() throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL removeAllPersistent() override;
virtual css::uno::Sequence< css::task::UrlRecord > SAL_CALL
- getAllPersistent( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception) override;
+ getAllPersistent( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override;
// provide factory
/// @throws css::uno::RuntimeException
- static OUString SAL_CALL impl_getStaticImplementationName( ) throw(css::uno::RuntimeException);
+ static OUString SAL_CALL impl_getStaticImplementationName( );
/// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > SAL_CALL
- impl_getStaticSupportedServiceNames( ) throw(css::uno::RuntimeException);
+ impl_getStaticSupportedServiceNames( );
/// @throws css::uno::RuntimeException
static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL
- impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& ServiceManager ) throw(css::uno::RuntimeException);
+ impl_createFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& ServiceManager );
/// @throws css::uno::RuntimeException
static css::uno::Reference< css::uno::XInterface > SAL_CALL
- impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager ) throw( css::uno::RuntimeException, std::exception );
+ impl_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory >& xServiceManager );
// 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 OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override;
+ getSupportedServiceNames( ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// XMasterPasswordHandling
- virtual sal_Bool SAL_CALL authorizateWithMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL changeMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeMasterPassword() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasMasterPassword( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL allowPersistentStoring( sal_Bool bAllow ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isPersistentStoringAllowed( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL authorizateWithMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) override;
+ virtual sal_Bool SAL_CALL changeMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) override;
+ virtual void SAL_CALL removeMasterPassword() override;
+ virtual sal_Bool SAL_CALL hasMasterPassword( ) override;
+ virtual sal_Bool SAL_CALL allowPersistentStoring( sal_Bool bAllow ) override;
+ virtual sal_Bool SAL_CALL isPersistentStoringAllowed( ) override;
// XMasterPasswordHandling2
- virtual sal_Bool SAL_CALL useDefaultMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isDefaultMasterPasswordUsed( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL useDefaultMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ) override;
+ virtual sal_Bool SAL_CALL isDefaultMasterPasswordUsed( ) override;
// XUrlContainer
- virtual void SAL_CALL addUrl( const OUString& Url, sal_Bool MakePersistent ) throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL findUrl( const OUString& Url ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeUrl( const OUString& Url ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getUrls( sal_Bool OnlyPersistent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addUrl( const OUString& Url, sal_Bool MakePersistent ) override;
+ virtual OUString SAL_CALL findUrl( const OUString& Url ) override;
+ virtual void SAL_CALL removeUrl( const OUString& Url ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getUrls( sal_Bool OnlyPersistent ) override;
void Notify();
};
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 70669963d8b7..b2b3f529fc34 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -115,7 +115,6 @@ uno::Sequence<beans::Property> SfxItemPropertyMap::getProperties() const
}
beans::Property SfxItemPropertyMap::getPropertyByName( const OUString & rName ) const
- throw( beans::UnknownPropertyException )
{
SfxItemPropertyHashMap_t::const_iterator aIter = m_pImpl->find(rName);
if( aIter == m_pImpl->end() )
@@ -175,7 +174,6 @@ SfxItemPropertySet::~SfxItemPropertySet()
void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
const SfxItemSet& rSet, Any& rAny ) const
- throw(RuntimeException)
{
// get the SfxPoolItem
const SfxPoolItem* pItem = nullptr;
@@ -204,7 +202,6 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
void SfxItemPropertySet::getPropertyValue( const OUString &rName,
const SfxItemSet& rSet, Any& rAny ) const
- throw(RuntimeException, UnknownPropertyException)
{
// detect which-id
const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName );
@@ -215,7 +212,6 @@ void SfxItemPropertySet::getPropertyValue( const OUString &rName,
Any SfxItemPropertySet::getPropertyValue( const OUString &rName,
const SfxItemSet& rSet ) const
- throw(RuntimeException, UnknownPropertyException)
{
Any aVal;
getPropertyValue( rName,rSet, aVal );
@@ -225,8 +221,6 @@ Any SfxItemPropertySet::getPropertyValue( const OUString &rName,
void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
const Any& aVal,
SfxItemSet& rSet ) const
- throw(RuntimeException,
- IllegalArgumentException)
{
// get the SfxPoolItem
const SfxPoolItem* pItem = nullptr;
@@ -252,9 +246,6 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
void SfxItemPropertySet::setPropertyValue( const OUString &rName,
const Any& aVal,
SfxItemSet& rSet ) const
- throw(RuntimeException,
- IllegalArgumentException,
- UnknownPropertyException)
{
const SfxItemPropertySimpleEntry* pEntry = m_aMap.getByName( rName );
if ( !pEntry )
@@ -281,7 +272,6 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn
}
PropertyState SfxItemPropertySet::getPropertyState(const OUString& rName, const SfxItemSet& rSet) const
- throw(UnknownPropertyException)
{
PropertyState eRet = PropertyState_DIRECT_VALUE;
@@ -328,7 +318,6 @@ SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pE
}
Sequence< Property > SAL_CALL SfxItemPropertySetInfo::getProperties( )
- throw(RuntimeException, std::exception)
{
return m_pImpl->m_pOwnMap->getProperties();
}
@@ -339,13 +328,11 @@ SfxItemPropertySetInfo::~SfxItemPropertySetInfo()
}
Property SAL_CALL SfxItemPropertySetInfo::getPropertyByName( const OUString& rName )
- throw(UnknownPropertyException, RuntimeException, std::exception)
{
return m_pImpl->m_pOwnMap->getPropertyByName( rName );
}
sal_Bool SAL_CALL SfxItemPropertySetInfo::hasPropertyByName( const OUString& rName )
- throw(RuntimeException, std::exception)
{
return m_pImpl->m_pOwnMap->hasPropertyByName( rName );
}
@@ -361,19 +348,17 @@ SfxExtItemPropertySetInfo::~SfxExtItemPropertySetInfo()
{
}
-Sequence< Property > SAL_CALL SfxExtItemPropertySetInfo::getProperties( ) throw(RuntimeException, std::exception)
+Sequence< Property > SAL_CALL SfxExtItemPropertySetInfo::getProperties( )
{
return aExtMap.getProperties();
}
Property SAL_CALL SfxExtItemPropertySetInfo::getPropertyByName( const OUString& rPropertyName )
- throw(UnknownPropertyException, RuntimeException, std::exception)
{
return aExtMap.getPropertyByName( rPropertyName );
}
sal_Bool SAL_CALL SfxExtItemPropertySetInfo::hasPropertyByName( const OUString& rPropertyName )
- throw(RuntimeException, std::exception)
{
return aExtMap.hasPropertyByName( rPropertyName );
}
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index e169c4521dec..8ec244c2c014 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -945,7 +945,7 @@ SfxUnoStyleSheet* SfxUnoStyleSheet::getUnoStyleSheet( const css::uno::Reference<
/**
* XUnoTunnel
*/
-::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const css::uno::Sequence< ::sal_Int8 >& rId ) throw (css::uno::RuntimeException, std::exception)
+::sal_Int64 SAL_CALL SfxUnoStyleSheet::getSomething( const css::uno::Sequence< ::sal_Int8 >& rId )
{
if( rId.getLength() == 16 && 0 == memcmp( getIdentifier().getConstArray(), rId.getConstArray(), 16 ) )
{
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 17210607d24f..6b1e302fb8c2 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -113,7 +113,6 @@ SvNumberFormatterServiceObj::~SvNumberFormatterServiceObj()
// XNumberFormatter
void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier( const uno::Reference<util::XNumberFormatsSupplier>& _xSupplier )
- throw(uno::RuntimeException, std::exception)
{
::rtl::Reference< SvNumberFormatsSupplierObj > xAutoReleaseOld;
@@ -134,14 +133,12 @@ void SAL_CALL SvNumberFormatterServiceObj::attachNumberFormatsSupplier( const un
}
uno::Reference<util::XNumberFormatsSupplier> SAL_CALL SvNumberFormatterServiceObj::getNumberFormatsSupplier()
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
return xSupplier.get();
}
sal_Int32 SAL_CALL SvNumberFormatterServiceObj::detectNumberFormat( sal_Int32 nKey, const OUString& aString )
- throw(util::NotNumericException, uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -163,7 +160,6 @@ sal_Int32 SAL_CALL SvNumberFormatterServiceObj::detectNumberFormat( sal_Int32 nK
}
double SAL_CALL SvNumberFormatterServiceObj::convertStringToNumber( sal_Int32 nKey, const OUString& aString )
- throw(util::NotNumericException, uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -185,7 +181,6 @@ double SAL_CALL SvNumberFormatterServiceObj::convertStringToNumber( sal_Int32 nK
}
OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToString( sal_Int32 nKey, double fValue )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -205,7 +200,6 @@ OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToString( sal_Int32
util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32 nKey,
double fValue,
util::Color aDefaultColor )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -228,7 +222,6 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForNumber( sal_Int32
OUString SAL_CALL SvNumberFormatterServiceObj::formatString( sal_Int32 nKey,
const OUString& aString )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -249,7 +242,6 @@ OUString SAL_CALL SvNumberFormatterServiceObj::formatString( sal_Int32 nKey,
util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32 nKey,
const OUString& aString,
util::Color aDefaultColor )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -275,7 +267,6 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryColorForString( sal_Int32
}
OUString SAL_CALL SvNumberFormatterServiceObj::getInputString( sal_Int32 nKey, double fValue )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -295,7 +286,6 @@ OUString SAL_CALL SvNumberFormatterServiceObj::convertNumberToPreviewString( con
double fValue,
const lang::Locale& nLocale,
sal_Bool bAllowEnglish )
- throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -326,7 +316,6 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( co
const lang::Locale& nLocale,
sal_Bool bAllowEnglish,
util::Color aDefaultColor )
- throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -362,19 +351,16 @@ util::Color SAL_CALL SvNumberFormatterServiceObj::queryPreviewColorForNumber( co
// XServiceInfo
OUString SAL_CALL SvNumberFormatterServiceObj::getImplementationName()
- throw(uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.uno.util.numbers.SvNumberFormatterServiceObject");
}
sal_Bool SAL_CALL SvNumberFormatterServiceObj::supportsService( const OUString& ServiceName )
- throw(uno::RuntimeException, std::exception)
{
return cppu::supportsService( this, ServiceName );
}
uno::Sequence<OUString> SAL_CALL SvNumberFormatterServiceObj::getSupportedServiceNames()
- throw(uno::RuntimeException, std::exception)
{
return { "com.sun.star.util.NumberFormatter" };
}
@@ -394,7 +380,6 @@ SvNumberFormatsObj::~SvNumberFormatsObj()
// XNumberFormats
uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsObj::getByKey( sal_Int32 nKey )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -409,7 +394,6 @@ uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsObj::getByKey( sal_I
uno::Sequence<sal_Int32> SAL_CALL SvNumberFormatsObj::queryKeys( sal_Int16 nType,
const lang::Locale& nLocale,
sal_Bool bCreate )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -437,7 +421,6 @@ uno::Sequence<sal_Int32> SAL_CALL SvNumberFormatsObj::queryKeys( sal_Int16 nType
sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const OUString& aFormat,
const lang::Locale& nLocale,
sal_Bool bScan )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -460,7 +443,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::queryKey( const OUString& aFormat,
sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const OUString& aFormat,
const lang::Locale& nLocale )
- throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -492,7 +474,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const OUString& aFormat,
sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const OUString& aFormat,
const lang::Locale& nLocale,
const lang::Locale& nNewLocale )
- throw(util::MalformedNumberFormatException, uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -522,7 +503,7 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNewConverted( const OUString& aFormat,
return nRet;
}
-void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey )
{
::osl::MutexGuard aGuard( m_aMutex );
SvNumberFormatter* pFormatter = rSupplier.GetNumberFormatter();
@@ -538,7 +519,6 @@ OUString SAL_CALL SvNumberFormatsObj::generateFormat( sal_Int32 nBaseKey,
sal_Bool bThousands,
sal_Bool bRed, sal_Int16 nDecimals,
sal_Int16 nLeading )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -558,7 +538,6 @@ OUString SAL_CALL SvNumberFormatsObj::generateFormat( sal_Int32 nBaseKey,
// XNumberFormatTypes
sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardIndex( const lang::Locale& nLocale )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -576,7 +555,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardIndex( const lang::Locale& nLo
}
sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const lang::Locale& nLocale )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -597,7 +575,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getStandardFormat( sal_Int16 nType, const
}
sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatIndex( sal_Int16 nIndex, const lang::Locale& nLocale )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -615,7 +592,6 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatIndex( sal_Int16 nIndex, const l
}
sal_Bool SAL_CALL SvNumberFormatsObj::isTypeCompatible( sal_Int16 nOldType, sal_Int16 nNewType )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -623,7 +599,6 @@ sal_Bool SAL_CALL SvNumberFormatsObj::isTypeCompatible( sal_Int16 nOldType, sal_
}
sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const lang::Locale& nLocale )
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -643,19 +618,16 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::getFormatForLocale( sal_Int32 nKey, const
// XServiceInfo
OUString SAL_CALL SvNumberFormatsObj::getImplementationName()
- throw(uno::RuntimeException, std::exception)
{
return OUString("SvNumberFormatsObj");
}
sal_Bool SAL_CALL SvNumberFormatsObj::supportsService( const OUString& ServiceName )
- throw(uno::RuntimeException, std::exception)
{
return cppu::supportsService( this, ServiceName );
}
uno::Sequence<OUString> SAL_CALL SvNumberFormatsObj::getSupportedServiceNames()
- throw(uno::RuntimeException, std::exception)
{
return { "com.sun.star.util.NumberFormats" };
}
@@ -676,7 +648,6 @@ SvNumberFormatObj::~SvNumberFormatObj()
// XPropertySet
uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatObj::getPropertySetInfo()
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -686,16 +657,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatObj::getPropertyS
void SAL_CALL SvNumberFormatObj::setPropertyValue( const OUString&,
const uno::Any& )
- throw(beans::UnknownPropertyException, beans::PropertyVetoException,
- lang::IllegalArgumentException, lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
throw beans::UnknownPropertyException(); // Everything is read-only
}
uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aPropertyName )
- throw(beans::UnknownPropertyException, lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -788,32 +754,24 @@ uno::Any SAL_CALL SvNumberFormatObj::getPropertyValue( const OUString& aProperty
void SAL_CALL SvNumberFormatObj::addPropertyChangeListener( const OUString&,
const uno::Reference<beans::XPropertyChangeListener>&)
- throw(beans::UnknownPropertyException,
- lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatObj::removePropertyChangeListener( const OUString&,
const uno::Reference<beans::XPropertyChangeListener>&)
- throw(beans::UnknownPropertyException,
- lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatObj::addVetoableChangeListener( const OUString&,
const uno::Reference<beans::XVetoableChangeListener>&)
- throw(beans::UnknownPropertyException,
- lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const OUString&,
const uno::Reference<beans::XVetoableChangeListener>&)
- throw(beans::UnknownPropertyException,
- lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
@@ -821,7 +779,6 @@ void SAL_CALL SvNumberFormatObj::removeVetoableChangeListener( const OUString&,
// XPropertyAccess
uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValues()
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -885,9 +842,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL SvNumberFormatObj::getPropertyValue
}
void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::PropertyValue>& )
- throw(beans::UnknownPropertyException, beans::PropertyVetoException,
- lang::IllegalArgumentException, lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
throw beans::UnknownPropertyException(); // Everything is read-only
}
@@ -895,19 +849,16 @@ void SAL_CALL SvNumberFormatObj::setPropertyValues( const uno::Sequence<beans::P
// XServiceInfo
OUString SAL_CALL SvNumberFormatObj::getImplementationName()
- throw(uno::RuntimeException, std::exception)
{
return OUString("SvNumberFormatObj");
}
sal_Bool SAL_CALL SvNumberFormatObj::supportsService( const OUString& ServiceName )
- throw(uno::RuntimeException, std::exception)
{
return cppu::supportsService( this, ServiceName );
}
uno::Sequence<OUString> SAL_CALL SvNumberFormatObj::getSupportedServiceNames()
- throw(uno::RuntimeException, std::exception)
{
return { "com.sun.star.util.NumberFormatProperties" };
}
@@ -927,7 +878,6 @@ SvNumberFormatSettingsObj::~SvNumberFormatSettingsObj()
// XPropertySet
uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatSettingsObj::getPropertySetInfo()
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
static uno::Reference<beans::XPropertySetInfo> aRef =
@@ -937,9 +887,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL SvNumberFormatSettingsObj::getP
void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const OUString& aPropertyName,
const uno::Any& aValue )
- throw(beans::UnknownPropertyException, beans::PropertyVetoException,
- lang::IllegalArgumentException, lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -978,8 +925,6 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const OUString& aProp
}
uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& aPropertyName )
- throw(beans::UnknownPropertyException, lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -1014,32 +959,24 @@ uno::Any SAL_CALL SvNumberFormatSettingsObj::getPropertyValue( const OUString& a
void SAL_CALL SvNumberFormatSettingsObj::addPropertyChangeListener( const OUString&,
const uno::Reference<beans::XPropertyChangeListener>&)
- throw(beans::UnknownPropertyException,
- lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatSettingsObj::removePropertyChangeListener( const OUString&,
const uno::Reference<beans::XPropertyChangeListener>&)
- throw(beans::UnknownPropertyException,
- lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatSettingsObj::addVetoableChangeListener( const OUString&,
const uno::Reference<beans::XVetoableChangeListener>&)
- throw(beans::UnknownPropertyException,
- lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const OUString&,
const uno::Reference<beans::XVetoableChangeListener>&)
- throw(beans::UnknownPropertyException,
- lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
@@ -1047,19 +984,16 @@ void SAL_CALL SvNumberFormatSettingsObj::removeVetoableChangeListener( const OUS
// XServiceInfo
OUString SAL_CALL SvNumberFormatSettingsObj::getImplementationName()
- throw(uno::RuntimeException, std::exception)
{
return OUString("SvNumberFormatSettingsObj");
}
sal_Bool SAL_CALL SvNumberFormatSettingsObj::supportsService( const OUString& ServiceName )
- throw(uno::RuntimeException, std::exception)
{
return cppu::supportsService( this, ServiceName );
}
uno::Sequence<OUString> SAL_CALL SvNumberFormatSettingsObj::getSupportedServiceNames()
- throw(uno::RuntimeException, std::exception)
{
return { "com.sun.star.util.NumberFormatSettings" };
}
diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index fad3f5108988..01c582594694 100644
--- a/svl/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
@@ -51,51 +51,33 @@ public:
// XNumberFormatter
virtual void SAL_CALL attachNumberFormatsSupplier(
- const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XNumberFormatsSupplier >& xSupplier ) override;
virtual css::uno::Reference< css::util::XNumberFormatsSupplier >
- SAL_CALL getNumberFormatsSupplier()
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL detectNumberFormat( sal_Int32 nKey, const OUString& aString )
- throw(css::util::NotNumericException,
- css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL convertStringToNumber( sal_Int32 nKey, const OUString& aString )
- throw(css::util::NotNumericException,
- css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL convertNumberToString( sal_Int32 nKey, double fValue )
- throw(css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getNumberFormatsSupplier() override;
+ virtual sal_Int32 SAL_CALL detectNumberFormat( sal_Int32 nKey, const OUString& aString ) override;
+ virtual double SAL_CALL convertStringToNumber( sal_Int32 nKey, const OUString& aString ) override;
+ virtual OUString SAL_CALL convertNumberToString( sal_Int32 nKey, double fValue ) override;
virtual css::util::Color SAL_CALL queryColorForNumber( sal_Int32 nKey,
- double fValue, css::util::Color aDefaultColor )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL formatString( sal_Int32 nKey, const OUString& aString )
- throw(css::uno::RuntimeException, std::exception) override;
+ double fValue, css::util::Color aDefaultColor ) override;
+ virtual OUString SAL_CALL formatString( sal_Int32 nKey, const OUString& aString ) override;
virtual css::util::Color SAL_CALL queryColorForString( sal_Int32 nKey,
const OUString& aString,
- css::util::Color aDefaultColor )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue )
- throw(css::uno::RuntimeException, std::exception) override;
+ css::util::Color aDefaultColor ) override;
+ virtual OUString SAL_CALL getInputString( sal_Int32 nKey, double fValue ) override;
// XNumberFormatPreviewer
virtual OUString SAL_CALL convertNumberToPreviewString(
const OUString& aFormat, double fValue,
- const css::lang::Locale& nLocale, sal_Bool bAllowEnglish )
- throw(css::util::MalformedNumberFormatException,
- css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Bool bAllowEnglish ) override;
virtual css::util::Color SAL_CALL queryPreviewColorForNumber(
const OUString& aFormat, double fValue,
const css::lang::Locale& nLocale, sal_Bool bAllowEnglish,
- css::util::Color aDefaultColor )
- throw(css::util::MalformedNumberFormatException,
- css::uno::RuntimeException, std::exception) override;
+ css::util::Color aDefaultColor ) 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;
};
@@ -115,50 +97,35 @@ public:
// XNumberFormats
virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
- getByKey( sal_Int32 nKey ) throw(css::uno::RuntimeException, std::exception) override;
+ getByKey( sal_Int32 nKey ) override;
virtual css::uno::Sequence< sal_Int32 > SAL_CALL queryKeys( sal_Int16 nType,
- const css::lang::Locale& nLocale, sal_Bool bCreate )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Bool bCreate ) override;
virtual sal_Int32 SAL_CALL queryKey( const OUString& aFormat,
- const css::lang::Locale& nLocale, sal_Bool bScan )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Bool bScan ) override;
virtual sal_Int32 SAL_CALL addNew( const OUString& aFormat,
- const css::lang::Locale& nLocale )
- throw(css::util::MalformedNumberFormatException,
- css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale ) override;
virtual sal_Int32 SAL_CALL addNewConverted( const OUString& aFormat,
const css::lang::Locale& nLocale,
- const css::lang::Locale& nNewLocale )
- throw(css::util::MalformedNumberFormatException,
- css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeByKey( sal_Int32 nKey ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nNewLocale ) override;
+ virtual void SAL_CALL removeByKey( sal_Int32 nKey ) override;
virtual OUString SAL_CALL generateFormat( sal_Int32 nBaseKey,
const css::lang::Locale& nLocale, sal_Bool bThousands,
- sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading )
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Bool bRed, sal_Int16 nDecimals, sal_Int16 nLeading ) override;
// XNumberFormatTypes
- virtual sal_Int32 SAL_CALL getStandardIndex( const css::lang::Locale& nLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getStandardIndex( const css::lang::Locale& nLocale ) override;
virtual sal_Int32 SAL_CALL getStandardFormat( sal_Int16 nType,
- const css::lang::Locale& nLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale ) override;
virtual sal_Int32 SAL_CALL getFormatIndex( sal_Int16 nIndex,
- const css::lang::Locale& nLocale )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isTypeCompatible( sal_Int16 nOldType, sal_Int16 nNewType )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale ) override;
+ virtual sal_Bool SAL_CALL isTypeCompatible( sal_Int16 nOldType, sal_Int16 nNewType ) override;
virtual sal_Int32 SAL_CALL getFormatForLocale( sal_Int32 nKey,
- const css::lang::Locale& nLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale ) 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;
};
@@ -178,63 +145,34 @@ public:
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo >
- SAL_CALL getPropertySetInfo( )
- throw(css::uno::RuntimeException, std::exception) override;
+ SAL_CALL 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;
+ 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;
+ 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;
+ 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;
+ css::beans::XVetoableChangeListener >& aListener ) override;
// XPropertyAccess
virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
- getPropertyValues() throw(css::uno::RuntimeException, std::exception) override;
+ getPropertyValues() override;
virtual void SAL_CALL setPropertyValues( const css::uno::Sequence<
- css::beans::PropertyValue >& aProps )
- throw(css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ css::beans::PropertyValue >& aProps ) 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;
};
@@ -253,52 +191,28 @@ public:
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo >
- SAL_CALL getPropertySetInfo( )
- throw(css::uno::RuntimeException, std::exception) override;
+ SAL_CALL 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;
+ 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;
+ 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;
+ 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;
+ css::beans::XVetoableChangeListener >& aListener ) 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;
};
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 21d211514f99..a7d3b7907ff4 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -72,7 +72,6 @@ void SvNumberFormatsSupplierObj::SetNumberFormatter(SvNumberFormatter* pNew)
// XNumberFormatsSupplier
uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsSupplierObj::getNumberFormatSettings()
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( pImpl->aMutex );
@@ -80,7 +79,6 @@ uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsSupplierObj::getNumb
}
uno::Reference<util::XNumberFormats> SAL_CALL SvNumberFormatsSupplierObj::getNumberFormats()
- throw(uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( pImpl->aMutex );
@@ -90,7 +88,7 @@ uno::Reference<util::XNumberFormats> SAL_CALL SvNumberFormatsSupplierObj::getNum
// XUnoTunnel
sal_Int64 SAL_CALL SvNumberFormatsSupplierObj::getSomething(
- const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception)
+ const uno::Sequence<sal_Int8 >& rId )
{
if ( rId.getLength() == 16 &&
0 == memcmp( getUnoTunnelId().getConstArray(),
diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 28a7f16f29bd..3b5a2e061ab4 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.cxx
@@ -53,7 +53,7 @@ SvNumberFormatsSupplierServiceObject::~SvNumberFormatsSupplierServiceObject()
}
}
-Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type& _rType )
{
Any aReturn = ::cppu::queryInterface(_rType,
static_cast< XInitialization* >(this),
@@ -66,7 +66,7 @@ Any SAL_CALL SvNumberFormatsSupplierServiceObject::queryAggregation( const Type&
return aReturn;
}
-void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< Any >& _rArguments ) throw(Exception, RuntimeException, std::exception)
+void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence< Any >& _rArguments )
{
::osl::MutexGuard aGuard( getSharedMutex() );
@@ -107,37 +107,37 @@ void SAL_CALL SvNumberFormatsSupplierServiceObject::initialize( const Sequence<
SetNumberFormatter(m_pOwnFormatter);
}
-OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( ) throw(RuntimeException, std::exception)
+OUString SAL_CALL SvNumberFormatsSupplierServiceObject::getImplementationName( )
{
return OUString("com.sun.star.uno.util.numbers.SvNumberFormatsSupplierServiceObject");
}
-sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception)
+sal_Bool SAL_CALL SvNumberFormatsSupplierServiceObject::supportsService( const OUString& _rServiceName )
{
return cppu::supportsService(this, _rServiceName);
}
-Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames( ) throw(RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL SvNumberFormatsSupplierServiceObject::getSupportedServiceNames( )
{
Sequence< OUString > aSupported { "com.sun.star.util.NumberFormatsSupplier" };
return aSupported;
}
-Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormatSettings() throw(RuntimeException, std::exception)
+Reference< XPropertySet > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormatSettings()
{
::osl::MutexGuard aGuard( getSharedMutex() );
implEnsureFormatter();
return SvNumberFormatsSupplierObj::getNumberFormatSettings();
}
-Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormats() throw(RuntimeException, std::exception)
+Reference< XNumberFormats > SAL_CALL SvNumberFormatsSupplierServiceObject::getNumberFormats()
{
::osl::MutexGuard aGuard( getSharedMutex() );
implEnsureFormatter();
return SvNumberFormatsSupplierObj::getNumberFormats();
}
-sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception)
+sal_Int64 SAL_CALL SvNumberFormatsSupplierServiceObject::getSomething( const Sequence< sal_Int8 >& aIdentifier )
{
sal_Int64 nReturn = SvNumberFormatsSupplierObj::getSomething( aIdentifier );
if ( nReturn )
diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx
index 1049a5dae054..4a00ce22f86e 100644
--- a/svl/source/numbers/supservs.hxx
+++ b/svl/source/numbers/supservs.hxx
@@ -48,28 +48,28 @@ public:
// XInterface
virtual void SAL_CALL acquire() throw() override { SvNumberFormatsSupplierObj::acquire(); }
virtual void SAL_CALL release() throw() override { SvNumberFormatsSupplierObj::release(); }
- 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
{ return SvNumberFormatsSupplierObj::queryInterface(_rType); }
// XAggregation
- virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& _rType ) override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw(css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) 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;
// XNumberFormatsSupplier
virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
- getNumberFormatSettings() throw(css::uno::RuntimeException, std::exception) override;
+ getNumberFormatSettings() override;
virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL
- getNumberFormats() throw(css::uno::RuntimeException, std::exception) override;
+ getNumberFormats() override;
// XUnoTunnler
- virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
protected:
void implEnsureFormatter();
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index d83c69964079..f328c8419878 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.cxx
@@ -402,7 +402,7 @@ PasswordContainer::~PasswordContainer()
}
}
-void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::disposing( const EventObject& )
{
::osl::MutexGuard aGuard( mMutex );
@@ -419,7 +419,7 @@ void SAL_CALL PasswordContainer::disposing( const EventObject& ) throw(RuntimeEx
}
}
-vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd ) throw(RuntimeException, std::exception)
+vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, const OUString& aMasterPasswd )
{
if( !aMasterPasswd.isEmpty() )
{
@@ -468,7 +468,7 @@ vector< OUString > PasswordContainer::DecodePasswords( const OUString& aLine, co
throw RuntimeException("Can't decode!" );
}
-OUString PasswordContainer::EncodePasswords(const vector< OUString >& lines, const OUString& aMasterPasswd ) throw(RuntimeException)
+OUString PasswordContainer::EncodePasswords(const vector< OUString >& lines, const OUString& aMasterPasswd )
{
if( !aMasterPasswd.isEmpty() )
{
@@ -545,7 +545,7 @@ OUString PasswordContainer::EncodePasswords(const vector< OUString >& lines, con
throw RuntimeException("Can't encode!" );
}
-void PasswordContainer::UpdateVector( const OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile ) throw(RuntimeException)
+void PasswordContainer::UpdateVector( const OUString& aURL, list< NamePassRecord >& toUpdate, NamePassRecord& aRecord, bool writeFile )
{
for( list< NamePassRecord >::iterator aNPIter = toUpdate.begin(); aNPIter != toUpdate.end(); ++aNPIter )
if( aNPIter->GetUserName().equals( aRecord.GetUserName() ) )
@@ -602,7 +602,7 @@ UserRecord PasswordContainer::CopyToUserRecord( const NamePassRecord& aRecord, b
}
-Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list< NamePassRecord >& original, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list< NamePassRecord >& original, const Reference< XInteractionHandler >& aHandler )
{
Sequence< UserRecord > aResult( original.size() );
sal_uInt32 nInd = 0;
@@ -619,7 +619,7 @@ Sequence< UserRecord > PasswordContainer::CopyToUserRecordSequence( const list<
}
-void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler )
{
::osl::MutexGuard aGuard( mMutex );
@@ -627,7 +627,7 @@ void SAL_CALL PasswordContainer::add( const OUString& Url, const OUString& UserN
}
-void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, const Reference< XInteractionHandler >& aHandler )
{
::osl::MutexGuard aGuard( mMutex );
@@ -635,7 +635,7 @@ void SAL_CALL PasswordContainer::addPersistent( const OUString& Url, const OUStr
}
-void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, char Mode, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserName, const Sequence< OUString >& Passwords, char Mode, const Reference< XInteractionHandler >& aHandler )
{
NamePassRecord aRecord( UserName );
::std::vector< OUString > aStorePass = comphelper::sequenceToContainer< std::vector<OUString> >( Passwords );
@@ -670,19 +670,19 @@ void PasswordContainer::PrivateAdd( const OUString& Url, const OUString& UserNam
}
-UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+UrlRecord SAL_CALL PasswordContainer::find( const OUString& aURL, const Reference< XInteractionHandler >& aHandler )
{
return find( aURL, OUString(), false, aHandler );
}
-UrlRecord SAL_CALL PasswordContainer::findForName( const OUString& aURL, const OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+UrlRecord SAL_CALL PasswordContainer::findForName( const OUString& aURL, const OUString& aName, const Reference< XInteractionHandler >& aHandler )
{
return find( aURL, aName, true, aHandler );
}
-Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& userlist, const OUString& aName, const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+Sequence< UserRecord > PasswordContainer::FindUsr( const list< NamePassRecord >& userlist, const OUString& aName, const Reference< XInteractionHandler >& aHandler )
{
sal_uInt32 nInd = 0;
for( list< NamePassRecord >::const_iterator aNPIter = userlist.begin();
@@ -709,7 +709,6 @@ bool PasswordContainer::createUrlRecord(
const OUString & aName,
const Reference< XInteractionHandler >& aHandler,
UrlRecord & rRec )
- throw( RuntimeException )
{
if ( bName )
{
@@ -736,7 +735,7 @@ UrlRecord PasswordContainer::find(
const OUString& aURL,
const OUString& aName,
bool bName, // only needed to support empty user names
- const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+ const Reference< XInteractionHandler >& aHandler )
{
::osl::MutexGuard aGuard( mMutex );
@@ -816,7 +815,7 @@ OUString PasswordContainer::RequestPasswordFromUser( PasswordRequestMode aRMode,
}
-OUString const & PasswordContainer::GetMasterPassword( const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception)
+OUString const & PasswordContainer::GetMasterPassword( const Reference< XInteractionHandler >& aHandler )
{
PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_ENTER;
if( !m_pStorageFile || !m_pStorageFile->useStorage() )
@@ -875,7 +874,7 @@ OUString const & PasswordContainer::GetMasterPassword( const Reference< XInterac
}
-void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& aName ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& aName )
{
::osl::MutexGuard aGuard( mMutex );
@@ -915,7 +914,7 @@ void SAL_CALL PasswordContainer::remove( const OUString& aURL, const OUString& a
}
-void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const OUString& aName ) throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const OUString& aName )
{
::osl::MutexGuard aGuard( mMutex );
@@ -960,7 +959,7 @@ void SAL_CALL PasswordContainer::removePersistent( const OUString& aURL, const O
}
}
-void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException, std::exception)
+void SAL_CALL PasswordContainer::removeAllPersistent()
{
::osl::MutexGuard aGuard( mMutex );
@@ -1001,7 +1000,7 @@ void SAL_CALL PasswordContainer::removeAllPersistent() throw(RuntimeException, s
}
}
-Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Reference< XInteractionHandler >& xHandler ) throw(RuntimeException, std::exception)
+Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Reference< XInteractionHandler >& xHandler )
{
Sequence< UrlRecord > aResult;
@@ -1029,7 +1028,6 @@ Sequence< UrlRecord > SAL_CALL PasswordContainer::getAllPersistent( const Refere
}
sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler )
- throw (uno::RuntimeException, std::exception)
{
bool bResult = false;
OUString aEncodedMP;
@@ -1083,7 +1081,6 @@ sal_Bool SAL_CALL PasswordContainer::authorizateWithMasterPassword( const uno::R
}
sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler )
- throw (uno::RuntimeException, std::exception)
{
bool bResult = false;
uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler;
@@ -1140,7 +1137,6 @@ sal_Bool SAL_CALL PasswordContainer::changeMasterPassword( const uno::Reference<
}
void SAL_CALL PasswordContainer::removeMasterPassword()
- throw (uno::RuntimeException, std::exception)
{
// remove all the stored passwords and the master password
removeAllPersistent();
@@ -1154,7 +1150,6 @@ void SAL_CALL PasswordContainer::removeMasterPassword()
}
sal_Bool SAL_CALL PasswordContainer::hasMasterPassword( )
- throw (css::uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( mMutex );
@@ -1166,7 +1161,6 @@ sal_Bool SAL_CALL PasswordContainer::hasMasterPassword( )
}
sal_Bool SAL_CALL PasswordContainer::allowPersistentStoring( sal_Bool bAllow )
- throw (css::uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( mMutex );
@@ -1184,7 +1178,6 @@ sal_Bool SAL_CALL PasswordContainer::allowPersistentStoring( sal_Bool bAllow )
}
sal_Bool SAL_CALL PasswordContainer::isPersistentStoringAllowed()
- throw (css::uno::RuntimeException, std::exception)
{
::osl::MutexGuard aGuard( mMutex );
@@ -1195,7 +1188,6 @@ sal_Bool SAL_CALL PasswordContainer::isPersistentStoringAllowed()
}
sal_Bool SAL_CALL PasswordContainer::useDefaultMasterPassword( const uno::Reference< task::XInteractionHandler >& xHandler )
- throw ( uno::RuntimeException, std::exception )
{
bool bResult = false;
uno::Reference< task::XInteractionHandler > xTmpHandler = xHandler;
@@ -1250,7 +1242,6 @@ sal_Bool SAL_CALL PasswordContainer::useDefaultMasterPassword( const uno::Refere
}
sal_Bool SAL_CALL PasswordContainer::isDefaultMasterPasswordUsed()
- throw ( uno::RuntimeException, std::exception )
{
::osl::MutexGuard aGuard( mMutex );
@@ -1263,25 +1254,21 @@ sal_Bool SAL_CALL PasswordContainer::isDefaultMasterPasswordUsed()
void SAL_CALL PasswordContainer::addUrl( const OUString& Url, sal_Bool MakePersistent )
- throw (uno::RuntimeException, std::exception)
{
mUrlContainer.add( Url, MakePersistent );
}
OUString SAL_CALL PasswordContainer::findUrl( const OUString& Url )
- throw (uno::RuntimeException, std::exception)
{
return mUrlContainer.find( Url );
}
void SAL_CALL PasswordContainer::removeUrl( const OUString& Url )
- throw (uno::RuntimeException, std::exception)
{
mUrlContainer.remove( Url );
}
uno::Sequence< OUString > SAL_CALL PasswordContainer::getUrls( sal_Bool OnlyPersistent )
- throw (uno::RuntimeException, std::exception)
{
return mUrlContainer.list( OnlyPersistent );
}
@@ -1332,38 +1319,38 @@ void PasswordContainer::Notify()
}
}
-OUString SAL_CALL PasswordContainer::getImplementationName( ) throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL PasswordContainer::getImplementationName( )
{
return impl_getStaticImplementationName();
}
-sal_Bool SAL_CALL PasswordContainer::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL PasswordContainer::supportsService( const OUString& ServiceName )
{
return cppu::supportsService( this, ServiceName );
}
-Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames( ) throw(uno::RuntimeException, std::exception)
+Sequence< OUString > SAL_CALL PasswordContainer::getSupportedServiceNames( )
{
return impl_getStaticSupportedServiceNames();
}
-Sequence< OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames( ) throw(uno::RuntimeException)
+Sequence< OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedServiceNames( )
{
Sequence< OUString > aRet { "com.sun.star.task.PasswordContainer" };
return aRet;
}
-OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(uno::RuntimeException)
+OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName()
{
return OUString("stardiv.svl.PasswordContainer");
}
-Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager ) throw( RuntimeException, std::exception )
+Reference< XInterface > SAL_CALL PasswordContainer::impl_createInstance( const Reference< XMultiServiceFactory >& xServiceManager )
{
return Reference< XInterface >( *new PasswordContainer( xServiceManager ) );
}
-Reference< XSingleServiceFactory > SAL_CALL PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager ) throw(RuntimeException)
+Reference< XSingleServiceFactory > SAL_CALL PasswordContainer::impl_createFactory( const Reference< XMultiServiceFactory >& ServiceManager )
{
Reference< XSingleServiceFactory > xReturn( ::cppu::createOneInstanceFactory( ServiceManager,
PasswordContainer::impl_getStaticImplementationName(),
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 007913293db9..d445cac66c8b 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.cxx
@@ -39,45 +39,38 @@ public:
PathService()
{}
- virtual OUString SAL_CALL getImplementationName()
- throw(css::uno::RuntimeException, std::exception) override
+ virtual OUString SAL_CALL getImplementationName() override
{
return OUString("com.sun.star.comp.svl.PathService");
}
virtual sal_Bool SAL_CALL supportsService (
- const OUString & rName)
- throw(css::uno::RuntimeException, std::exception) override
+ const OUString & rName) override
{
return cppu::supportsService(this, rName);
}
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw(css::uno::RuntimeException, std::exception) override
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override
{
css::uno::Sequence< OUString > aRet { "com.sun.star.config.SpecialConfigManager" };
return aRet;
}
virtual OUString SAL_CALL substituteVariables (
- const OUString& sText)
- throw(css::uno::RuntimeException, std::exception) override
+ const OUString& sText) override
{
return m_aOptions.SubstituteVariable( sText );
}
virtual void SAL_CALL addPropertyChangeListener (
- const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &)
- throw(css::uno::RuntimeException, std::exception) override
+ const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &) override
{}
virtual void SAL_CALL removePropertyChangeListener (
- const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &)
- throw(css::uno::RuntimeException, std::exception) override
+ const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &) override
{}
- virtual void SAL_CALL flush()
- throw(css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL flush() override
{}
};