remove some more (void) style function definitions/declarations

found with
    git grep -nP '^\s*void\s*\)'

Change-Id: I1206031cf957cb6f957cae64ec5cae1280bda694
Reviewed-on: https://gerrit.libreoffice.org/26590
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index f3e37a5..d7b6db8 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -577,8 +577,7 @@ BaseContent::addProperty(


void SAL_CALL
BaseContent::removeProperty(
    const OUString& Name )
BaseContent::removeProperty( const OUString& Name )
    throw( beans::UnknownPropertyException,
           beans::NotRemoveableException,
           RuntimeException, std::exception)
@@ -595,8 +594,7 @@ BaseContent::removeProperty(


Sequence< ContentInfo > SAL_CALL
BaseContent::queryCreatableContentsInfo(
    void )
BaseContent::queryCreatableContentsInfo()
    throw( RuntimeException, std::exception )
{
    return m_pMyShell->queryCreatableContentsInfo();
@@ -604,8 +602,7 @@ BaseContent::queryCreatableContentsInfo(


Reference< XContent > SAL_CALL
BaseContent::createNewContent(
    const ContentInfo& Info )
BaseContent::createNewContent( const ContentInfo& Info )
    throw( RuntimeException, std::exception )
{
    // Check type.
@@ -695,8 +692,7 @@ BaseContent::removePropertySetInfoChangeListener(


Reference< XInterface > SAL_CALL
BaseContent::getParent(
    void )
BaseContent::getParent()
    throw( RuntimeException, std::exception )
{
    OUString ParentUnq = getParentName( m_aUncPath );
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index b798cae..c071f61 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -88,25 +88,21 @@ namespace fileaccess {

        // XInterface
        virtual css::uno::Any SAL_CALL
        queryInterface(
            const css::uno::Type& aType )
        queryInterface( const css::uno::Type& aType )
            throw( css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        acquire(
            void )
        acquire()
            throw() override;

        virtual void SAL_CALL
        release(
            void )
        release()
            throw() override;


        // XComponent
        virtual void SAL_CALL
        dispose(
            void )
        dispose()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
@@ -156,8 +152,7 @@ namespace fileaccess {
                   css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
        abort(
            sal_Int32 CommandId )
        abort( sal_Int32 CommandId )
            throw( css::uno::RuntimeException, std::exception ) override;


@@ -206,8 +201,7 @@ namespace fileaccess {
                   css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        removeProperty(
            const OUString& Name )
        removeProperty( const OUString& Name )
            throw( css::beans::UnknownPropertyException,
                   css::beans::NotRemoveableException,
                   css::uno::RuntimeException, std::exception ) override;
@@ -228,20 +222,17 @@ namespace fileaccess {
        // XContentCreator

        virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL
        queryCreatableContentsInfo(
            void )
        queryCreatableContentsInfo()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
        createNewContent(
            const css::ucb::ContentInfo& Info )
        createNewContent( const css::ucb::ContentInfo& Info )
            throw( css::uno::RuntimeException, std::exception ) override;


        // XChild
        virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
        getParent(
            void ) throw( css::uno::RuntimeException, std::exception ) override;
        getParent() throw( css::uno::RuntimeException, std::exception ) override;

        // Not supported
        virtual void SAL_CALL
diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx
index 4487a3d..09c8e8a2 100644
--- a/ucb/source/ucp/file/filcmd.cxx
+++ b/ucb/source/ucp/file/filcmd.cxx
@@ -42,8 +42,7 @@ XCommandInfo_impl::~XCommandInfo_impl()


void SAL_CALL
XCommandInfo_impl::acquire(
                 void )
XCommandInfo_impl::acquire()
  throw()
{
  OWeakObject::acquire();
@@ -51,8 +50,7 @@ XCommandInfo_impl::acquire(


void SAL_CALL
XCommandInfo_impl::release(
    void )
XCommandInfo_impl::release()
  throw()
{
    OWeakObject::release();
@@ -60,8 +58,7 @@ XCommandInfo_impl::release(


uno::Any SAL_CALL
XCommandInfo_impl::queryInterface(
                    const uno::Type& rType )
XCommandInfo_impl::queryInterface( const uno::Type& rType )
  throw( uno::RuntimeException, std::exception )
{
    uno::Any aRet = cppu::queryInterface( rType,
@@ -71,8 +68,7 @@ XCommandInfo_impl::queryInterface(


uno::Sequence< CommandInfo > SAL_CALL
XCommandInfo_impl::getCommands(
    void )
XCommandInfo_impl::getCommands()
    throw( uno::RuntimeException, std::exception )
{
    return m_pMyShell->m_sCommandInfo;
diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx
index bb3c498..e811c8f 100644
--- a/ucb/source/ucp/file/filcmd.hxx
+++ b/ucb/source/ucp/file/filcmd.hxx
@@ -45,47 +45,39 @@ namespace fileaccess {

        // XInterface
        virtual css::uno::Any SAL_CALL
        queryInterface(
            const css::uno::Type& aType )
        queryInterface( const css::uno::Type& aType )
            throw( css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        acquire(
            void )
        acquire()
            throw() override;

        virtual void SAL_CALL
        release(
            void )
        release()
            throw() override;

        // XCommandInfo

        virtual css::uno::Sequence< css::ucb::CommandInfo > SAL_CALL
        getCommands(
            void )
        getCommands()
            throw( css::uno::RuntimeException, std::exception) override;

        virtual css::ucb::CommandInfo SAL_CALL
        getCommandInfoByName(
            const OUString& Name )
        getCommandInfoByName( const OUString& Name )
            throw( css::ucb::UnsupportedCommandException,
                   css::uno::RuntimeException, std::exception) override;

        virtual css::ucb::CommandInfo SAL_CALL
        getCommandInfoByHandle(
            sal_Int32 Handle )
        getCommandInfoByHandle( sal_Int32 Handle )
            throw( css::ucb::UnsupportedCommandException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual sal_Bool SAL_CALL
        hasCommandByName(
            const OUString& Name )
        hasCommandByName( const OUString& Name )
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual sal_Bool SAL_CALL
        hasCommandByHandle(
            sal_Int32 Handle )
        hasCommandByHandle( sal_Int32 Handle )
            throw( css::uno::RuntimeException, std::exception ) override;


diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx
index 2652a95..2e0d531 100644
--- a/ucb/source/ucp/file/filid.cxx
+++ b/ucb/source/ucp/file/filid.cxx
@@ -51,8 +51,7 @@ FileContentIdentifier::~FileContentIdentifier()


void SAL_CALL
FileContentIdentifier::acquire(
    void )
FileContentIdentifier::acquire()
    throw()
{
    OWeakObject::acquire();
@@ -60,8 +59,7 @@ FileContentIdentifier::acquire(


void SAL_CALL
FileContentIdentifier::release(
                void )
FileContentIdentifier::release()
  throw()
{
  OWeakObject::release();
@@ -69,8 +67,7 @@ FileContentIdentifier::release(


uno::Any SAL_CALL
FileContentIdentifier::queryInterface(
    const uno::Type& rType )
FileContentIdentifier::queryInterface( const uno::Type& rType )
    throw( uno::RuntimeException, std::exception )
{
    uno::Any aRet = cppu::queryInterface( rType,
@@ -89,8 +86,7 @@ FileContentIdentifier::getImplementationId()


uno::Sequence< uno::Type > SAL_CALL
FileContentIdentifier::getTypes(
    void )
FileContentIdentifier::getTypes()
    throw( uno::RuntimeException, std::exception )
{
    static cppu::OTypeCollection* pCollection = nullptr;
@@ -110,8 +106,7 @@ FileContentIdentifier::getTypes(

OUString
SAL_CALL
FileContentIdentifier::getContentIdentifier(
    void )
FileContentIdentifier::getContentIdentifier()
    throw( uno::RuntimeException, std::exception )
{
    return m_aContentId;
@@ -119,8 +114,7 @@ FileContentIdentifier::getContentIdentifier(


OUString SAL_CALL
FileContentIdentifier::getContentProviderScheme(
    void )
FileContentIdentifier::getContentProviderScheme()
    throw( uno::RuntimeException, std::exception )
{
    return m_aProviderScheme;
diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index abd60b1..c3f38da 100644
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.hxx
@@ -43,40 +43,33 @@ namespace fileaccess {

        // XInterface
        virtual css::uno::Any SAL_CALL
        queryInterface(
            const css::uno::Type& aType )
        queryInterface( const css::uno::Type& aType )
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
        acquire(
            void )
        acquire()
            throw() override;

        virtual void SAL_CALL
        release(
            void )
        release()
            throw() override;

        // XTypeProvider
        virtual css::uno::Sequence< css::uno::Type > SAL_CALL
        getTypes(
            void )
        getTypes()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Sequence< sal_Int8 > SAL_CALL
        getImplementationId(
            void )
        getImplementationId()
            throw( css::uno::RuntimeException, std::exception ) override;

        // XContentIdentifier
        virtual OUString SAL_CALL
        getContentIdentifier(
            void )
        getContentIdentifier()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual OUString SAL_CALL
        getContentProviderScheme(
            void )
        getContentProviderScheme()
            throw( css::uno::RuntimeException, std::exception ) override;

    private:
diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx
index c672840..0f2ba54 100644
--- a/ucb/source/ucp/file/filinpstr.cxx
+++ b/ucb/source/ucp/file/filinpstr.cxx
@@ -82,8 +82,7 @@ XTYPEPROVIDER_IMPL_3( XInputStream_impl,


uno::Any SAL_CALL
XInputStream_impl::queryInterface(
    const uno::Type& rType )
XInputStream_impl::queryInterface( const uno::Type& rType )
    throw( uno::RuntimeException, std::exception)
{
    uno::Any aRet = cppu::queryInterface( rType,
@@ -95,8 +94,7 @@ XInputStream_impl::queryInterface(


void SAL_CALL
XInputStream_impl::acquire(
    void )
XInputStream_impl::acquire()
    throw()
{
    OWeakObject::acquire();
@@ -104,8 +102,7 @@ XInputStream_impl::acquire(


void SAL_CALL
XInputStream_impl::release(
    void )
XInputStream_impl::release()
    throw()
{
    OWeakObject::release();
@@ -154,8 +151,7 @@ XInputStream_impl::readSomeBytes(


void SAL_CALL
XInputStream_impl::skipBytes(
    sal_Int32 nBytesToSkip )
XInputStream_impl::skipBytes( sal_Int32 nBytesToSkip )
    throw( io::NotConnectedException,
           io::BufferSizeExceededException,
           io::IOException,
@@ -166,8 +162,7 @@ XInputStream_impl::skipBytes(


sal_Int32 SAL_CALL
XInputStream_impl::available(
    void )
XInputStream_impl::available()
    throw( io::NotConnectedException,
           io::IOException,
           uno::RuntimeException, std::exception)
@@ -177,8 +172,7 @@ XInputStream_impl::available(


void SAL_CALL
XInputStream_impl::closeInput(
    void )
XInputStream_impl::closeInput()
    throw( io::NotConnectedException,
           io::IOException,
           uno::RuntimeException, std::exception )
@@ -194,8 +188,7 @@ XInputStream_impl::closeInput(


void SAL_CALL
XInputStream_impl::seek(
    sal_Int64 location )
XInputStream_impl::seek( sal_Int64 location )
    throw( lang::IllegalArgumentException,
           io::IOException,
           uno::RuntimeException, std::exception )
@@ -208,8 +201,7 @@ XInputStream_impl::seek(


sal_Int64 SAL_CALL
XInputStream_impl::getPosition(
    void )
XInputStream_impl::getPosition()
    throw( io::IOException,
           uno::RuntimeException, std::exception )
{
@@ -220,8 +212,7 @@ XInputStream_impl::getPosition(
}

sal_Int64 SAL_CALL
XInputStream_impl::getLength(
    void )
XInputStream_impl::getLength()
    throw( io::IOException,
           uno::RuntimeException, std::exception )
{
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index d070e52..c439344 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.hxx
@@ -62,18 +62,15 @@ namespace fileaccess {
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Any SAL_CALL
        queryInterface(
            const css::uno::Type& rType )
        queryInterface( const css::uno::Type& rType )
            throw( css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        acquire(
            void )
        acquire()
            throw() override;

        virtual void SAL_CALL
        release(
            void )
        release()
            throw() override;

        virtual sal_Int32 SAL_CALL
@@ -95,43 +92,37 @@ namespace fileaccess {
                   css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        skipBytes(
            sal_Int32 nBytesToSkip )
        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(
            void )
        available()
            throw( css::io::NotConnectedException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
        closeInput(
            void )
        closeInput()
            throw( css::io::NotConnectedException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
        seek(
            sal_Int64 location )
        seek( sal_Int64 location )
            throw( css::lang::IllegalArgumentException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual sal_Int64 SAL_CALL
        getPosition(
            void )
        getPosition()
            throw( css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual sal_Int64 SAL_CALL
        getLength(
            void )
        getLength()
            throw( css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx
index 29b181e..e5c74f6 100644
--- a/ucb/source/ucp/file/filprp.cxx
+++ b/ucb/source/ucp/file/filprp.cxx
@@ -75,8 +75,7 @@ XPropertySetInfo_impl::~XPropertySetInfo_impl()


beans::Property SAL_CALL
XPropertySetInfo_impl::getPropertyByName(
                     const OUString& aName )
XPropertySetInfo_impl::getPropertyByName( const OUString& aName )
  throw( beans::UnknownPropertyException,
     RuntimeException, std::exception)
{
@@ -88,8 +87,7 @@ XPropertySetInfo_impl::getPropertyByName(


Sequence< beans::Property > SAL_CALL
XPropertySetInfo_impl::getProperties(
                    void )
XPropertySetInfo_impl::getProperties()
  throw( RuntimeException, std::exception )
{
  return m_seq;
@@ -97,8 +95,7 @@ XPropertySetInfo_impl::getProperties(


sal_Bool SAL_CALL
XPropertySetInfo_impl::hasPropertyByName(
                     const OUString& aName )
XPropertySetInfo_impl::hasPropertyByName( const OUString& aName )
  throw( RuntimeException, std::exception )
{
  for( sal_Int32 i = 0; i < m_seq.getLength(); ++i )
diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx
index a4800bf..1e09c7f 100644
--- a/ucb/source/ucp/file/filprp.hxx
+++ b/ucb/source/ucp/file/filprp.hxx
@@ -38,13 +38,11 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper<
        virtual ~XPropertySetInfo_impl();

        virtual css::uno::Sequence< css::beans::Property > SAL_CALL
        getProperties(
            void )
        getProperties()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual css::beans::Property SAL_CALL
        getPropertyByName(
            const OUString& aName )
        getPropertyByName( const OUString& aName )
            throw( css::beans::UnknownPropertyException,
                   css::uno::RuntimeException, std::exception) override;

diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx
index 5028cdc..aafeca5 100644
--- a/ucb/source/ucp/file/filrow.cxx
+++ b/ucb/source/ucp/file/filrow.cxx
@@ -89,8 +89,7 @@ XRow_impl::~XRow_impl()


sal_Bool SAL_CALL
XRow_impl::wasNull(
           void )
XRow_impl::wasNull()
  throw( sdbc::SQLException,
     uno::RuntimeException, std::exception)
{
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index 9b58d88..8d947b1 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
@@ -36,51 +36,43 @@ namespace fileaccess {
        virtual ~XRow_impl();

        virtual sal_Bool SAL_CALL
        wasNull(
            void )
        wasNull()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual OUString SAL_CALL
        getString(
            sal_Int32 columnIndex )
        getString( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        getBoolean(
            sal_Int32 columnIndex )
        getBoolean( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Int8 SAL_CALL
        getByte(
            sal_Int32 columnIndex )
        getByte( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Int16 SAL_CALL
        getShort(
            sal_Int32 columnIndex )
        getShort( sal_Int32 columnIndex )
            throw(
                css::sdbc::SQLException,
                css::uno::RuntimeException, std::exception ) override;

        virtual sal_Int32 SAL_CALL
        getInt(
            sal_Int32 columnIndex )
        getInt( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual sal_Int64 SAL_CALL
        getLong(
            sal_Int32 columnIndex )
        getLong( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual float SAL_CALL
        getFloat(
            sal_Int32 columnIndex )
        getFloat( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

@@ -91,38 +83,32 @@ namespace fileaccess {
                   css::uno::RuntimeException, std::exception) override;

        virtual css::uno::Sequence< sal_Int8 > SAL_CALL
        getBytes(
            sal_Int32 columnIndex )
        getBytes( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual css::util::Date SAL_CALL
        getDate(
            sal_Int32 columnIndex )
        getDate( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual css::util::Time SAL_CALL
        getTime(
            sal_Int32 columnIndex )
        getTime( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual css::util::DateTime SAL_CALL
        getTimestamp(
            sal_Int32 columnIndex )
        getTimestamp( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
        getBinaryStream(
            sal_Int32 columnIndex )
        getBinaryStream( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
        getCharacterStream(
            sal_Int32 columnIndex )
        getCharacterStream( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

@@ -134,26 +120,22 @@ namespace fileaccess {
                   css::uno::RuntimeException, std::exception) override;

        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
        getRef(
            sal_Int32 columnIndex )
        getRef( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
        getBlob(
            sal_Int32 columnIndex )
        getBlob( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
        getClob(
            sal_Int32 columnIndex )
        getClob( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
        getArray(
            sal_Int32 columnIndex )
        getArray( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx
index cc0414a..f274bc5 100644
--- a/ucb/source/ucp/file/filrset.cxx
+++ b/ucb/source/ucp/file/filrset.cxx
@@ -205,8 +205,7 @@ void XResultSet_impl::isFinalChanged()


bool SAL_CALL
XResultSet_impl::OneMore(
    void )
XResultSet_impl::OneMore()
    throw( sdbc::SQLException,
           uno::RuntimeException,
           std::exception )
@@ -284,8 +283,7 @@ XResultSet_impl::OneMore(


sal_Bool SAL_CALL
XResultSet_impl::next(
    void )
XResultSet_impl::next()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -298,8 +296,7 @@ XResultSet_impl::next(


sal_Bool SAL_CALL
XResultSet_impl::isBeforeFirst(
    void )
XResultSet_impl::isBeforeFirst()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -308,8 +305,7 @@ XResultSet_impl::isBeforeFirst(


sal_Bool SAL_CALL
XResultSet_impl::isAfterLast(
    void )
XResultSet_impl::isAfterLast()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -318,8 +314,7 @@ XResultSet_impl::isAfterLast(


sal_Bool SAL_CALL
XResultSet_impl::isFirst(
    void )
XResultSet_impl::isFirst()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -328,8 +323,7 @@ XResultSet_impl::isFirst(


sal_Bool SAL_CALL
XResultSet_impl::isLast(
    void  )
XResultSet_impl::isLast()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -341,8 +335,7 @@ XResultSet_impl::isLast(


void SAL_CALL
XResultSet_impl::beforeFirst(
    void  )
XResultSet_impl::beforeFirst()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -351,8 +344,7 @@ XResultSet_impl::beforeFirst(


void SAL_CALL
XResultSet_impl::afterLast(
    void  )
XResultSet_impl::afterLast()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -363,8 +355,7 @@ XResultSet_impl::afterLast(


sal_Bool SAL_CALL
XResultSet_impl::first(
    void  )
XResultSet_impl::first()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -374,8 +365,7 @@ XResultSet_impl::first(


sal_Bool SAL_CALL
XResultSet_impl::last(
    void  )
XResultSet_impl::last()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -387,8 +377,7 @@ XResultSet_impl::last(


sal_Int32 SAL_CALL
XResultSet_impl::getRow(
    void )
XResultSet_impl::getRow()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -423,8 +412,7 @@ sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row )


sal_Bool SAL_CALL
XResultSet_impl::relative(
    sal_Int32 row )
XResultSet_impl::relative( sal_Int32 row )
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -440,8 +428,7 @@ XResultSet_impl::relative(


sal_Bool SAL_CALL
XResultSet_impl::previous(
    void )
XResultSet_impl::previous()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -454,8 +441,7 @@ XResultSet_impl::previous(


void SAL_CALL
XResultSet_impl::refreshRow(
    void )
XResultSet_impl::refreshRow()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -465,8 +451,7 @@ XResultSet_impl::refreshRow(


sal_Bool SAL_CALL
XResultSet_impl::rowUpdated(
    void )
XResultSet_impl::rowUpdated()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -474,8 +459,7 @@ XResultSet_impl::rowUpdated(
}

sal_Bool SAL_CALL
XResultSet_impl::rowInserted(
    void  )
XResultSet_impl::rowInserted()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -483,8 +467,7 @@ XResultSet_impl::rowInserted(
}

sal_Bool SAL_CALL
XResultSet_impl::rowDeleted(
    void  )
XResultSet_impl::rowDeleted()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -493,8 +476,7 @@ XResultSet_impl::rowDeleted(


uno::Reference< uno::XInterface > SAL_CALL
XResultSet_impl::getStatement(
    void  )
XResultSet_impl::getStatement()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -505,8 +487,7 @@ XResultSet_impl::getStatement(
// XCloseable

void SAL_CALL
XResultSet_impl::close(
    void )
XResultSet_impl::close()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -521,8 +502,7 @@ XResultSet_impl::close(


OUString SAL_CALL
XResultSet_impl::queryContentIdentifierString(
    void )
XResultSet_impl::queryContentIdentifierString()
    throw( uno::RuntimeException, std::exception )
{
    uno::Reference< ucb::XContentIdentifier > xContentId
@@ -536,8 +516,7 @@ XResultSet_impl::queryContentIdentifierString(


uno::Reference< ucb::XContentIdentifier > SAL_CALL
XResultSet_impl::queryContentIdentifier(
    void )
XResultSet_impl::queryContentIdentifier()
    throw( uno::RuntimeException, std::exception )
{
    if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -553,8 +532,7 @@ XResultSet_impl::queryContentIdentifier(


uno::Reference< ucb::XContent > SAL_CALL
XResultSet_impl::queryContent(
    void )
XResultSet_impl::queryContent()
    throw( uno::RuntimeException, std::exception )
{
    if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -674,8 +652,7 @@ XResultSet_impl::getCapabilities()

// XResultSetMetaDataSupplier
uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
XResultSet_impl::getMetaData(
    void )
XResultSet_impl::getMetaData()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index cfea9e6..b047fa9 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.hxx
@@ -91,14 +91,12 @@ class XResultSet_impl : public Notifier,

        // XEventListener
        virtual void SAL_CALL
        disposing(
            const css::lang::EventObject& Source )
        disposing( const css::lang::EventObject& Source )
            throw( css::uno::RuntimeException, std::exception ) override;

        // XComponent
        virtual void SAL_CALL
        dispose(
            void )
        dispose()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
@@ -113,8 +111,7 @@ class XResultSet_impl : public Notifier,

        // XRow
        virtual sal_Bool SAL_CALL
        wasNull(
            void )
        wasNull()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -126,8 +123,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual OUString SAL_CALL
        getString(
            sal_Int32 columnIndex )
        getString( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -138,8 +134,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual sal_Bool SAL_CALL
        getBoolean(
            sal_Int32 columnIndex )
        getBoolean( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -150,8 +145,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual sal_Int8 SAL_CALL
        getByte(
            sal_Int32 columnIndex )
        getByte( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -162,8 +156,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual sal_Int16 SAL_CALL
        getShort(
            sal_Int32 columnIndex )
        getShort( sal_Int32 columnIndex )
            throw(
                css::sdbc::SQLException,
                css::uno::RuntimeException, std::exception) override
@@ -175,8 +168,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual sal_Int32 SAL_CALL
        getInt(
            sal_Int32 columnIndex )
        getInt( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -187,8 +179,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual sal_Int64 SAL_CALL
        getLong(
            sal_Int32 columnIndex )
        getLong( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -199,8 +190,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual float SAL_CALL
        getFloat(
            sal_Int32 columnIndex )
        getFloat( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -211,8 +201,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual double SAL_CALL
        getDouble(
            sal_Int32 columnIndex )
        getDouble( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -223,8 +212,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::uno::Sequence< sal_Int8 > SAL_CALL
        getBytes(
            sal_Int32 columnIndex )
        getBytes( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -235,8 +223,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::util::Date SAL_CALL
        getDate(
            sal_Int32 columnIndex )
        getDate( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -247,8 +234,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::util::Time SAL_CALL
        getTime(
            sal_Int32 columnIndex )
        getTime( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -259,8 +245,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::util::DateTime SAL_CALL
        getTimestamp(
            sal_Int32 columnIndex )
        getTimestamp( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -271,8 +256,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
        getBinaryStream(
            sal_Int32 columnIndex )
        getBinaryStream( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -283,8 +267,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
        getCharacterStream(
            sal_Int32 columnIndex )
        getCharacterStream( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -295,8 +278,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::uno::Any SAL_CALL
        getObject(
            sal_Int32 columnIndex,
        getObject( sal_Int32 columnIndex,
            const css::uno::Reference< css::container::XNameAccess >& typeMap )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
@@ -308,8 +290,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
        getRef(
            sal_Int32 columnIndex )
        getRef( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -320,8 +301,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
        getBlob(
            sal_Int32 columnIndex )
        getBlob( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -332,8 +312,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
        getClob(
            sal_Int32 columnIndex )
        getClob( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -344,8 +323,7 @@ class XResultSet_impl : public Notifier,
        }

        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
        getArray(
            sal_Int32 columnIndex )
        getArray( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -359,111 +337,93 @@ class XResultSet_impl : public Notifier,
        // XResultSet

        virtual sal_Bool SAL_CALL
        next(
            void )
        next()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        isBeforeFirst(
            void )
        isBeforeFirst()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        isAfterLast(
            void )
        isAfterLast()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        isFirst(
            void  )
        isFirst()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        isLast(
            void  )
        isLast()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        beforeFirst(
            void  )
        beforeFirst()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        afterLast(
            void  )
        afterLast()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        first(
            void  )
        first()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        last(
            void  )
        last()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Int32 SAL_CALL
        getRow(
            void  )
        getRow()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        absolute(
            sal_Int32 row )
        absolute( sal_Int32 row )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        relative(
            sal_Int32 rows )
        relative( sal_Int32 rows )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        previous(
            void  )
        previous()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        refreshRow(
            void  )
        refreshRow()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        rowUpdated(
            void )
        rowUpdated()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        rowInserted(
            void  )
        rowInserted()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        rowDeleted(
            void  )
        rowDeleted()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;


        virtual  css::uno::Reference<  css::uno::XInterface > SAL_CALL
        getStatement(
            void  )
        getStatement()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

@@ -471,8 +431,7 @@ class XResultSet_impl : public Notifier,
        // XDynamicResultSet

        virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
        getStaticResultSet(
            void )
        getStaticResultSet()
            throw( css::ucb::ListenerAlreadySetException,
                   css::uno::RuntimeException, std::exception ) override;

@@ -498,32 +457,27 @@ class XResultSet_impl : public Notifier,
        // XCloseable

        virtual void SAL_CALL
        close(
            void )
        close()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        // XContentAccess

        virtual OUString SAL_CALL
        queryContentIdentifierString(
            void )
        queryContentIdentifierString()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
        queryContentIdentifier(
            void )
        queryContentIdentifier()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
        queryContent(
            void )
        queryContent()
            throw( css::uno::RuntimeException, std::exception ) override;

        // XResultSetMetaDataSupplier
        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
        getMetaData(
            void )
        getMetaData()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index da75d50..3190bd2 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -169,8 +169,7 @@ XStream_impl::readSomeBytes(


void SAL_CALL
XStream_impl::skipBytes(
    sal_Int32 nBytesToSkip )
XStream_impl::skipBytes( sal_Int32 nBytesToSkip )
    throw( io::NotConnectedException,
           io::BufferSizeExceededException,
           io::IOException,
@@ -181,8 +180,7 @@ XStream_impl::skipBytes(


sal_Int32 SAL_CALL
XStream_impl::available(
    void )
XStream_impl::available()
    throw( io::NotConnectedException,
           io::IOException,
           uno::RuntimeException, std::exception)
@@ -211,8 +209,7 @@ XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData )


void SAL_CALL
XStream_impl::closeStream(
    void )
XStream_impl::closeStream()
    throw( io::NotConnectedException,
           io::IOException,
           uno::RuntimeException )
@@ -232,8 +229,7 @@ XStream_impl::closeStream(
}

void SAL_CALL
XStream_impl::closeInput(
    void )
XStream_impl::closeInput()
    throw( io::NotConnectedException,
           io::IOException,
           uno::RuntimeException, std::exception )
@@ -247,8 +243,7 @@ XStream_impl::closeInput(


void SAL_CALL
XStream_impl::closeOutput(
    void )
XStream_impl::closeOutput()
    throw( io::NotConnectedException,
           io::IOException,
           uno::RuntimeException, std::exception )
@@ -262,8 +257,7 @@ XStream_impl::closeOutput(


void SAL_CALL
XStream_impl::seek(
    sal_Int64 location )
XStream_impl::seek( sal_Int64 location )
    throw( lang::IllegalArgumentException,
           io::IOException,
           uno::RuntimeException, std::exception )
@@ -276,8 +270,7 @@ XStream_impl::seek(


sal_Int64 SAL_CALL
XStream_impl::getPosition(
    void )
XStream_impl::getPosition()
    throw( io::IOException,
           uno::RuntimeException, std::exception )
{
@@ -288,8 +281,7 @@ XStream_impl::getPosition(
}

sal_Int64 SAL_CALL
XStream_impl::getLength(
    void )
XStream_impl::getLength()
    throw( io::IOException,
           uno::RuntimeException, std::exception )
{
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index 620a33e..4c09bff 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -63,11 +63,11 @@ class XStream_impl :  public cppu::WeakImplHelper<
        // XStream

        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
        getInputStream(  )
        getInputStream()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL
        getOutputStream(  )
        getOutputStream()
            throw( css::uno::RuntimeException, std::exception ) override;


@@ -100,23 +100,20 @@ class XStream_impl :  public cppu::WeakImplHelper<


        void SAL_CALL
        skipBytes(
            sal_Int32 nBytesToSkip )
        skipBytes( sal_Int32 nBytesToSkip )
            throw( css::io::NotConnectedException,
                   css::io::BufferSizeExceededException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        sal_Int32 SAL_CALL
        available(
            void )
        available()
            throw( css::io::NotConnectedException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        void SAL_CALL
        closeInput(
            void )
        closeInput()
            throw( css::io::NotConnectedException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;
@@ -124,21 +121,18 @@ class XStream_impl :  public cppu::WeakImplHelper<
        // XSeekable

        void SAL_CALL
        seek(
            sal_Int64 location )
        seek( sal_Int64 location )
            throw( css::lang::IllegalArgumentException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        sal_Int64 SAL_CALL
        getPosition(
            void )
        getPosition()
            throw( css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        sal_Int64 SAL_CALL
        getLength(
            void )
        getLength()
            throw( css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

@@ -162,8 +156,7 @@ class XStream_impl :  public cppu::WeakImplHelper<


        void SAL_CALL
        closeOutput(
            void )
        closeOutput()
            throw( css::io::NotConnectedException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;
@@ -187,8 +180,7 @@ class XStream_impl :  public cppu::WeakImplHelper<
        // Implementation methods

        void SAL_CALL
        closeStream(
            void )
        closeStream()
            throw( css::io::NotConnectedException,
                   css::io::IOException,
                   css::uno::RuntimeException );
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index 313bdcc..98c98fd 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -134,8 +134,7 @@ sal_Bool SAL_CALL FileProvider::supportsService(const OUString& ServiceName )
}

Sequence< OUString > SAL_CALL
FileProvider::getSupportedServiceNames(
                       void )
FileProvider::getSupportedServiceNames()
  throw( RuntimeException, std::exception )
{
    return fileaccess::shell::getSupportedServiceNames_static();
@@ -263,29 +262,24 @@ public:

    // XInterface
    virtual Any SAL_CALL
    queryInterface(
        const Type& aType )
    queryInterface( const Type& aType )
        throw( RuntimeException, std::exception) override;

    virtual void SAL_CALL
    acquire(
        void )
    acquire()
        throw() override;

    virtual void SAL_CALL
    release(
        void )
    release()
        throw() override;


    virtual Sequence< Property > SAL_CALL
    getProperties(
        void )
    getProperties()
        throw( RuntimeException, std::exception ) override;

    virtual Property SAL_CALL
    getPropertyByName(
        const OUString& aName )
    getPropertyByName( const OUString& aName )
        throw( UnknownPropertyException,
               RuntimeException, std::exception) override;

@@ -326,8 +320,7 @@ XPropertySetInfoImpl2::~XPropertySetInfoImpl2()


void SAL_CALL
XPropertySetInfoImpl2::acquire(
    void )
XPropertySetInfoImpl2::acquire()
    throw()
{
    OWeakObject::acquire();
@@ -335,8 +328,7 @@ XPropertySetInfoImpl2::acquire(


void SAL_CALL
XPropertySetInfoImpl2::release(
    void )
XPropertySetInfoImpl2::release()
    throw()
{
    OWeakObject::release();
@@ -344,8 +336,7 @@ XPropertySetInfoImpl2::release(


Any SAL_CALL
XPropertySetInfoImpl2::queryInterface(
    const Type& rType )
XPropertySetInfoImpl2::queryInterface( const Type& rType )
    throw( RuntimeException, std::exception )
{
    Any aRet = cppu::queryInterface( rType,
@@ -355,8 +346,7 @@ XPropertySetInfoImpl2::queryInterface(


Property SAL_CALL
XPropertySetInfoImpl2::getPropertyByName(
    const OUString& aName )
XPropertySetInfoImpl2::getPropertyByName( const OUString& aName )
    throw( UnknownPropertyException,
           RuntimeException, std::exception)
{
@@ -369,8 +359,7 @@ XPropertySetInfoImpl2::getPropertyByName(


Sequence< Property > SAL_CALL
XPropertySetInfoImpl2::getProperties(
    void )
XPropertySetInfoImpl2::getProperties()
    throw( RuntimeException, std::exception )
{
    return m_seq;
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index 0f0756f..19cf312 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -63,18 +63,15 @@ namespace fileaccess {

        // XServiceInfo
        virtual OUString SAL_CALL
        getImplementationName(
            void )
        getImplementationName()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual sal_Bool SAL_CALL
        supportsService(
            const OUString& ServiceName )
        supportsService( const OUString& ServiceName )
            throw(css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Sequence< OUString > SAL_CALL
        getSupportedServiceNames(
            void )
        getSupportedServiceNames()
            throw( css::uno::RuntimeException, std::exception ) override;


diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
index f2e5ecb..bbc3e0b 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx
@@ -81,8 +81,7 @@ FTPContentIdentifier::getImplementationId()


Sequence<Type> SAL_CALL
FTPContentIdentifier::getTypes(
    void )
FTPContentIdentifier::getTypes()
    throw(RuntimeException, std::exception)
{
    static cppu::OTypeCollection* pCollection = nullptr;
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
index 2940e6f..87164d9 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx
@@ -57,8 +57,7 @@ ResultSetBase::~ResultSetBase()
// XInterface

void SAL_CALL
ResultSetBase::acquire(
    void )
ResultSetBase::acquire()
    throw()
{
    OWeakObject::acquire();
@@ -66,8 +65,7 @@ ResultSetBase::acquire(


void SAL_CALL
ResultSetBase::release(
    void )
ResultSetBase::release()
    throw()
{
    OWeakObject::release();
@@ -75,8 +73,7 @@ ResultSetBase::release(


uno::Any SAL_CALL
ResultSetBase::queryInterface(
    const uno::Type& rType )
ResultSetBase::queryInterface( const uno::Type& rType )
    throw( uno::RuntimeException, std::exception )
{
    uno::Any aRet = cppu::queryInterface(
@@ -148,8 +145,7 @@ ResultSetBase::dispose()
//  XResultSet

sal_Bool SAL_CALL
ResultSetBase::next(
    void )
ResultSetBase::next()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -163,8 +159,7 @@ ResultSetBase::next(


sal_Bool SAL_CALL
ResultSetBase::isBeforeFirst(
    void )
ResultSetBase::isBeforeFirst()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -173,8 +168,7 @@ ResultSetBase::isBeforeFirst(


sal_Bool SAL_CALL
ResultSetBase::isAfterLast(
    void )
ResultSetBase::isAfterLast()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -183,8 +177,7 @@ ResultSetBase::isAfterLast(


sal_Bool SAL_CALL
ResultSetBase::isFirst(
    void )
ResultSetBase::isFirst()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -193,8 +186,7 @@ ResultSetBase::isFirst(


sal_Bool SAL_CALL
ResultSetBase::isLast(
    void  )
ResultSetBase::isLast()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -206,8 +198,7 @@ ResultSetBase::isLast(


void SAL_CALL
ResultSetBase::beforeFirst(
    void  )
ResultSetBase::beforeFirst()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -216,8 +207,7 @@ ResultSetBase::beforeFirst(


void SAL_CALL
ResultSetBase::afterLast(
    void  )
ResultSetBase::afterLast()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -226,8 +216,7 @@ ResultSetBase::afterLast(


sal_Bool SAL_CALL
ResultSetBase::first(
    void  )
ResultSetBase::first()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -237,8 +226,7 @@ ResultSetBase::first(


sal_Bool SAL_CALL
ResultSetBase::last(
    void  )
ResultSetBase::last()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -248,8 +236,7 @@ ResultSetBase::last(


sal_Int32 SAL_CALL
ResultSetBase::getRow(
    void )
ResultSetBase::getRow()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -279,8 +266,7 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )


sal_Bool SAL_CALL
ResultSetBase::relative(
    sal_Int32 row )
ResultSetBase::relative( sal_Int32 row )
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -299,8 +285,7 @@ ResultSetBase::relative(


sal_Bool SAL_CALL
ResultSetBase::previous(
    void )
ResultSetBase::previous()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -313,8 +298,7 @@ ResultSetBase::previous(


void SAL_CALL
ResultSetBase::refreshRow(
    void )
ResultSetBase::refreshRow()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -322,8 +306,7 @@ ResultSetBase::refreshRow(


sal_Bool SAL_CALL
ResultSetBase::rowUpdated(
    void )
ResultSetBase::rowUpdated()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -331,8 +314,7 @@ ResultSetBase::rowUpdated(
}

sal_Bool SAL_CALL
ResultSetBase::rowInserted(
    void  )
ResultSetBase::rowInserted()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -340,8 +322,7 @@ ResultSetBase::rowInserted(
}

sal_Bool SAL_CALL
ResultSetBase::rowDeleted(
    void  )
ResultSetBase::rowDeleted()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -350,8 +331,7 @@ ResultSetBase::rowDeleted(


uno::Reference< uno::XInterface > SAL_CALL
ResultSetBase::getStatement(
    void  )
ResultSetBase::getStatement()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -363,8 +343,7 @@ ResultSetBase::getStatement(
// XCloseable

void SAL_CALL
ResultSetBase::close(
    void )
ResultSetBase::close()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -372,8 +351,7 @@ ResultSetBase::close(


OUString SAL_CALL
ResultSetBase::queryContentIdentifierString(
    void )
ResultSetBase::queryContentIdentifierString()
    throw( uno::RuntimeException, std::exception )
{
    if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -384,12 +362,8 @@ ResultSetBase::queryContentIdentifierString(


uno::Reference< ucb::XContentIdentifier > SAL_CALL
ResultSetBase::queryContentIdentifier(
    void
)
    throw(
        uno::RuntimeException, std::exception
    )
ResultSetBase::queryContentIdentifier()
    throw( uno::RuntimeException, std::exception )
{
    if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
    {
@@ -408,8 +382,7 @@ ResultSetBase::queryContentIdentifier(


uno::Reference< ucb::XContent > SAL_CALL
ResultSetBase::queryContent(
    void )
ResultSetBase::queryContent()
    throw( uno::RuntimeException, std::exception )
{
    if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) )
@@ -616,8 +589,7 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener(

// XResultSetMetaDataSupplier
uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
ResultSetBase::getMetaData(
    void )
ResultSetBase::getMetaData()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 6cfcaee..544f7dd 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
@@ -58,24 +58,20 @@ namespace ftp {

        // XInterface
        virtual css::uno::Any SAL_CALL
        queryInterface(
            const css::uno::Type& aType )
        queryInterface( const css::uno::Type& aType )
            throw( css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        acquire(
            void )
        acquire()
            throw() override;

        virtual void SAL_CALL
        release(
            void )
        release()
            throw() override;

        // XComponent
        virtual void SAL_CALL
        dispose(
            void )
        dispose()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
@@ -102,8 +98,7 @@ namespace ftp {
        }

        virtual OUString SAL_CALL
        getString(
            sal_Int32 columnIndex )
        getString( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -115,8 +110,7 @@ namespace ftp {
        }

        virtual sal_Bool SAL_CALL
        getBoolean(
            sal_Int32 columnIndex )
        getBoolean( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -127,8 +121,7 @@ namespace ftp {
        }

        virtual sal_Int8 SAL_CALL
        getByte(
            sal_Int32 columnIndex )
        getByte( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -139,8 +132,7 @@ namespace ftp {
        }

        virtual sal_Int16 SAL_CALL
        getShort(
            sal_Int32 columnIndex )
        getShort( sal_Int32 columnIndex )
            throw(
                css::sdbc::SQLException,
                css::uno::RuntimeException, std::exception) override
@@ -152,8 +144,7 @@ namespace ftp {
        }

        virtual sal_Int32 SAL_CALL
        getInt(
            sal_Int32 columnIndex )
        getInt( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -164,8 +155,7 @@ namespace ftp {
        }

        virtual sal_Int64 SAL_CALL
        getLong(
            sal_Int32 columnIndex )
        getLong( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -176,8 +166,7 @@ namespace ftp {
        }

        virtual float SAL_CALL
        getFloat(
            sal_Int32 columnIndex )
        getFloat( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -188,8 +177,7 @@ namespace ftp {
        }

        virtual double SAL_CALL
        getDouble(
            sal_Int32 columnIndex )
        getDouble( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -200,8 +188,7 @@ namespace ftp {
        }

        virtual css::uno::Sequence< sal_Int8 > SAL_CALL
        getBytes(
            sal_Int32 columnIndex )
        getBytes( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -212,8 +199,7 @@ namespace ftp {
        }

        virtual css::util::Date SAL_CALL
        getDate(
            sal_Int32 columnIndex )
        getDate( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -224,8 +210,7 @@ namespace ftp {
        }

        virtual css::util::Time SAL_CALL
        getTime(
            sal_Int32 columnIndex )
        getTime( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -236,8 +221,7 @@ namespace ftp {
        }

        virtual css::util::DateTime SAL_CALL
        getTimestamp(
            sal_Int32 columnIndex )
        getTimestamp( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -249,8 +233,7 @@ namespace ftp {


        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
        getBinaryStream(
            sal_Int32 columnIndex )
        getBinaryStream( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -261,8 +244,7 @@ namespace ftp {
        }

        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
        getCharacterStream(
            sal_Int32 columnIndex )
        getCharacterStream( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -273,8 +255,7 @@ namespace ftp {
        }

        virtual css::uno::Any SAL_CALL
        getObject(
            sal_Int32 columnIndex,
        getObject( sal_Int32 columnIndex,
            const css::uno::Reference< css::container::XNameAccess >& typeMap )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
@@ -286,8 +267,7 @@ namespace ftp {
        }

        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
        getRef(
            sal_Int32 columnIndex )
        getRef( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -298,8 +278,7 @@ namespace ftp {
        }

        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
        getBlob(
            sal_Int32 columnIndex )
        getBlob( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -310,8 +289,7 @@ namespace ftp {
        }

        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
        getClob(
            sal_Int32 columnIndex )
        getClob( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -322,8 +300,7 @@ namespace ftp {
        }

        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
        getArray(
            sal_Int32 columnIndex )
        getArray( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -338,8 +315,7 @@ namespace ftp {
        // XResultSet

        virtual sal_Bool SAL_CALL
        next(
            void )
        next()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

@@ -379,14 +355,12 @@ namespace ftp {
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        last(
            void  )
        last()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Int32 SAL_CALL
        getRow(
            void  )
        getRow()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

diff --git a/ucbhelper/source/provider/fd_inputstream.cxx b/ucbhelper/source/provider/fd_inputstream.cxx
index e9210a7..d22b2b6 100644
--- a/ucbhelper/source/provider/fd_inputstream.cxx
+++ b/ucbhelper/source/provider/fd_inputstream.cxx
@@ -146,8 +146,7 @@ namespace ucbhelper


    sal_Int64 SAL_CALL
    FdInputStream::getPosition(
        void )
    FdInputStream::getPosition()
        throw( IOException,
               RuntimeException, std::exception )
    {
@@ -161,11 +160,8 @@ namespace ucbhelper
    }


    sal_Int64 SAL_CALL FdInputStream::getLength(
        void
    ) throw(
        IOException,RuntimeException, std::exception
    )
    sal_Int64 SAL_CALL FdInputStream::getLength()
        throw( IOException,RuntimeException, std::exception )
    {
        return m_nLength;
    }
diff --git a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
index 8bd8551..41c3992 100644
--- a/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
+++ b/xmlhelp/source/cxxhelp/inc/tvfactory.hxx
@@ -45,18 +45,15 @@ class TVFactory: public cppu::WeakImplHelper <

        // XServiceInfo
        virtual OUString SAL_CALL
        getImplementationName(
            void )
        getImplementationName()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual sal_Bool SAL_CALL
        supportsService(
            const OUString& ServiceName )
        supportsService( const OUString& ServiceName )
            throw(css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Sequence< OUString > SAL_CALL
        getSupportedServiceNames(
            void )
        getSupportedServiceNames()
            throw( css::uno::RuntimeException, std::exception ) override;

        // XMultiServiceFactory
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.cxx b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
index ec4f7f9..23da935 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.cxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.cxx
@@ -43,8 +43,7 @@ XInputStream_impl::~XInputStream_impl()


uno::Any SAL_CALL
XInputStream_impl::queryInterface(
    const uno::Type& rType )
XInputStream_impl::queryInterface( const uno::Type& rType )
    throw( uno::RuntimeException, std::exception)
{
    uno::Any aRet = cppu::queryInterface( rType,
@@ -55,8 +54,7 @@ XInputStream_impl::queryInterface(


void SAL_CALL
XInputStream_impl::acquire(
    void )
XInputStream_impl::acquire()
    throw()
{
    OWeakObject::acquire();
@@ -64,8 +62,7 @@ XInputStream_impl::acquire(


void SAL_CALL
XInputStream_impl::release(
    void )
XInputStream_impl::release()
    throw()
{
    OWeakObject::release();
@@ -129,8 +126,7 @@ XInputStream_impl::skipBytes(


sal_Int32 SAL_CALL
XInputStream_impl::available(
    void )
XInputStream_impl::available()
    throw( io::NotConnectedException,
           io::IOException,
           uno::RuntimeException, std::exception)
@@ -140,8 +136,7 @@ XInputStream_impl::available(


void SAL_CALL
XInputStream_impl::closeInput(
    void )
XInputStream_impl::closeInput()
    throw( io::NotConnectedException,
           io::IOException,
           uno::RuntimeException, std::exception )
@@ -157,8 +152,7 @@ XInputStream_impl::closeInput(


void SAL_CALL
XInputStream_impl::seek(
    sal_Int64 location )
XInputStream_impl::seek( sal_Int64 location )
    throw( lang::IllegalArgumentException,
           io::IOException,
           uno::RuntimeException, std::exception )
@@ -171,8 +165,7 @@ XInputStream_impl::seek(


sal_Int64 SAL_CALL
XInputStream_impl::getPosition(
    void )
XInputStream_impl::getPosition()
    throw( io::IOException,
           uno::RuntimeException, std::exception )
{
@@ -183,8 +176,7 @@ XInputStream_impl::getPosition(
}

sal_Int64 SAL_CALL
XInputStream_impl::getLength(
    void )
XInputStream_impl::getLength()
    throw( io::IOException,
           uno::RuntimeException, std::exception )
{
diff --git a/xmlhelp/source/cxxhelp/provider/inputstream.hxx b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
index 275031c..5d2c423 100644
--- a/xmlhelp/source/cxxhelp/provider/inputstream.hxx
+++ b/xmlhelp/source/cxxhelp/provider/inputstream.hxx
@@ -54,13 +54,11 @@ namespace chelp {
            throw( css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        acquire(
            void )
        acquire()
            throw() override;

        virtual void SAL_CALL
        release(
            void )
        release()
            throw() override;

        virtual sal_Int32 SAL_CALL
@@ -82,43 +80,37 @@ namespace chelp {
                   css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        skipBytes(
            sal_Int32 nBytesToSkip )
        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(
            void )
        available()
            throw( css::io::NotConnectedException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
        closeInput(
            void )
        closeInput()
            throw( css::io::NotConnectedException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
        seek(
            sal_Int64 location )
        seek( sal_Int64 location )
            throw( css::lang::IllegalArgumentException,
                   css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual sal_Int64 SAL_CALL
        getPosition(
            void )
        getPosition()
            throw( css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

        virtual sal_Int64 SAL_CALL
        getLength(
            void )
        getLength()
            throw( css::io::IOException,
                   css::uno::RuntimeException, std::exception ) override;

diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
index c6d2ec6..8046a77 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx
@@ -57,8 +57,7 @@ ResultSetBase::~ResultSetBase()
// XInterface

void SAL_CALL
ResultSetBase::acquire(
    void )
ResultSetBase::acquire()
    throw()
{
    OWeakObject::acquire();
@@ -66,8 +65,7 @@ ResultSetBase::acquire(


void SAL_CALL
ResultSetBase::release(
    void )
ResultSetBase::release()
    throw()
{
    OWeakObject::release();
@@ -75,8 +73,7 @@ ResultSetBase::release(


uno::Any SAL_CALL
ResultSetBase::queryInterface(
    const uno::Type& rType )
ResultSetBase::queryInterface( const uno::Type& rType )
    throw( uno::RuntimeException, std::exception )
{
    uno::Any aRet = cppu::queryInterface( rType,
@@ -147,8 +144,7 @@ ResultSetBase::dispose()
//  XResultSet

sal_Bool SAL_CALL
ResultSetBase::next(
    void )
ResultSetBase::next()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -163,8 +159,7 @@ ResultSetBase::next(


sal_Bool SAL_CALL
ResultSetBase::isBeforeFirst(
    void )
ResultSetBase::isBeforeFirst()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -173,8 +168,7 @@ ResultSetBase::isBeforeFirst(


sal_Bool SAL_CALL
ResultSetBase::isAfterLast(
    void )
ResultSetBase::isAfterLast()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -183,8 +177,7 @@ ResultSetBase::isAfterLast(


sal_Bool SAL_CALL
ResultSetBase::isFirst(
    void )
ResultSetBase::isFirst()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -193,8 +186,7 @@ ResultSetBase::isFirst(


sal_Bool SAL_CALL
ResultSetBase::isLast(
    void  )
ResultSetBase::isLast()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -206,8 +198,7 @@ ResultSetBase::isLast(


void SAL_CALL
ResultSetBase::beforeFirst(
    void  )
ResultSetBase::beforeFirst()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -216,8 +207,7 @@ ResultSetBase::beforeFirst(


void SAL_CALL
ResultSetBase::afterLast(
    void  )
ResultSetBase::afterLast()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -226,8 +216,7 @@ ResultSetBase::afterLast(


sal_Bool SAL_CALL
ResultSetBase::first(
    void  )
ResultSetBase::first()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -237,8 +226,7 @@ ResultSetBase::first(


sal_Bool SAL_CALL
ResultSetBase::last(
    void  )
ResultSetBase::last()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -248,8 +236,7 @@ ResultSetBase::last(


sal_Int32 SAL_CALL
ResultSetBase::getRow(
    void )
ResultSetBase::getRow()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -279,8 +266,7 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row )


sal_Bool SAL_CALL
ResultSetBase::relative(
    sal_Int32 row )
ResultSetBase::relative( sal_Int32 row )
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -299,8 +285,7 @@ ResultSetBase::relative(


sal_Bool SAL_CALL
ResultSetBase::previous(
    void )
ResultSetBase::previous()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -313,8 +298,7 @@ ResultSetBase::previous(


void SAL_CALL
ResultSetBase::refreshRow(
    void )
ResultSetBase::refreshRow()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -322,8 +306,7 @@ ResultSetBase::refreshRow(


sal_Bool SAL_CALL
ResultSetBase::rowUpdated(
    void )
ResultSetBase::rowUpdated()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -331,8 +314,7 @@ ResultSetBase::rowUpdated(
}

sal_Bool SAL_CALL
ResultSetBase::rowInserted(
    void  )
ResultSetBase::rowInserted()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -340,8 +322,7 @@ ResultSetBase::rowInserted(
}

sal_Bool SAL_CALL
ResultSetBase::rowDeleted(
    void  )
ResultSetBase::rowDeleted()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -350,8 +331,7 @@ ResultSetBase::rowDeleted(


uno::Reference< uno::XInterface > SAL_CALL
ResultSetBase::getStatement(
    void  )
ResultSetBase::getStatement()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
@@ -363,8 +343,7 @@ ResultSetBase::getStatement(
// XCloseable

void SAL_CALL
ResultSetBase::close(
    void )
ResultSetBase::close()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception)
{
@@ -372,8 +351,7 @@ ResultSetBase::close(


OUString SAL_CALL
ResultSetBase::queryContentIdentifierString(
    void )
ResultSetBase::queryContentIdentifierString()
    throw( uno::RuntimeException, std::exception )
{
    if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
@@ -384,8 +362,7 @@ ResultSetBase::queryContentIdentifierString(


uno::Reference< ucb::XContentIdentifier > SAL_CALL
ResultSetBase::queryContentIdentifier(
    void )
ResultSetBase::queryContentIdentifier()
    throw( uno::RuntimeException, std::exception )
{
    if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
@@ -401,8 +378,7 @@ ResultSetBase::queryContentIdentifier(


uno::Reference< ucb::XContent > SAL_CALL
ResultSetBase::queryContent(
    void )
ResultSetBase::queryContent()
    throw( uno::RuntimeException, std::exception )
{
    if( 0 <= m_nRow && sal::static_int_cast<sal_uInt32>( m_nRow ) < m_aItems.size() )
@@ -613,8 +589,7 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener(

// XResultSetMetaDataSupplier
uno::Reference< sdbc::XResultSetMetaData > SAL_CALL
ResultSetBase::getMetaData(
    void )
ResultSetBase::getMetaData()
    throw( sdbc::SQLException,
           uno::RuntimeException, std::exception )
{
diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
index fc2cf62..56a591b 100644
--- a/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
+++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.hxx
@@ -58,29 +58,24 @@ namespace chelp {

        // XInterface
        virtual css::uno::Any SAL_CALL
        queryInterface(
            const css::uno::Type& aType )
        queryInterface( const css::uno::Type& aType )
            throw( css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        acquire(
            void )
        acquire()
            throw() override;

        virtual void SAL_CALL
        release(
            void )
        release()
            throw() override;

        // XComponent
        virtual void SAL_CALL
        dispose(
            void )
        dispose()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
        addEventListener(
            const css::uno::Reference< css::lang::XEventListener >& xListener )
        addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual void SAL_CALL
@@ -90,8 +85,7 @@ namespace chelp {

        // XRow
        virtual sal_Bool SAL_CALL
        wasNull(
            void )
        wasNull()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -103,8 +97,7 @@ namespace chelp {
        }

        virtual OUString SAL_CALL
        getString(
            sal_Int32 columnIndex )
        getString( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -115,8 +108,7 @@ namespace chelp {
        }

        virtual sal_Bool SAL_CALL
        getBoolean(
            sal_Int32 columnIndex )
        getBoolean( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -127,8 +119,7 @@ namespace chelp {
        }

        virtual sal_Int8 SAL_CALL
        getByte(
            sal_Int32 columnIndex )
        getByte( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -139,8 +130,7 @@ namespace chelp {
        }

        virtual sal_Int16 SAL_CALL
        getShort(
            sal_Int32 columnIndex )
        getShort( sal_Int32 columnIndex )
            throw(
                css::sdbc::SQLException,
                css::uno::RuntimeException, std::exception) override
@@ -152,8 +142,7 @@ namespace chelp {
        }

        virtual sal_Int32 SAL_CALL
        getInt(
            sal_Int32 columnIndex )
        getInt( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -164,8 +153,7 @@ namespace chelp {
        }

        virtual sal_Int64 SAL_CALL
        getLong(
            sal_Int32 columnIndex )
        getLong( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -176,8 +164,7 @@ namespace chelp {
        }

        virtual float SAL_CALL
        getFloat(
            sal_Int32 columnIndex )
        getFloat( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -188,8 +175,7 @@ namespace chelp {
        }

        virtual double SAL_CALL
        getDouble(
            sal_Int32 columnIndex )
        getDouble( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -200,8 +186,7 @@ namespace chelp {
        }

        virtual css::uno::Sequence< sal_Int8 > SAL_CALL
        getBytes(
            sal_Int32 columnIndex )
        getBytes( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception ) override
        {
@@ -212,8 +197,7 @@ namespace chelp {
        }

        virtual css::util::Date SAL_CALL
        getDate(
            sal_Int32 columnIndex )
        getDate( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -224,8 +208,7 @@ namespace chelp {
        }

        virtual css::util::Time SAL_CALL
        getTime(
            sal_Int32 columnIndex )
        getTime( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -236,8 +219,7 @@ namespace chelp {
        }

        virtual css::util::DateTime SAL_CALL
        getTimestamp(
            sal_Int32 columnIndex )
        getTimestamp( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -248,8 +230,7 @@ namespace chelp {
        }

        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
        getBinaryStream(
            sal_Int32 columnIndex )
        getBinaryStream( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -260,8 +241,7 @@ namespace chelp {
        }

        virtual css::uno::Reference< css::io::XInputStream > SAL_CALL
        getCharacterStream(
            sal_Int32 columnIndex )
        getCharacterStream( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -272,9 +252,8 @@ namespace chelp {
        }

        virtual css::uno::Any SAL_CALL
        getObject(
            sal_Int32 columnIndex,
            const css::uno::Reference< css::container::XNameAccess >& typeMap )
        getObject( sal_Int32 columnIndex,
                   const css::uno::Reference< css::container::XNameAccess >& typeMap )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -285,8 +264,7 @@ namespace chelp {
        }

        virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL
        getRef(
            sal_Int32 columnIndex )
        getRef( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -297,8 +275,7 @@ namespace chelp {
        }

        virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL
        getBlob(
            sal_Int32 columnIndex )
        getBlob( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -309,8 +286,7 @@ namespace chelp {
        }

        virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL
        getClob(
            sal_Int32 columnIndex )
        getClob( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -321,8 +297,7 @@ namespace chelp {
        }

        virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL
        getArray(
            sal_Int32 columnIndex )
        getArray( sal_Int32 columnIndex )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override
        {
@@ -336,143 +311,120 @@ namespace chelp {
        // XResultSet

        virtual sal_Bool SAL_CALL
        next(
            void )
        next()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        isBeforeFirst(
            void )
        isBeforeFirst()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        isAfterLast(
            void )
        isAfterLast()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        isFirst(
            void  )
        isFirst()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        isLast(
            void  )
        isLast()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        beforeFirst(
            void  )
        beforeFirst()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        afterLast(
            void  )
        afterLast()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        first(
            void  )
        first()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        last(
            void  )
        last()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Int32 SAL_CALL
        getRow(
            void  )
        getRow()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        absolute(
            sal_Int32 row )
        absolute( sal_Int32 row )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        relative(
            sal_Int32 rows )
        relative( sal_Int32 rows )
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        previous(
            void  )
        previous()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual void SAL_CALL
        refreshRow(
            void  )
        refreshRow()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        rowUpdated(
            void )
        rowUpdated()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        rowInserted(
            void  )
        rowInserted()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        virtual sal_Bool SAL_CALL
        rowDeleted(
            void  )
        rowDeleted()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;


        virtual  css::uno::Reference<  css::uno::XInterface > SAL_CALL
        getStatement(
            void  )
        getStatement()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        // XCloseable

        virtual void SAL_CALL
        close(
            void )
        close()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;

        // XContentAccess

        virtual OUString SAL_CALL
        queryContentIdentifierString(
            void )
        queryContentIdentifierString()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL
        queryContentIdentifier(
            void )
        queryContentIdentifier()
            throw( css::uno::RuntimeException, std::exception ) override;

        virtual css::uno::Reference< css::ucb::XContent > SAL_CALL
        queryContent(
            void )
        queryContent()
            throw( css::uno::RuntimeException, std::exception ) override;

        // XResultSetMetaDataSupplier
        virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL
        getMetaData(
            void )
        getMetaData()
            throw( css::sdbc::SQLException,
                   css::uno::RuntimeException, std::exception) override;