summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /xmlhelp
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/inc/tvfactory.hxx20
-rw-r--r--xmlhelp/source/cxxhelp/inc/tvread.hxx75
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.cxx9
-rw-r--r--xmlhelp/source/cxxhelp/provider/content.hxx26
-rw-r--r--xmlhelp/source/cxxhelp/provider/inputstream.cxx26
-rw-r--r--xmlhelp/source/cxxhelp/provider/inputstream.hxx44
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.cxx10
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.hxx44
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.cxx80
-rw-r--r--xmlhelp/source/cxxhelp/provider/resultsetbase.hxx217
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.cxx70
-rw-r--r--xmlhelp/source/cxxhelp/provider/urlparameter.hxx5
-rw-r--r--xmlhelp/source/treeview/tvfactory.cxx8
-rw-r--r--xmlhelp/source/treeview/tvread.cxx16
14 files changed, 136 insertions, 514 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
index 695889b4d4a6..1563c8896941 100644
--- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
@@ -45,35 +45,27 @@ class TVFactory: public cppu::WeakImplHelper <
// XServiceInfo
virtual OUString SAL_CALL
- getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationName() override;
virtual sal_Bool SAL_CALL
- supportsService( const OUString& ServiceName )
- throw(css::uno::RuntimeException, std::exception ) override;
+ supportsService( const OUString& ServiceName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getSupportedServiceNames() override;
// XMultiServiceFactory
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstance(
- const OUString& aServiceSpecifier )
- throw( css::uno::Exception,
- css::uno::RuntimeException, std::exception ) override;
+ const OUString& aServiceSpecifier ) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments(
const OUString& ServiceSpecifier,
- const css::uno::Sequence< css::uno::Any >& Arguments )
- throw( css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& Arguments ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getAvailableServiceNames( )
- throw( css::uno::RuntimeException, std::exception ) override;
+ getAvailableServiceNames( ) override;
// Other
diff --git a/xmlhelp/source/cxxhelp/inc/tvread.hxx b/xmlhelp/source/cxxhelp/inc/tvread.hxx
index 4795854cd89b..0b4e1594a7f0 100644
--- a/xmlhelp/source/cxxhelp/inc/tvread.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvread.hxx
@@ -76,14 +76,12 @@ namespace treeview {
// XNameAccess
virtual css::uno::Type SAL_CALL
- getElementType( )
- throw( css::uno::RuntimeException, std::exception ) override
+ getElementType( ) override
{
return cppu::UnoType<void>::get();
}
- virtual sal_Bool SAL_CALL hasElements()
- throw( css::uno::RuntimeException, std::exception ) override
+ virtual sal_Bool SAL_CALL hasElements() override
{
return true;
}
@@ -92,8 +90,7 @@ namespace treeview {
virtual void SAL_CALL
addChangesListener(
- const css::uno::Reference< css::util::XChangesListener >& aListener )
- throw( css::uno::RuntimeException, std::exception ) override
+ const css::uno::Reference< css::util::XChangesListener >& aListener ) override
{
// read only
(void)aListener;
@@ -101,8 +98,7 @@ namespace treeview {
virtual void SAL_CALL
removeChangesListener(
- const css::uno::Reference< css::util::XChangesListener >& aListener )
- throw( css::uno::RuntimeException, std::exception ) override
+ const css::uno::Reference< css::util::XChangesListener >& aListener ) override
{
// read only
(void)aListener;
@@ -110,22 +106,19 @@ namespace treeview {
// 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
{
(void)xListener;
}
virtual void SAL_CALL
removeEventListener(
- const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw( css::uno::RuntimeException, std::exception ) override
+ const css::uno::Reference< css::lang::XEventListener >& aListener ) override
{
(void)aListener;
}
@@ -134,29 +127,21 @@ namespace treeview {
// XNameAccess
virtual css::uno::Any SAL_CALL
- getByName( const OUString& aName )
- throw( css::container::NoSuchElementException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override = 0;
+ getByName( const OUString& aName ) override = 0;
virtual css::uno::Sequence< OUString > SAL_CALL
- getElementNames( )
- throw( css::uno::RuntimeException, std::exception ) override = 0;
+ getElementNames( ) override = 0;
virtual sal_Bool SAL_CALL
- hasByName( const OUString& aName )
- throw( css::uno::RuntimeException, std::exception ) override = 0;
+ hasByName( const OUString& aName ) override = 0;
// XHierarchicalNameAccess
virtual css::uno::Any SAL_CALL
- getByHierarchicalName( const OUString& aName )
- throw( css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override = 0;
+ getByHierarchicalName( const OUString& aName ) override = 0;
virtual sal_Bool SAL_CALL
- hasByHierarchicalName( const OUString& aName )
- throw( css::uno::RuntimeException, std::exception ) override = 0;
+ hasByHierarchicalName( const OUString& aName ) override = 0;
}; // end class TVBase
@@ -173,29 +158,21 @@ namespace treeview {
// XNameAccess
virtual css::uno::Any SAL_CALL
- getByName( const OUString& aName )
- throw( css::container::NoSuchElementException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ getByName( const OUString& aName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getElementNames( )
- throw( css::uno::RuntimeException, std::exception ) override;
+ getElementNames( ) override;
virtual sal_Bool SAL_CALL
- hasByName( const OUString& aName )
- throw( css::uno::RuntimeException, std::exception ) override;
+ hasByName( const OUString& aName ) override;
// XHierarchicalNameAccess
virtual css::uno::Any SAL_CALL
- getByHierarchicalName( const OUString& aName )
- throw( css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ getByHierarchicalName( const OUString& aName ) override;
virtual sal_Bool SAL_CALL
- hasByHierarchicalName( const OUString& aName )
- throw( css::uno::RuntimeException, std::exception ) override;
+ hasByHierarchicalName( const OUString& aName ) override;
private:
@@ -217,29 +194,21 @@ namespace treeview {
virtual ~TVChildTarget() override;
virtual css::uno::Any SAL_CALL
- getByName( const OUString& aName )
- throw( css::container::NoSuchElementException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ getByName( const OUString& aName ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getElementNames( )
- throw( css::uno::RuntimeException, std::exception ) override;
+ getElementNames( ) override;
virtual sal_Bool SAL_CALL
- hasByName( const OUString& aName )
- throw( css::uno::RuntimeException, std::exception ) override;
+ hasByName( const OUString& aName ) override;
// XHierarchicalNameAccess
virtual css::uno::Any SAL_CALL
- getByHierarchicalName( const OUString& aName )
- throw( css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception ) override;
+ getByHierarchicalName( const OUString& aName ) override;
virtual sal_Bool SAL_CALL
- hasByHierarchicalName( const OUString& aName )
- throw( css::uno::RuntimeException, std::exception ) override;
+ hasByHierarchicalName( const OUString& aName ) override;
private:
std::vector< rtl::Reference< TVRead > > Elements;
diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx
index b43a0804bd43..fbc0eb7a035c 100644
--- a/xmlhelp/source/cxxhelp/provider/content.cxx
+++ b/xmlhelp/source/cxxhelp/provider/content.cxx
@@ -71,7 +71,6 @@ Content::~Content()
// virtual
uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType )
- throw ( uno::RuntimeException, std::exception )
{
uno::Any aRet;
return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface( rType );
@@ -83,7 +82,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content );
// virtual
uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
- throw( uno::RuntimeException, std::exception )
{
static cppu::OTypeCollection* pCollection = nullptr;
@@ -114,14 +112,12 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes()
// virtual
OUString SAL_CALL Content::getImplementationName()
- throw( uno::RuntimeException, std::exception )
{
return OUString( "CHelpContent" );
}
// virtual
uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
- throw( uno::RuntimeException, std::exception )
{
uno::Sequence<OUString> aSNS { "com.sun.star.ucb.CHelpContent" };
@@ -132,7 +128,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames()
// virtual
OUString SAL_CALL Content::getContentType()
- throw( uno::RuntimeException, std::exception )
{
return OUString( MYUCP_CONTENT_TYPE );
}
@@ -141,7 +136,6 @@ OUString SAL_CALL Content::getContentType()
//virtual
void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
- throw( uno::RuntimeException, std::exception )
{
}
@@ -224,9 +218,6 @@ uno::Any SAL_CALL Content::execute(
const ucb::Command& aCommand,
sal_Int32 CommandId,
const uno::Reference< ucb::XCommandEnvironment >& Environment )
- throw( uno::Exception,
- ucb::CommandAbortedException,
- uno::RuntimeException, std::exception )
{
uno::Any aRet;
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx b/xmlhelp/source/cxxhelp/provider/content.hxx
index 4120a9b31d86..5f639762ff05 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -51,41 +51,31 @@ namespace chelp
virtual ~Content() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
// XTypeProvider
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
// XServiceInfo
virtual OUString SAL_CALL
- getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationName() override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getSupportedServiceNames() override;
// XContent
virtual OUString SAL_CALL
- getContentType()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getContentType() override;
// XCommandProcessor
virtual css::uno::Any SAL_CALL
execute( const css::ucb::Command& aCommand,
sal_Int32 CommandId,
- const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment )
- throw( css::uno::Exception,
- css::ucb::CommandAbortedException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override;
virtual void SAL_CALL
- abort( sal_Int32 CommandId )
- throw( css::uno::RuntimeException, std::exception ) override;
+ abort( sal_Int32 CommandId ) override;
private:
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index 23da935affac..410135091c86 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -44,7 +44,6 @@ XInputStream_impl::~XInputStream_impl()
uno::Any SAL_CALL
XInputStream_impl::queryInterface( const uno::Type& rType )
- throw( uno::RuntimeException, std::exception)
{
uno::Any aRet = cppu::queryInterface( rType,
(static_cast< io::XInputStream* >(this)),
@@ -73,10 +72,6 @@ sal_Int32 SAL_CALL
XInputStream_impl::readBytes(
uno::Sequence< sal_Int8 >& aData,
sal_Int32 nBytesToRead )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception)
{
if( ! m_bIsOpen )
throw io::IOException();
@@ -101,10 +96,6 @@ sal_Int32 SAL_CALL
XInputStream_impl::readSomeBytes(
uno::Sequence< sal_Int8 >& aData,
sal_Int32 nMaxBytesToRead )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception)
{
return readBytes( aData,nMaxBytesToRead );
}
@@ -113,10 +104,6 @@ XInputStream_impl::readSomeBytes(
void SAL_CALL
XInputStream_impl::skipBytes(
sal_Int32 nBytesToSkip )
- throw( io::NotConnectedException,
- io::BufferSizeExceededException,
- io::IOException,
- uno::RuntimeException, std::exception)
{
if (m_aFile.setPos(osl_Pos_Current, sal_uInt64(nBytesToSkip)) != osl::FileBase::E_None)
{
@@ -127,9 +114,6 @@ XInputStream_impl::skipBytes(
sal_Int32 SAL_CALL
XInputStream_impl::available()
- throw( io::NotConnectedException,
- io::IOException,
- uno::RuntimeException, std::exception)
{
return 0;
}
@@ -137,9 +121,6 @@ XInputStream_impl::available()
void SAL_CALL
XInputStream_impl::closeInput()
- throw( io::NotConnectedException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
if( m_bIsOpen )
{
@@ -153,9 +134,6 @@ XInputStream_impl::closeInput()
void SAL_CALL
XInputStream_impl::seek( sal_Int64 location )
- throw( lang::IllegalArgumentException,
- io::IOException,
- uno::RuntimeException, std::exception )
{
if( location < 0 )
throw lang::IllegalArgumentException();
@@ -166,8 +144,6 @@ XInputStream_impl::seek( sal_Int64 location )
sal_Int64 SAL_CALL
XInputStream_impl::getPosition()
- throw( io::IOException,
- uno::RuntimeException, std::exception )
{
sal_uInt64 uPos;
if( osl::FileBase::E_None != m_aFile.getPos( uPos ) )
@@ -177,8 +153,6 @@ XInputStream_impl::getPosition()
sal_Int64 SAL_CALL
XInputStream_impl::getLength()
- throw( io::IOException,
- uno::RuntimeException, std::exception )
{
osl::FileBase::RC err;
sal_uInt64 uCurrentPos, uEndPos;
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
index d3d99e9dbc3d..8b90a26518a2 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
@@ -50,8 +50,7 @@ namespace chelp {
virtual css::uno::Any SAL_CALL
queryInterface(
- const css::uno::Type& rType )
- throw( css::uno::RuntimeException, std::exception) override;
+ const css::uno::Type& rType ) override;
virtual void SAL_CALL
acquire()
@@ -64,55 +63,30 @@ namespace chelp {
virtual sal_Int32 SAL_CALL
readBytes(
css::uno::Sequence< sal_Int8 >& aData,
- sal_Int32 nBytesToRead )
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nBytesToRead ) override;
virtual sal_Int32 SAL_CALL
readSomeBytes(
css::uno::Sequence< sal_Int8 >& aData,
- sal_Int32 nMaxBytesToRead )
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nMaxBytesToRead ) override;
virtual void SAL_CALL
- skipBytes( sal_Int32 nBytesToSkip )
- throw( css::io::NotConnectedException,
- css::io::BufferSizeExceededException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ skipBytes( sal_Int32 nBytesToSkip ) override;
virtual sal_Int32 SAL_CALL
- available()
- throw( css::io::NotConnectedException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ available() override;
virtual void SAL_CALL
- closeInput()
- throw( css::io::NotConnectedException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ closeInput() override;
virtual void SAL_CALL
- seek( sal_Int64 location )
- throw( css::lang::IllegalArgumentException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ seek( sal_Int64 location ) override;
virtual sal_Int64 SAL_CALL
- getPosition()
- throw( css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ getPosition() override;
virtual sal_Int64 SAL_CALL
- getLength()
- throw( css::io::IOException,
- css::uno::RuntimeException, std::exception ) override;
+ getLength() override;
private:
bool m_bIsOpen;
diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx
index 0cd7c897b8ec..6f5fad966224 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.cxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.cxx
@@ -70,7 +70,6 @@ void SAL_CALL ContentProvider::release()
}
css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception )
{
css::uno::Any aRet = cppu::queryInterface( rType,
(static_cast< lang::XTypeProvider* >(this)),
@@ -86,13 +85,11 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r
// XTypeProvider methods.
css::uno::Sequence< sal_Int8 > SAL_CALL ContentProvider::getImplementationId()
- throw( css::uno::RuntimeException, std::exception )
{
return css::uno::Sequence<sal_Int8>();
}
css::uno::Sequence< css::uno::Type > SAL_CALL ContentProvider::getTypes()
- throw( css::uno::RuntimeException, std::exception )
{
static cppu::OTypeCollection* pCollection = nullptr;
if ( !pCollection )
@@ -117,7 +114,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL ContentProvider::getTypes()
// XServiceInfo methods.
OUString SAL_CALL ContentProvider::getImplementationName()
- throw( uno::RuntimeException, std::exception )
{
return getImplementationName_Static();
}
@@ -129,14 +125,12 @@ OUString ContentProvider::getImplementationName_Static()
sal_Bool SAL_CALL
ContentProvider::supportsService(const OUString& ServiceName )
- throw( uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL
ContentProvider::getSupportedServiceNames()
- throw( uno::RuntimeException, std::exception )
{
return getSupportedServiceNames_Static();
}
@@ -145,7 +139,6 @@ ContentProvider::getSupportedServiceNames()
static uno::Reference< uno::XInterface > SAL_CALL
ContentProvider_CreateInstance(
const uno::Reference< lang::XMultiServiceFactory> & rSMgr )
- throw( uno::Exception )
{
lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >(
new ContentProvider( comphelper::getComponentContext(rSMgr) ) );
@@ -183,7 +176,6 @@ ContentProvider::createServiceFactory( const css::uno::Reference<
uno::Reference< ucb::XContent > SAL_CALL
ContentProvider::queryContent(
const uno::Reference< ucb::XContentIdentifier >& xCanonicId )
- throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception )
{
if ( !xCanonicId->getContentProviderScheme()
.equalsIgnoreAsciiCase( m_aScheme ) )
@@ -221,7 +213,6 @@ ContentProvider::queryContent(
void SAL_CALL
ContentProvider::dispose()
- throw ( uno::RuntimeException, std::exception)
{
if(m_xContainer.is())
{
@@ -232,7 +223,6 @@ ContentProvider::dispose()
void SAL_CALL
ContentProvider::elementReplaced(const container::ContainerEvent& Event)
- throw (uno::RuntimeException, std::exception)
{
if(!m_pDatabases)
return;
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 530f7ab349a9..7f2a1ddc2f3f 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -57,27 +57,20 @@ namespace chelp {
virtual ~ContentProvider() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType )
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override;
virtual void SAL_CALL acquire()
throw() override;
virtual void SAL_CALL release()
throw() override;
// XTypeProvider
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException,
- std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
static OUString getImplementationName_Static();
@@ -88,28 +81,23 @@ namespace chelp {
// XContentProvider
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent(
- const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier )
- throw( css::ucb::IllegalIdentifierException,
- css::uno::RuntimeException, std::exception ) override;
+ const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override;
// Additional interfaces
// XComponent
virtual void SAL_CALL
- dispose( )
- throw (css::uno::RuntimeException, std::exception) override;
+ dispose( ) override;
virtual void SAL_CALL
- addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override
+ addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override
{
(void)xListener;
}
virtual void SAL_CALL
- removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override
{
(void)aListener;
}
@@ -117,29 +105,25 @@ namespace chelp {
// XContainerListener ( derive from XEventListener )
virtual void SAL_CALL
- disposing( const css::lang::EventObject& /*Source*/ )
- throw (css::uno::RuntimeException, std::exception) override
+ disposing( const css::lang::EventObject& /*Source*/ ) override
{
m_xContainer.clear();
}
virtual void SAL_CALL
- elementInserted( const css::container::ContainerEvent& Event )
- throw (css::uno::RuntimeException, std::exception) override
+ elementInserted( const css::container::ContainerEvent& Event ) override
{
(void)Event;
}
virtual void SAL_CALL
- elementRemoved( const css::container::ContainerEvent& Event )
- throw (css::uno::RuntimeException, std::exception) override
+ elementRemoved( const css::container::ContainerEvent& Event ) override
{
(void)Event;
}
virtual void SAL_CALL
- elementReplaced( const css::container::ContainerEvent& Event )
- throw (css::uno::RuntimeException, std::exception) override;
+ elementReplaced( const css::container::ContainerEvent& Event ) override;
// Non-interface methods.
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index 9858740ae138..0c0bd40bde2c 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -73,7 +73,6 @@ ResultSetBase::release()
uno::Any SAL_CALL
ResultSetBase::queryInterface( const uno::Type& rType )
- throw( uno::RuntimeException, std::exception )
{
uno::Any aRet = cppu::queryInterface( rType,
(static_cast< lang::XComponent* >(this)),
@@ -92,7 +91,6 @@ ResultSetBase::queryInterface( const uno::Type& rType )
void SAL_CALL
ResultSetBase::addEventListener(
const uno::Reference< lang::XEventListener >& Listener )
- throw( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -107,7 +105,6 @@ ResultSetBase::addEventListener(
void SAL_CALL
ResultSetBase::removeEventListener(
const uno::Reference< lang::XEventListener >& Listener )
- throw( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -118,7 +115,6 @@ ResultSetBase::removeEventListener(
void SAL_CALL
ResultSetBase::dispose()
- throw( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard( m_aMutex );
@@ -144,8 +140,6 @@ ResultSetBase::dispose()
sal_Bool SAL_CALL
ResultSetBase::next()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
bool test;
m_nRow++;
@@ -159,8 +153,6 @@ ResultSetBase::next()
sal_Bool SAL_CALL
ResultSetBase::isBeforeFirst()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return m_nRow == -1;
}
@@ -168,8 +160,6 @@ ResultSetBase::isBeforeFirst()
sal_Bool SAL_CALL
ResultSetBase::isAfterLast()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return sal::static_int_cast<sal_uInt32>( m_nRow ) >= m_aItems.size(); // Cannot happen, if m_aFolder.isOpen()
}
@@ -177,8 +167,6 @@ ResultSetBase::isAfterLast()
sal_Bool SAL_CALL
ResultSetBase::isFirst()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return m_nRow == 0;
}
@@ -186,8 +174,6 @@ ResultSetBase::isFirst()
sal_Bool SAL_CALL
ResultSetBase::isLast()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
if( sal::static_int_cast<sal_uInt32>( m_nRow ) == m_aItems.size() - 1 )
return true;
@@ -198,8 +184,6 @@ ResultSetBase::isLast()
void SAL_CALL
ResultSetBase::beforeFirst()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
m_nRow = -1;
}
@@ -207,8 +191,6 @@ ResultSetBase::beforeFirst()
void SAL_CALL
ResultSetBase::afterLast()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
m_nRow = m_aItems.size();
}
@@ -216,8 +198,6 @@ ResultSetBase::afterLast()
sal_Bool SAL_CALL
ResultSetBase::first()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
m_nRow = -1;
return next();
@@ -226,8 +206,6 @@ ResultSetBase::first()
sal_Bool SAL_CALL
ResultSetBase::last()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
m_nRow = m_aItems.size() - 1;
return true;
@@ -236,8 +214,6 @@ ResultSetBase::last()
sal_Int32 SAL_CALL
ResultSetBase::getRow()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
// Test, whether behind last row
if( -1 == m_nRow || sal::static_int_cast<sal_uInt32>( m_nRow ) >= m_aItems.size() )
@@ -248,7 +224,6 @@ ResultSetBase::getRow()
sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
- throw( sdbc::SQLException, uno::RuntimeException, std::exception)
{
if( row >= 0 )
m_nRow = row - 1;
@@ -266,8 +241,6 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )
sal_Bool SAL_CALL
ResultSetBase::relative( sal_Int32 row )
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
if( isAfterLast() || isBeforeFirst() )
throw sdbc::SQLException();
@@ -285,8 +258,6 @@ ResultSetBase::relative( sal_Int32 row )
sal_Bool SAL_CALL
ResultSetBase::previous()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
if( sal::static_int_cast<sal_uInt32>( m_nRow ) > m_aItems.size() )
m_nRow = m_aItems.size(); // Correct Handling of afterLast
@@ -298,32 +269,24 @@ ResultSetBase::previous()
void SAL_CALL
ResultSetBase::refreshRow()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
}
sal_Bool SAL_CALL
ResultSetBase::rowUpdated()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return false;
}
sal_Bool SAL_CALL
ResultSetBase::rowInserted()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return false;
}
sal_Bool SAL_CALL
ResultSetBase::rowDeleted()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
return false;
}
@@ -331,8 +294,6 @@ ResultSetBase::rowDeleted()
uno::Reference< uno::XInterface > SAL_CALL
ResultSetBase::getStatement()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
uno::Reference< uno::XInterface > test( nullptr );
return test;
@@ -343,15 +304,12 @@ ResultSetBase::getStatement()
void SAL_CALL
ResultSetBase::close()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception)
{
}
OUString SAL_CALL
ResultSetBase::queryContentIdentifierString()
- throw( uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aPath[m_nRow];
@@ -362,7 +320,6 @@ ResultSetBase::queryContentIdentifierString()
uno::Reference< ucb::XContentIdentifier > SAL_CALL
ResultSetBase::queryContentIdentifier()
- throw( uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
{
@@ -378,7 +335,6 @@ ResultSetBase::queryContentIdentifier()
uno::Reference< ucb::XContent > SAL_CALL
ResultSetBase::queryContent()
- throw( uno::RuntimeException, std::exception )
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_xProvider->queryContent( queryContentIdentifier() );
@@ -411,23 +367,19 @@ public:
OWeakObject::release();
}
- uno::Any SAL_CALL queryInterface( const uno::Type& rType )
- throw( uno::RuntimeException, std::exception ) override
+ uno::Any SAL_CALL queryInterface( const uno::Type& rType ) override
{
uno::Any aRet = cppu::queryInterface( rType,
(static_cast< beans::XPropertySetInfo* >(this)) );
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
- uno::Sequence< beans::Property > SAL_CALL getProperties()
- throw( uno::RuntimeException, std::exception ) override
+ uno::Sequence< beans::Property > SAL_CALL getProperties() override
{
return m_aSeq;
}
- beans::Property SAL_CALL getPropertyByName( const OUString& aName )
- throw( beans::UnknownPropertyException,
- uno::RuntimeException, std::exception) override
+ beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override
{
for( int i = 0; i < m_aSeq.getLength(); ++i )
if( aName == m_aSeq[i].Name )
@@ -435,8 +387,7 @@ public:
throw beans::UnknownPropertyException();
}
- sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
- throw( uno::RuntimeException, std::exception ) override
+ sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override
{
for( int i = 0; i < m_aSeq.getLength(); ++i )
if( Name == m_aSeq[i].Name )
@@ -453,7 +404,6 @@ private:
// XPropertySet
uno::Reference< beans::XPropertySetInfo > SAL_CALL
ResultSetBase::getPropertySetInfo()
- throw( uno::RuntimeException, std::exception)
{
uno::Sequence< beans::Property > seq(2);
seq[0].Name = "RowCount";
@@ -473,11 +423,6 @@ ResultSetBase::getPropertySetInfo()
void SAL_CALL ResultSetBase::setPropertyValue(
const OUString& aPropertyName, const uno::Any& aValue )
- throw( beans::UnknownPropertyException,
- beans::PropertyVetoException,
- lang::IllegalArgumentException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
(void)aValue;
@@ -491,9 +436,6 @@ void SAL_CALL ResultSetBase::setPropertyValue(
uno::Any SAL_CALL ResultSetBase::getPropertyValue(
const OUString& PropertyName )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
if( PropertyName == "IsRowCountFinal" )
{
@@ -512,9 +454,6 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue(
void SAL_CALL ResultSetBase::addPropertyChangeListener(
const OUString& aPropertyName,
const uno::Reference< beans::XPropertyChangeListener >& xListener )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
if( aPropertyName == "IsRowCountFinal" )
{
@@ -541,9 +480,6 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener(
void SAL_CALL ResultSetBase::removePropertyChangeListener(
const OUString& aPropertyName,
const uno::Reference< beans::XPropertyChangeListener >& aListener )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
if( aPropertyName == "IsRowCountFinal" &&
m_pIsFinalListeners )
@@ -565,9 +501,6 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener(
void SAL_CALL ResultSetBase::addVetoableChangeListener(
const OUString& PropertyName,
const uno::Reference< beans::XVetoableChangeListener >& aListener )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
(void)PropertyName;
(void)aListener;
@@ -577,9 +510,6 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener(
void SAL_CALL ResultSetBase::removeVetoableChangeListener(
const OUString& PropertyName,
const uno::Reference< beans::XVetoableChangeListener >& aListener )
- throw( beans::UnknownPropertyException,
- lang::WrappedTargetException,
- uno::RuntimeException, std::exception)
{
(void)PropertyName;
(void)aListener;
@@ -589,8 +519,6 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener(
// XResultSetMetaDataSupplier
uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
ResultSetBase::getMetaData()
- throw( sdbc::SQLException,
- uno::RuntimeException, std::exception )
{
::ucbhelper::ResultSetMetaData* p =
new ::ucbhelper::ResultSetMetaData( m_xContext, m_sProperty );
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index 250cdbb5d741..af6d4a6959ce 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -58,8 +58,7 @@ namespace chelp {
// XInterface
virtual css::uno::Any SAL_CALL
- queryInterface( const css::uno::Type& aType )
- throw( css::uno::RuntimeException, std::exception) override;
+ queryInterface( const css::uno::Type& aType ) override;
virtual void SAL_CALL
acquire()
@@ -71,23 +70,18 @@ namespace chelp {
// XComponent
virtual void SAL_CALL
- dispose()
- throw( css::uno::RuntimeException, std::exception ) override;
+ dispose() override;
virtual void SAL_CALL
- addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
virtual void SAL_CALL
- removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw( css::uno::RuntimeException, std::exception ) override;
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XRow
virtual sal_Bool SAL_CALL
- wasNull()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ wasNull() override
{
if( 0<= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
m_nWasNull = m_aItems[m_nRow]->wasNull();
@@ -97,9 +91,7 @@ namespace chelp {
}
virtual OUString SAL_CALL
- getString( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getString( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getString( columnIndex );
@@ -108,9 +100,7 @@ namespace chelp {
}
virtual sal_Bool SAL_CALL
- getBoolean( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getBoolean( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getBoolean( columnIndex );
@@ -119,9 +109,7 @@ namespace chelp {
}
virtual sal_Int8 SAL_CALL
- getByte( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getByte( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getByte( columnIndex );
@@ -130,10 +118,7 @@ namespace chelp {
}
virtual sal_Int16 SAL_CALL
- getShort( sal_Int32 columnIndex )
- throw(
- css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getShort( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getShort( columnIndex );
@@ -142,9 +127,7 @@ namespace chelp {
}
virtual sal_Int32 SAL_CALL
- getInt( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ getInt( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getInt( columnIndex );
@@ -153,9 +136,7 @@ namespace chelp {
}
virtual sal_Int64 SAL_CALL
- getLong( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getLong( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getLong( columnIndex );
@@ -164,9 +145,7 @@ namespace chelp {
}
virtual float SAL_CALL
- getFloat( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ getFloat( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getFloat( columnIndex );
@@ -175,9 +154,7 @@ namespace chelp {
}
virtual double SAL_CALL
- getDouble( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ getDouble( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getDouble( columnIndex );
@@ -186,9 +163,7 @@ namespace chelp {
}
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getBytes( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception ) override
+ getBytes( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getBytes( columnIndex );
@@ -197,9 +172,7 @@ namespace chelp {
}
virtual css::util::Date SAL_CALL
- getDate( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getDate( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getDate( columnIndex );
@@ -208,9 +181,7 @@ namespace chelp {
}
virtual css::util::Time SAL_CALL
- getTime( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getTime( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getTime( columnIndex );
@@ -219,9 +190,7 @@ namespace chelp {
}
virtual css::util::DateTime SAL_CALL
- getTimestamp( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getTimestamp( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getTimestamp( columnIndex );
@@ -230,9 +199,7 @@ namespace chelp {
}
virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
- getBinaryStream( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getBinaryStream( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getBinaryStream( columnIndex );
@@ -241,9 +208,7 @@ namespace chelp {
}
virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
- getCharacterStream( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getCharacterStream( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getCharacterStream( columnIndex );
@@ -253,9 +218,7 @@ namespace chelp {
virtual css::uno::Any SAL_CALL
getObject( sal_Int32 columnIndex,
- const css::uno::Reference< css::container::XNameAccess >& typeMap )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ const css::uno::Reference< css::container::XNameAccess >& typeMap ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getObject( columnIndex,typeMap );
@@ -264,9 +227,7 @@ namespace chelp {
}
virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
- getRef( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getRef( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getRef( columnIndex );
@@ -275,9 +236,7 @@ namespace chelp {
}
virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
- getBlob( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getBlob( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getBlob( columnIndex );
@@ -286,9 +245,7 @@ namespace chelp {
}
virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
- getClob( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getClob( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getClob( columnIndex );
@@ -297,9 +254,7 @@ namespace chelp {
}
virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
- getArray( sal_Int32 columnIndex )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override
+ getArray( sal_Int32 columnIndex ) override
{
if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
return m_aItems[m_nRow]->getArray( columnIndex );
@@ -311,175 +266,111 @@ namespace chelp {
// XResultSet
virtual sal_Bool SAL_CALL
- next()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ next() override;
virtual sal_Bool SAL_CALL
- isBeforeFirst()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ isBeforeFirst() override;
virtual sal_Bool SAL_CALL
- isAfterLast()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ isAfterLast() override;
virtual sal_Bool SAL_CALL
- isFirst()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ isFirst() override;
virtual sal_Bool SAL_CALL
- isLast()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ isLast() override;
virtual void SAL_CALL
- beforeFirst()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ beforeFirst() override;
virtual void SAL_CALL
- afterLast()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ afterLast() override;
virtual sal_Bool SAL_CALL
- first()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ first() override;
virtual sal_Bool SAL_CALL
- last()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ last() override;
virtual sal_Int32 SAL_CALL
- getRow()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ getRow() override;
virtual sal_Bool SAL_CALL
- absolute( sal_Int32 row )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ absolute( sal_Int32 row ) override;
virtual sal_Bool SAL_CALL
- relative( sal_Int32 rows )
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ relative( sal_Int32 rows ) override;
virtual sal_Bool SAL_CALL
- previous()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ previous() override;
virtual void SAL_CALL
- refreshRow()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ refreshRow() override;
virtual sal_Bool SAL_CALL
- rowUpdated()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ rowUpdated() override;
virtual sal_Bool SAL_CALL
- rowInserted()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ rowInserted() override;
virtual sal_Bool SAL_CALL
- rowDeleted()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ rowDeleted() override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- getStatement()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ getStatement() override;
// XCloseable
virtual void SAL_CALL
- close()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ close() override;
// XContentAccess
virtual OUString SAL_CALL
- queryContentIdentifierString()
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryContentIdentifierString() override;
virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
- queryContentIdentifier()
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryContentIdentifier() override;
virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
- queryContent()
- throw( css::uno::RuntimeException, std::exception ) override;
+ queryContent() override;
// XResultSetMetaDataSupplier
virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
- getMetaData()
- throw( css::sdbc::SQLException,
- css::uno::RuntimeException, std::exception) override;
+ getMetaData() override;
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo()
- throw( css::uno::RuntimeException, std::exception) override;
+ getPropertySetInfo() override;
virtual void SAL_CALL setPropertyValue(
const OUString& aPropertyName,
- const css::uno::Any& aValue )
- throw( css::beans::UnknownPropertyException,
- css::beans::PropertyVetoException,
- css::lang::IllegalArgumentException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Any& aValue ) override;
virtual css::uno::Any SAL_CALL
getPropertyValue(
- const OUString& PropertyName )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const OUString& PropertyName ) override;
virtual void SAL_CALL
addPropertyChangeListener(
const OUString& aPropertyName,
- const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
virtual void SAL_CALL
removePropertyChangeListener(
const OUString& aPropertyName,
- const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
virtual void SAL_CALL
addVetoableChangeListener(
const OUString& PropertyName,
- const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
virtual void SAL_CALL removeVetoableChangeListener(
const OUString& PropertyName,
- const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener )
- throw( css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
protected:
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index 4a6f13d2c6f4..4e3b5d9d9d8b 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -61,7 +61,6 @@ using namespace chelp;
URLParameter::URLParameter( const OUString& aURL,
Databases* pDatabases )
- throw( css::ucb::IllegalIdentifierException )
: m_pDatabases( pDatabases ),
m_aURL( aURL )
{
@@ -305,42 +304,25 @@ public:
Databases* pDatatabases,
bool isRoot );
- virtual Any SAL_CALL queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) override;
+ virtual Any SAL_CALL queryInterface( const Type& rType ) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
- virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead )
- throw( NotConnectedException,
- BufferSizeExceededException,
- IOException,
- RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead ) override;
- virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData,sal_Int32 nMaxBytesToRead )
- throw( NotConnectedException,
- BufferSizeExceededException,
- IOException,
- RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData,sal_Int32 nMaxBytesToRead ) override;
- virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException,
- BufferSizeExceededException,
- IOException,
- RuntimeException, std::exception ) override;
+ virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override;
- virtual sal_Int32 SAL_CALL available() throw( NotConnectedException,
- IOException,
- RuntimeException, std::exception ) override;
+ virtual sal_Int32 SAL_CALL available() override;
- virtual void SAL_CALL closeInput() throw( NotConnectedException,
- IOException,
- RuntimeException, std::exception ) override;
+ virtual void SAL_CALL closeInput() override;
- virtual void SAL_CALL seek( sal_Int64 location ) throw( IllegalArgumentException,
- IOException,
- RuntimeException, std::exception ) override;
+ virtual void SAL_CALL seek( sal_Int64 location ) override;
- virtual sal_Int64 SAL_CALL getPosition() throw( IOException,RuntimeException, std::exception ) override;
+ virtual sal_Int64 SAL_CALL getPosition() override;
- virtual sal_Int64 SAL_CALL getLength() throw( IOException,RuntimeException, std::exception ) override;
+ virtual sal_Int64 SAL_CALL getLength() override;
void addToBuffer( const char* buffer,int len );
@@ -397,7 +379,7 @@ void URLParameter::open( const Command& aCommand,
}
-void URLParameter::parse() throw( css::ucb::IllegalIdentifierException )
+void URLParameter::parse()
{
m_aExpr = m_aURL;
@@ -909,7 +891,7 @@ InputStreamTransformer::InputStreamTransformer( URLParameter* urlParam,
}
-Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType ) throw( RuntimeException, std::exception )
+Any SAL_CALL InputStreamTransformer::queryInterface( const Type& rType )
{
Any aRet = ::cppu::queryInterface( rType,
(static_cast< XInputStream* >(this)),
@@ -932,10 +914,6 @@ void SAL_CALL InputStreamTransformer::release() throw()
sal_Int32 SAL_CALL InputStreamTransformer::readBytes( Sequence< sal_Int8 >& aData,sal_Int32 nBytesToRead )
- throw( NotConnectedException,
- BufferSizeExceededException,
- IOException,
- RuntimeException, std::exception)
{
osl::MutexGuard aGuard( m_aMutex );
@@ -956,44 +934,31 @@ sal_Int32 SAL_CALL InputStreamTransformer::readBytes( Sequence< sal_Int8 >& aDat
sal_Int32 SAL_CALL InputStreamTransformer::readSomeBytes( Sequence< sal_Int8 >& aData,sal_Int32 nMaxBytesToRead )
- throw( NotConnectedException,
- BufferSizeExceededException,
- IOException,
- RuntimeException, std::exception)
{
return readBytes( aData,nMaxBytesToRead );
}
-void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip ) throw( NotConnectedException,
- BufferSizeExceededException,
- IOException,
- RuntimeException, std::exception )
+void SAL_CALL InputStreamTransformer::skipBytes( sal_Int32 nBytesToSkip )
{
osl::MutexGuard aGuard( m_aMutex );
while( nBytesToSkip-- ) ++pos;
}
-sal_Int32 SAL_CALL InputStreamTransformer::available() throw( NotConnectedException,
- IOException,
- RuntimeException, std::exception )
+sal_Int32 SAL_CALL InputStreamTransformer::available()
{
osl::MutexGuard aGuard( m_aMutex );
return len-pos > 0 ? len - pos : 0 ;
}
-void SAL_CALL InputStreamTransformer::closeInput() throw( NotConnectedException,
- IOException,
- RuntimeException, std::exception )
+void SAL_CALL InputStreamTransformer::closeInput()
{
}
-void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalArgumentException,
- IOException,
- RuntimeException, std::exception )
+void SAL_CALL InputStreamTransformer::seek( sal_Int64 location )
{
osl::MutexGuard aGuard( m_aMutex );
if( location < 0 )
@@ -1006,15 +971,14 @@ void SAL_CALL InputStreamTransformer::seek( sal_Int64 location ) throw( IllegalA
}
-sal_Int64 SAL_CALL InputStreamTransformer::getPosition() throw( IOException,
- RuntimeException, std::exception )
+sal_Int64 SAL_CALL InputStreamTransformer::getPosition()
{
osl::MutexGuard aGuard( m_aMutex );
return sal_Int64( pos );
}
-sal_Int64 SAL_CALL InputStreamTransformer::getLength() throw( IOException,RuntimeException, std::exception )
+sal_Int64 SAL_CALL InputStreamTransformer::getLength()
{
osl::MutexGuard aGuard( m_aMutex );
diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
index c2d67cafd413..4a6a7af4a033 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx
@@ -111,8 +111,7 @@ namespace chelp {
public:
/// @throws css::ucb::IllegalIdentifierException
URLParameter( const OUString& aURL,
- Databases* pDatabases )
- throw( css::ucb::IllegalIdentifierException );
+ Databases* pDatabases );
bool isActive() const { return !m_aActive.isEmpty() && m_aActive == "true"; }
bool isQuery() const { return m_aId.isEmpty() && !m_aQuery.isEmpty(); }
@@ -219,7 +218,7 @@ namespace chelp {
void readHelpDataFile();
/// @throws css::ucb::IllegalIdentifierException
- void parse() throw( css::ucb::IllegalIdentifierException );
+ void parse();
bool scheme();
diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx
index f054d4f0e2c7..c0f4b9605ff6 100644
--- a/xmlhelp/source/treeview/tvfactory.cxx
+++ b/xmlhelp/source/treeview/tvfactory.cxx
@@ -45,20 +45,17 @@ TVFactory::~TVFactory()
OUString SAL_CALL
TVFactory::getImplementationName()
- throw( RuntimeException, std::exception )
{
return TVFactory::getImplementationName_static();
}
sal_Bool SAL_CALL TVFactory::supportsService( const OUString& ServiceName )
- throw( RuntimeException, std::exception )
{
return cppu::supportsService( this, ServiceName );
}
Sequence< OUString > SAL_CALL
TVFactory::getSupportedServiceNames()
- throw( RuntimeException, std::exception )
{
return TVFactory::getSupportedServiceNames_static();
}
@@ -68,8 +65,6 @@ TVFactory::getSupportedServiceNames()
Reference< XInterface > SAL_CALL
TVFactory::createInstance(
const OUString& aServiceSpecifier )
- throw( Exception,
- RuntimeException, std::exception )
{
Sequence< Any > seq( 1 );
seq[0] <<= PropertyValue(
@@ -86,8 +81,6 @@ Reference< XInterface > SAL_CALL
TVFactory::createInstanceWithArguments(
const OUString& /*ServiceSpecifier*/,
const Sequence< Any >& Arguments )
- throw( Exception,
- RuntimeException, std::exception )
{
if( ! m_xHDS.is() )
{
@@ -127,7 +120,6 @@ TVFactory::createInstanceWithArguments(
Sequence< OUString > SAL_CALL
TVFactory::getAvailableServiceNames( )
- throw( RuntimeException, std::exception )
{
Sequence<OUString> seq { "com.sun.star.ucb.HierarchyDataReadAccess" };
return seq;
diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx
index fd9ae6c3c138..a2732f3a6007 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -254,9 +254,6 @@ TVRead::~TVRead()
Any SAL_CALL
TVRead::getByName( const OUString& aName )
- throw( NoSuchElementException,
- WrappedTargetException,
- RuntimeException, std::exception )
{
bool found( true );
Any aAny;
@@ -280,7 +277,6 @@ TVRead::getByName( const OUString& aName )
Sequence< OUString > SAL_CALL
TVRead::getElementNames( )
- throw( RuntimeException, std::exception )
{
Sequence< OUString > seq( 3 );
@@ -293,7 +289,6 @@ TVRead::getElementNames( )
sal_Bool SAL_CALL
TVRead::hasByName( const OUString& aName )
- throw( RuntimeException, std::exception )
{
if( aName == "Title" ||
aName == "TargetURL" ||
@@ -307,8 +302,6 @@ TVRead::hasByName( const OUString& aName )
Any SAL_CALL
TVRead::getByHierarchicalName( const OUString& aName )
- throw( NoSuchElementException,
- RuntimeException, std::exception )
{
sal_Int32 idx;
@@ -321,7 +314,6 @@ TVRead::getByHierarchicalName( const OUString& aName )
sal_Bool SAL_CALL
TVRead::hasByHierarchicalName( const OUString& aName )
- throw( RuntimeException, std::exception )
{
sal_Int32 idx;
@@ -525,9 +517,6 @@ bool TVChildTarget::SearchAndInsert(TVDom* p, TVDom* tvDom)
Any SAL_CALL
TVChildTarget::getByName( const OUString& aName )
- throw( NoSuchElementException,
- WrappedTargetException,
- RuntimeException, std::exception )
{
OUString num( aName.getStr()+2,aName.getLength()-4 );
sal_Int32 idx = num.toInt32() - 1;
@@ -540,7 +529,6 @@ TVChildTarget::getByName( const OUString& aName )
Sequence< OUString > SAL_CALL
TVChildTarget::getElementNames( )
- throw( RuntimeException, std::exception )
{
Sequence< OUString > seq( Elements.size() );
for( size_t i = 0; i < Elements.size(); ++i )
@@ -551,7 +539,6 @@ TVChildTarget::getElementNames( )
sal_Bool SAL_CALL
TVChildTarget::hasByName( const OUString& aName )
- throw( RuntimeException, std::exception )
{
OUString num( aName.getStr()+2,aName.getLength()-4 );
sal_Int32 idx = num.toInt32() - 1;
@@ -565,8 +552,6 @@ TVChildTarget::hasByName( const OUString& aName )
Any SAL_CALL
TVChildTarget::getByHierarchicalName( const OUString& aName )
- throw( NoSuchElementException,
- RuntimeException, std::exception )
{
sal_Int32 idx;
@@ -586,7 +571,6 @@ TVChildTarget::getByHierarchicalName( const OUString& aName )
sal_Bool SAL_CALL
TVChildTarget::hasByHierarchicalName( const OUString& aName )
- throw( RuntimeException, std::exception )
{
sal_Int32 idx;