diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /ucb | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'ucb')
108 files changed, 1436 insertions, 1436 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 2bfcf9bcfc87..37cb74e5c373 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -419,15 +419,15 @@ public: // XPropertySetInfo virtual Sequence< com::sun::star::beans::Property > SAL_CALL getProperties() - throw( RuntimeException ); + throw( RuntimeException, std::exception ); virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( com::sun::star::beans::UnknownPropertyException, RuntimeException ); + throw( com::sun::star::beans::UnknownPropertyException, RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); }; OUString CCRS_PropertySetInfo::m_aPropertyNameForCount( "RowCount" ); @@ -535,7 +535,7 @@ XTYPEPROVIDER_IMPL_2( CCRS_PropertySetInfo //virtual Sequence< Property > SAL_CALL CCRS_PropertySetInfo - ::getProperties() throw( RuntimeException ) + ::getProperties() throw( RuntimeException, std::exception ) { return *m_pProperties; } @@ -543,7 +543,7 @@ Sequence< Property > SAL_CALL CCRS_PropertySetInfo //virtual Property SAL_CALL CCRS_PropertySetInfo ::getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException ) + throw( UnknownPropertyException, RuntimeException, std::exception ) { if ( aName.isEmpty() ) throw UnknownPropertyException(); @@ -558,7 +558,7 @@ Property SAL_CALL CCRS_PropertySetInfo //virtual sal_Bool SAL_CALL CCRS_PropertySetInfo ::hasPropertyByName( const OUString& Name ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return ( impl_getPos( Name ) != -1 ); } @@ -918,7 +918,7 @@ XINTERFACE_COMMON_IMPL( CachedContentResultSet ) Any SAL_CALL CachedContentResultSet ::queryInterface( const Type& rType ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces @@ -974,7 +974,7 @@ void SAL_CALL CachedContentResultSet PropertyVetoException, IllegalArgumentException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1085,7 +1085,7 @@ Any SAL_CALL CachedContentResultSet ::getPropertyValue( const OUString& rPropertyName ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1281,7 +1281,7 @@ return m_aCache##XXX.get##XXX( nRow ); // virtual OUString SAL_CALL CachedContentResultSet ::queryContentIdentifierString() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { XCONTENTACCESS_queryXXX( queryContentIdentifierString, ContentIdentifierString, OUString ) } @@ -1290,7 +1290,7 @@ OUString SAL_CALL CachedContentResultSet // virtual Reference< XContentIdentifier > SAL_CALL CachedContentResultSet ::queryContentIdentifier() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { XCONTENTACCESS_queryXXX( queryContentIdentifier, ContentIdentifier, Reference< XContentIdentifier > ) } @@ -1299,7 +1299,7 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet // virtual Reference< XContent > SAL_CALL CachedContentResultSet ::queryContent() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { XCONTENTACCESS_queryXXX( queryContent, Content, Reference< XContent > ) } @@ -1312,7 +1312,7 @@ Reference< XContent > SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::next() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1353,7 +1353,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::previous() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1394,7 +1394,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::absolute( sal_Int32 row ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1513,7 +1513,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::relative( sal_Int32 rows ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1568,7 +1568,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::first() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1603,7 +1603,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::last() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1652,7 +1652,7 @@ sal_Bool SAL_CALL CachedContentResultSet void SAL_CALL CachedContentResultSet ::beforeFirst() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1668,7 +1668,7 @@ void SAL_CALL CachedContentResultSet void SAL_CALL CachedContentResultSet ::afterLast() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1684,7 +1684,7 @@ void SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::isAfterLast() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1717,7 +1717,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::isBeforeFirst() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1753,7 +1753,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::isFirst() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1788,7 +1788,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::isLast() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1821,7 +1821,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Int32 SAL_CALL CachedContentResultSet ::getRow() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1835,7 +1835,7 @@ sal_Int32 SAL_CALL CachedContentResultSet void SAL_CALL CachedContentResultSet ::refreshRow() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1847,7 +1847,7 @@ void SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::rowUpdated() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1858,7 +1858,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::rowInserted() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1870,7 +1870,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::rowDeleted() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1882,7 +1882,7 @@ sal_Bool SAL_CALL CachedContentResultSet Reference< XInterface > SAL_CALL CachedContentResultSet ::getStatement() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); //@todo ?return anything @@ -1897,7 +1897,7 @@ Reference< XInterface > SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::wasNull() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xRowOrigin(); @@ -1918,7 +1918,7 @@ sal_Bool SAL_CALL CachedContentResultSet OUString SAL_CALL CachedContentResultSet ::getString( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<OUString>(&css::sdbc::XRow::getString, columnIndex); } @@ -1927,7 +1927,7 @@ OUString SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::getBoolean( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<sal_Bool>(&css::sdbc::XRow::getBoolean, columnIndex); } @@ -1936,7 +1936,7 @@ sal_Bool SAL_CALL CachedContentResultSet sal_Int8 SAL_CALL CachedContentResultSet ::getByte( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<sal_Int8>(&css::sdbc::XRow::getByte, columnIndex); } @@ -1945,7 +1945,7 @@ sal_Int8 SAL_CALL CachedContentResultSet sal_Int16 SAL_CALL CachedContentResultSet ::getShort( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<sal_Int16>(&css::sdbc::XRow::getShort, columnIndex); } @@ -1954,7 +1954,7 @@ sal_Int16 SAL_CALL CachedContentResultSet sal_Int32 SAL_CALL CachedContentResultSet ::getInt( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<sal_Int32>(&css::sdbc::XRow::getInt, columnIndex); } @@ -1963,7 +1963,7 @@ sal_Int32 SAL_CALL CachedContentResultSet sal_Int64 SAL_CALL CachedContentResultSet ::getLong( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<sal_Int64>(&css::sdbc::XRow::getLong, columnIndex); } @@ -1972,7 +1972,7 @@ sal_Int64 SAL_CALL CachedContentResultSet float SAL_CALL CachedContentResultSet ::getFloat( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<float>(&css::sdbc::XRow::getFloat, columnIndex); } @@ -1981,7 +1981,7 @@ float SAL_CALL CachedContentResultSet double SAL_CALL CachedContentResultSet ::getDouble( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<double>(&css::sdbc::XRow::getDouble, columnIndex); } @@ -1990,7 +1990,7 @@ double SAL_CALL CachedContentResultSet Sequence< sal_Int8 > SAL_CALL CachedContentResultSet ::getBytes( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet< css::uno::Sequence<sal_Int8> >( &css::sdbc::XRow::getBytes, columnIndex); @@ -2000,7 +2000,7 @@ Sequence< sal_Int8 > SAL_CALL CachedContentResultSet Date SAL_CALL CachedContentResultSet ::getDate( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<css::util::Date>( &css::sdbc::XRow::getDate, columnIndex); @@ -2010,7 +2010,7 @@ Date SAL_CALL CachedContentResultSet Time SAL_CALL CachedContentResultSet ::getTime( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<css::util::Time>( &css::sdbc::XRow::getTime, columnIndex); @@ -2020,7 +2020,7 @@ Time SAL_CALL CachedContentResultSet DateTime SAL_CALL CachedContentResultSet ::getTimestamp( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet<css::util::DateTime>( &css::sdbc::XRow::getTimestamp, columnIndex); @@ -2031,7 +2031,7 @@ Reference< com::sun::star::io::XInputStream > SAL_CALL CachedContentResultSet ::getBinaryStream( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::io::XInputStream> >( &css::sdbc::XRow::getBinaryStream, columnIndex); @@ -2042,7 +2042,7 @@ Reference< com::sun::star::io::XInputStream > SAL_CALL CachedContentResultSet ::getCharacterStream( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::io::XInputStream> >( &css::sdbc::XRow::getCharacterStream, columnIndex); @@ -2054,7 +2054,7 @@ Any SAL_CALL CachedContentResultSet const Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { //if you change this function please pay attention to //function template rowOriginGet, where this is similar implemented @@ -2098,7 +2098,7 @@ Any SAL_CALL CachedContentResultSet Reference< XRef > SAL_CALL CachedContentResultSet ::getRef( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::sdbc::XRef> >( &css::sdbc::XRow::getRef, columnIndex); @@ -2108,7 +2108,7 @@ Reference< XRef > SAL_CALL CachedContentResultSet Reference< XBlob > SAL_CALL CachedContentResultSet ::getBlob( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::sdbc::XBlob> >( &css::sdbc::XRow::getBlob, columnIndex); @@ -2118,7 +2118,7 @@ Reference< XBlob > SAL_CALL CachedContentResultSet Reference< XClob > SAL_CALL CachedContentResultSet ::getClob( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::sdbc::XClob> >( &css::sdbc::XRow::getClob, columnIndex); @@ -2128,7 +2128,7 @@ Reference< XClob > SAL_CALL CachedContentResultSet Reference< XArray > SAL_CALL CachedContentResultSet ::getArray( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::sdbc::XArray> >( &css::sdbc::XRow::getArray, columnIndex); @@ -2211,7 +2211,7 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetFactory ::createCachedContentResultSet( const Reference< XResultSet > & xSource, const Reference< XContentIdentifierMapping > & xMapping ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { Reference< XResultSet > xRet; xRet = new CachedContentResultSet( m_xContext, xSource, xMapping ); diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index 73fbc8dc4b7d..a18a688450e7 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -222,13 +222,13 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // own inherited @@ -251,17 +251,17 @@ public: virtual OUString SAL_CALL queryContentIdentifierString() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL queryContent() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XResultSet inherited @@ -269,76 +269,76 @@ public: virtual sal_Bool SAL_CALL next() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isBeforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isAfterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL beforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL afterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL first() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL last() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL getRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL previous() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL refreshRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL rowUpdated() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL rowInserted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL rowDeleted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getStatement() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XRow inherited @@ -346,110 +346,110 @@ public: virtual sal_Bool SAL_CALL wasNull() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // Type Converter support @@ -509,7 +509,7 @@ public: com::sun::star::sdbc::XResultSet > & xSource, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifierMapping > & xMapping ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); }; #endif diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 719973099d9e..dd3d896a9f83 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -58,7 +58,7 @@ XINTERFACE_COMMON_IMPL( CachedContentResultSetStub ) Any SAL_CALL CachedContentResultSetStub ::queryInterface( const Type& rType ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces @@ -130,7 +130,7 @@ XTYPEPROVIDER_COMMON_IMPL( CachedContentResultSetStub ) //list all interfaces exclusive baseclasses Sequence< Type > SAL_CALL CachedContentResultSetStub ::getTypes() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { static Sequence< Type >* pTypes = NULL; if( !pTypes ) @@ -285,7 +285,7 @@ return aRet; FetchResult SAL_CALL CachedContentResultSetStub ::fetch( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { impl_init_xRowOrigin(); FETCH_XXX( impl_getCurrentRowContent, m_xRowOrigin ); @@ -454,7 +454,7 @@ void SAL_CALL CachedContentResultSetStub FetchResult SAL_CALL CachedContentResultSetStub ::fetchContentIdentifierStrings( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { impl_init_xContentAccessOrigin(); FETCH_XXX( impl_getCurrentContentIdentifierString, m_xContentAccessOrigin ); @@ -464,7 +464,7 @@ FetchResult SAL_CALL CachedContentResultSetStub FetchResult SAL_CALL CachedContentResultSetStub ::fetchContentIdentifiers( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { impl_init_xContentAccessOrigin(); FETCH_XXX( impl_getCurrentContentIdentifier, m_xContentAccessOrigin ); @@ -474,7 +474,7 @@ FetchResult SAL_CALL CachedContentResultSetStub FetchResult SAL_CALL CachedContentResultSetStub ::fetchContents( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { impl_init_xContentAccessOrigin(); FETCH_XXX( impl_getCurrentContent, m_xContentAccessOrigin ); @@ -536,7 +536,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetStubFactory ); Reference< XResultSet > SAL_CALL CachedContentResultSetStubFactory ::createCachedContentResultSetStub( const Reference< XResultSet > & xSource ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( xSource.is() ) { diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index b42fb8caa1c3..70fe3e3977b8 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -126,7 +126,7 @@ public: virtual com::sun::star::ucb::FetchResult SAL_CALL fetch( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XFetchProviderForContentAccess @@ -134,17 +134,17 @@ public: virtual com::sun::star::ucb::FetchResult SAL_CALL fetchContentIdentifierStrings( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::ucb::FetchResult SAL_CALL fetchContentIdentifiers( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::ucb::FetchResult SAL_CALL fetchContents( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); }; @@ -187,7 +187,7 @@ public: createCachedContentResultSetStub( const com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > & xSource ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); }; #endif diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index ab9467825fd7..917a6f692c18 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -80,7 +80,7 @@ XINTERFACE_COMMON_IMPL( CachedDynamicResultSet ) Any SAL_CALL CachedDynamicResultSet ::queryInterface( const Type& rType ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces @@ -183,7 +183,7 @@ Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetFactory ::createCachedDynamicResultSet( const Reference< XDynamicResultSet > & SourceStub , const Reference< XContentIdentifierMapping > & ContentIdentifierMapping ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XDynamicResultSet > xRet; xRet = new CachedDynamicResultSet( SourceStub, ContentIdentifierMapping, m_xContext ); diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx index f6eb0a1ff34c..93c4fa0804e1 100644 --- a/ucb/source/cacher/cacheddynamicresultset.hxx +++ b/ucb/source/cacher/cacheddynamicresultset.hxx @@ -122,7 +122,7 @@ public: com::sun::star::ucb::XContentIdentifierMapping > & ContentIdentifierMapping ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); }; #endif diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index fb7dbe5daa02..efbb359edf6d 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -81,7 +81,7 @@ XINTERFACE_COMMON_IMPL( CachedDynamicResultSetStub ) Any SAL_CALL CachedDynamicResultSetStub ::queryInterface( const Type& rType ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces @@ -172,7 +172,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetStubFactory ); Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetStubFactory ::createCachedDynamicResultSetStub( const Reference< XDynamicResultSet > & Source ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XDynamicResultSet > xRet; xRet = new CachedDynamicResultSetStub( Source, m_xContext ); @@ -189,7 +189,7 @@ void SAL_CALL CachedDynamicResultSetStubFactory ) throw ( ListenerAlreadySetException , AlreadyInitializedException - , RuntimeException ) + , RuntimeException, std::exception ) { OSL_ENSURE( Source.is(), "a Source is needed" ); OSL_ENSURE( TargetCache.is(), "a TargetCache is needed" ); diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx index bc4f420dd705..f7777ad6902e 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx @@ -104,7 +104,7 @@ public: createCachedDynamicResultSetStub( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > & Source ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL connectToCache( @@ -120,7 +120,7 @@ public: throw ( com::sun::star::ucb::ListenerAlreadySetException , com::sun::star::ucb::AlreadyInitializedException - , com::sun::star::uno::RuntimeException + , com::sun::star::uno::RuntimeException, std::exception ); }; diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index 4a00bceac909..516b719eebdd 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -357,7 +357,7 @@ QUERYINTERFACE_IMPL_END // virtual void SAL_CALL ContentResultSetWrapper - ::dispose() throw( RuntimeException ) + ::dispose() throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -432,7 +432,7 @@ void SAL_CALL ContentResultSetWrapper // virtual void SAL_CALL ContentResultSetWrapper ::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -448,7 +448,7 @@ void SAL_CALL ContentResultSetWrapper // virtual void SAL_CALL ContentResultSetWrapper ::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -464,7 +464,7 @@ void SAL_CALL ContentResultSetWrapper void SAL_CALL ContentResultSetWrapper ::close() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); dispose(); @@ -477,7 +477,7 @@ void SAL_CALL ContentResultSetWrapper Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper ::getMetaData() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -508,7 +508,7 @@ Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper // virtual Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper - ::getPropertySetInfo() throw( RuntimeException ) + ::getPropertySetInfo() throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); { @@ -527,7 +527,7 @@ void SAL_CALL ContentResultSetWrapper PropertyVetoException, IllegalArgumentException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xPropertySetOrigin(); @@ -545,7 +545,7 @@ Any SAL_CALL ContentResultSetWrapper ::getPropertyValue( const OUString& rPropertyName ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xPropertySetOrigin(); @@ -565,7 +565,7 @@ void SAL_CALL ContentResultSetWrapper const Reference< XPropertyChangeListener >& xListener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -617,7 +617,7 @@ void SAL_CALL ContentResultSetWrapper const Reference< XVetoableChangeListener >& xListener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -668,7 +668,7 @@ void SAL_CALL ContentResultSetWrapper const Reference< XPropertyChangeListener >& xListener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -727,7 +727,7 @@ void SAL_CALL ContentResultSetWrapper const Reference< XVetoableChangeListener >& xListener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -842,7 +842,7 @@ void SAL_CALL ContentResultSetWrapper // virtual OUString SAL_CALL ContentResultSetWrapper ::queryContentIdentifierString() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xContentAccessOrigin(); @@ -858,7 +858,7 @@ OUString SAL_CALL ContentResultSetWrapper // virtual Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper ::queryContentIdentifier() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xContentAccessOrigin(); @@ -874,7 +874,7 @@ Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper // virtual Reference< XContent > SAL_CALL ContentResultSetWrapper ::queryContent() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xContentAccessOrigin(); @@ -894,7 +894,7 @@ Reference< XContent > SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::next() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -910,7 +910,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::previous() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -926,7 +926,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::absolute( sal_Int32 row ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -942,7 +942,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::relative( sal_Int32 rows ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -959,7 +959,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::first() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -975,7 +975,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::last() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -991,7 +991,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper void SAL_CALL ContentResultSetWrapper ::beforeFirst() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1007,7 +1007,7 @@ void SAL_CALL ContentResultSetWrapper void SAL_CALL ContentResultSetWrapper ::afterLast() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1023,7 +1023,7 @@ void SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::isAfterLast() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1039,7 +1039,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::isBeforeFirst() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1055,7 +1055,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::isFirst() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1071,7 +1071,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::isLast() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1088,7 +1088,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Int32 SAL_CALL ContentResultSetWrapper ::getRow() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1104,7 +1104,7 @@ sal_Int32 SAL_CALL ContentResultSetWrapper void SAL_CALL ContentResultSetWrapper ::refreshRow() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1120,7 +1120,7 @@ void SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::rowUpdated() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1135,7 +1135,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::rowInserted() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1151,7 +1151,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::rowDeleted() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1167,7 +1167,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper Reference< XInterface > SAL_CALL ContentResultSetWrapper ::getStatement() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); //@todo ?return anything @@ -1192,7 +1192,7 @@ return m_xRowOrigin->getXXX( columnIndex ); sal_Bool SAL_CALL ContentResultSetWrapper ::wasNull() throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xRowOrigin(); @@ -1208,7 +1208,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper OUString SAL_CALL ContentResultSetWrapper ::getString( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getString ); } @@ -1217,7 +1217,7 @@ OUString SAL_CALL ContentResultSetWrapper sal_Bool SAL_CALL ContentResultSetWrapper ::getBoolean( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getBoolean ); } @@ -1226,7 +1226,7 @@ sal_Bool SAL_CALL ContentResultSetWrapper sal_Int8 SAL_CALL ContentResultSetWrapper ::getByte( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getByte ); } @@ -1235,7 +1235,7 @@ sal_Int8 SAL_CALL ContentResultSetWrapper sal_Int16 SAL_CALL ContentResultSetWrapper ::getShort( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getShort ); } @@ -1244,7 +1244,7 @@ sal_Int16 SAL_CALL ContentResultSetWrapper sal_Int32 SAL_CALL ContentResultSetWrapper ::getInt( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getInt ); } @@ -1253,7 +1253,7 @@ sal_Int32 SAL_CALL ContentResultSetWrapper sal_Int64 SAL_CALL ContentResultSetWrapper ::getLong( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getLong ); } @@ -1262,7 +1262,7 @@ sal_Int64 SAL_CALL ContentResultSetWrapper float SAL_CALL ContentResultSetWrapper ::getFloat( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getFloat ); } @@ -1271,7 +1271,7 @@ float SAL_CALL ContentResultSetWrapper double SAL_CALL ContentResultSetWrapper ::getDouble( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getDouble ); } @@ -1280,7 +1280,7 @@ double SAL_CALL ContentResultSetWrapper Sequence< sal_Int8 > SAL_CALL ContentResultSetWrapper ::getBytes( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getBytes ); } @@ -1289,7 +1289,7 @@ Sequence< sal_Int8 > SAL_CALL ContentResultSetWrapper Date SAL_CALL ContentResultSetWrapper ::getDate( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getDate ); } @@ -1298,7 +1298,7 @@ Date SAL_CALL ContentResultSetWrapper Time SAL_CALL ContentResultSetWrapper ::getTime( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getTime ); } @@ -1307,7 +1307,7 @@ Time SAL_CALL ContentResultSetWrapper DateTime SAL_CALL ContentResultSetWrapper ::getTimestamp( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getTimestamp ); } @@ -1317,7 +1317,7 @@ Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper ::getBinaryStream( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getBinaryStream ); } @@ -1327,7 +1327,7 @@ Reference< com::sun::star::io::XInputStream > SAL_CALL ContentResultSetWrapper ::getCharacterStream( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getCharacterStream ); } @@ -1338,7 +1338,7 @@ Any SAL_CALL ContentResultSetWrapper const Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { //if you change this macro please pay attention to //define XROW_GETXXX, where this is similar implemented @@ -1357,7 +1357,7 @@ Any SAL_CALL ContentResultSetWrapper Reference< XRef > SAL_CALL ContentResultSetWrapper ::getRef( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getRef ); } @@ -1366,7 +1366,7 @@ Reference< XRef > SAL_CALL ContentResultSetWrapper Reference< XBlob > SAL_CALL ContentResultSetWrapper ::getBlob( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getBlob ); } @@ -1375,7 +1375,7 @@ Reference< XBlob > SAL_CALL ContentResultSetWrapper Reference< XClob > SAL_CALL ContentResultSetWrapper ::getClob( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getClob ); } @@ -1384,7 +1384,7 @@ Reference< XClob > SAL_CALL ContentResultSetWrapper Reference< XArray > SAL_CALL ContentResultSetWrapper ::getArray( sal_Int32 columnIndex ) throw( SQLException, - RuntimeException ) + RuntimeException, std::exception ) { XROW_GETXXX( getArray ); } @@ -1427,7 +1427,7 @@ QUERYINTERFACE_IMPL_END //virtual void SAL_CALL ContentResultSetWrapperListener ::disposing( const EventObject& rEventObject ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( m_pOwner ) m_pOwner->impl_disposing( rEventObject ); @@ -1440,7 +1440,7 @@ void SAL_CALL ContentResultSetWrapperListener //virtual void SAL_CALL ContentResultSetWrapperListener ::propertyChange( const PropertyChangeEvent& rEvt ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( m_pOwner ) m_pOwner->impl_propertyChange( rEvt ); @@ -1453,7 +1453,7 @@ void SAL_CALL ContentResultSetWrapperListener void SAL_CALL ContentResultSetWrapperListener ::vetoableChange( const PropertyChangeEvent& rEvt ) throw( PropertyVetoException, - RuntimeException ) + RuntimeException, std::exception ) { if( m_pOwner ) m_pOwner->impl_vetoableChange( rEvt ); diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index 9f7f409ceb8e..143a9639dce6 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -200,23 +200,23 @@ public: virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XComponent virtual void SAL_CALL - dispose() throw( com::sun::star::uno::RuntimeException ); + dispose() throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); //XCloseable @@ -224,7 +224,7 @@ public: virtual void SAL_CALL close() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); //XResultSetMetaDataSupplier @@ -233,7 +233,7 @@ public: com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XPropertySet @@ -241,7 +241,7 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, @@ -250,13 +250,13 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, @@ -264,7 +264,7 @@ public: com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, @@ -272,7 +272,7 @@ public: com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, @@ -280,7 +280,7 @@ public: com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, @@ -288,7 +288,7 @@ public: com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // own methods @@ -311,17 +311,17 @@ public: virtual OUString SAL_CALL queryContentIdentifierString() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL queryContent() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XResultSet @@ -329,76 +329,76 @@ public: virtual sal_Bool SAL_CALL next() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isBeforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isAfterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL beforeFirst() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL afterLast() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL first() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL last() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL getRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL previous() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL refreshRow() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL rowUpdated() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL rowInserted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL rowDeleted() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getStatement() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XRow @@ -406,110 +406,110 @@ public: virtual sal_Bool SAL_CALL wasNull() throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); }; @@ -537,14 +537,14 @@ public: virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); //XPropertyChangeListener virtual void SAL_CALL propertyChange( const com::sun::star::beans::PropertyChangeEvent& evt ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); //XVetoableChangeListener @@ -552,7 +552,7 @@ public: virtual void SAL_CALL vetoableChange( const com::sun::star::beans::PropertyChangeEvent& aEvent ) throw( com::sun::star::beans::PropertyVetoException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // own methods: diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index f99e23704d33..3e777ca9abe0 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -136,7 +136,7 @@ QUERYINTERFACE_IMPL_END // virtual void SAL_CALL DynamicResultSetWrapper - ::dispose() throw( RuntimeException ) + ::dispose() throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -173,7 +173,7 @@ void SAL_CALL DynamicResultSetWrapper // virtual void SAL_CALL DynamicResultSetWrapper ::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -189,7 +189,7 @@ void SAL_CALL DynamicResultSetWrapper // virtual void SAL_CALL DynamicResultSetWrapper ::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -293,7 +293,7 @@ void SAL_CALL DynamicResultSetWrapper //virtual void SAL_CALL DynamicResultSetWrapper ::setSource( const Reference< XInterface > & Source ) - throw( AlreadyInitializedException, RuntimeException ) + throw( AlreadyInitializedException, RuntimeException, std::exception ) { impl_EnsureNotDisposed(); { @@ -335,7 +335,7 @@ void SAL_CALL DynamicResultSetWrapper //virtual Reference< XResultSet > SAL_CALL DynamicResultSetWrapper ::getStaticResultSet() - throw( ListenerAlreadySetException, RuntimeException ) + throw( ListenerAlreadySetException, RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -368,7 +368,7 @@ Reference< XResultSet > SAL_CALL DynamicResultSetWrapper void SAL_CALL DynamicResultSetWrapper ::setListener( const Reference< XDynamicResultSetListener > & Listener ) - throw( ListenerAlreadySetException, RuntimeException ) + throw( ListenerAlreadySetException, RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -396,7 +396,7 @@ void SAL_CALL DynamicResultSetWrapper //virtual void SAL_CALL DynamicResultSetWrapper ::connectToCache( const Reference< XDynamicResultSet > & xCache ) - throw( ListenerAlreadySetException, AlreadyInitializedException, ServiceNotFoundException, RuntimeException ) + throw( ListenerAlreadySetException, AlreadyInitializedException, ServiceNotFoundException, RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -434,7 +434,7 @@ void SAL_CALL DynamicResultSetWrapper //virtual sal_Int16 SAL_CALL DynamicResultSetWrapper ::getCapabilities() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -480,7 +480,7 @@ XINTERFACE_IMPL_2( DynamicResultSetWrapperListener //virtual void SAL_CALL DynamicResultSetWrapperListener ::disposing( const EventObject& rEventObject ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -491,7 +491,7 @@ void SAL_CALL DynamicResultSetWrapperListener //virtual void SAL_CALL DynamicResultSetWrapperListener ::notify( const ListEvent& Changes ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index f4d09d801a1b..a5c695c532fb 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -115,20 +115,20 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type & rType ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XDynamicResultSet virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSet > SAL_CALL getStaticResultSet() throw( com::sun::star::ucb::ListenerAlreadySetException - , com::sun::star::uno::RuntimeException ); + , com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener > & Listener ) throw( com::sun::star::ucb::ListenerAlreadySetException - , com::sun::star::uno::RuntimeException ); + , com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL connectToCache( const com::sun::star::uno::Reference< @@ -136,25 +136,25 @@ public: throw( com::sun::star::ucb::ListenerAlreadySetException , com::sun::star::ucb::AlreadyInitializedException , com::sun::star::ucb::ServiceNotFoundException - , com::sun::star::uno::RuntimeException ); + , com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int16 SAL_CALL - getCapabilities() throw( com::sun::star::uno::RuntimeException ); + getCapabilities() throw( com::sun::star::uno::RuntimeException, std::exception ); // XComponent ( base of XDynamicResultSet ) virtual void SAL_CALL - dispose() throw( com::sun::star::uno::RuntimeException ); + dispose() throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XSourceInitialization @@ -163,7 +163,7 @@ public: setSource( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > & Source ) throw( com::sun::star::ucb::AlreadyInitializedException - , com::sun::star::uno::RuntimeException ); + , com::sun::star::uno::RuntimeException, std::exception ); // own methods: @@ -201,12 +201,12 @@ public: virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XDynamicResultSetListener virtual void SAL_CALL notify( const ::com::sun::star::ucb::ListEvent& Changes ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // own methods: diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index a5dee2c4841f..25baa12daaf1 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -94,25 +94,25 @@ public: OFileAccess( const Reference< XComponentContext > & xContext ) : m_xContext( xContext), mpEnvironment( NULL ) {} // Methods - virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL kill( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL writeFile( const OUString& FileURL, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& data ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL kill( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& Handler ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL writeFile( const OUString& FileURL, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& data ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); }; // Implementation XActiveDataSink @@ -126,9 +126,9 @@ public: // Methods virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual Reference< XInputStream > SAL_CALL getInputStream( ) - throw(RuntimeException); + throw(RuntimeException, std::exception); }; // Implementation XActiveDataStreamer @@ -142,9 +142,9 @@ public: // Methods virtual void SAL_CALL setStream( const Reference< XStream >& aStream ) - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual Reference< XStream > SAL_CALL getStream() - throw(RuntimeException); + throw(RuntimeException, std::exception); }; // Implementation XCommandEnvironment @@ -162,43 +162,43 @@ public: // Methods virtual Reference< XInteractionHandler > SAL_CALL getInteractionHandler() - throw(RuntimeException); + throw(RuntimeException, std::exception); virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() - throw(RuntimeException); + throw(RuntimeException, std::exception); }; void OActiveDataSink::setInputStream( const Reference< XInputStream >& aStream ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { mxStream = aStream; } Reference< XInputStream > OActiveDataSink::getInputStream() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mxStream; } void OActiveDataStreamer::setStream( const Reference< XStream >& aStream ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { mxStream = aStream; } Reference< XStream > OActiveDataStreamer::getStream() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mxStream; } Reference< XInteractionHandler > OCommandEnvironment::getInteractionHandler() - throw(RuntimeException) + throw(RuntimeException, std::exception) { return mxInteraction; } Reference< XProgressHandler > OCommandEnvironment::getProgressHandler() - throw(RuntimeException) + throw(RuntimeException, std::exception) { Reference< XProgressHandler > xRet; return xRet; @@ -280,19 +280,19 @@ void OFileAccess::transferImpl( const OUString& rSource, } void OFileAccess::copy( const OUString& SourceURL, const OUString& DestURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { transferImpl( SourceURL, DestURL, sal_False ); } void OFileAccess::move( const OUString& SourceURL, const OUString& DestURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { transferImpl( SourceURL, DestURL, sal_True ); } void OFileAccess::kill( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { // SfxContentHelper::Kill INetURLObject aDeleteObj( FileURL, INET_PROT_FILE ); @@ -308,7 +308,7 @@ void OFileAccess::kill( const OUString& FileURL ) } sal_Bool OFileAccess::isFolder( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { sal_Bool bRet = sal_False; try @@ -322,7 +322,7 @@ sal_Bool OFileAccess::isFolder( const OUString& FileURL ) } sal_Bool OFileAccess::isReadOnly( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aURLObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); @@ -333,7 +333,7 @@ sal_Bool OFileAccess::isReadOnly( const OUString& FileURL ) } void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aURLObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); @@ -343,7 +343,7 @@ void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) } void OFileAccess::createFolder( const OUString& NewFolderURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { // Does the folder already exist? if( NewFolderURL.isEmpty() || isFolder( NewFolderURL ) ) @@ -411,7 +411,7 @@ void OFileAccess::createFolder( const OUString& NewFolderURL ) } sal_Int32 OFileAccess::getSize( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { // SfxContentHelper::GetSize sal_Int32 nSize = 0; @@ -424,7 +424,7 @@ sal_Int32 OFileAccess::getSize( const OUString& FileURL ) } OUString OFileAccess::getContentType( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); @@ -435,7 +435,7 @@ OUString OFileAccess::getContentType( const OUString& FileURL ) } DateTime OFileAccess::getDateTimeModified( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aFileObj( FileURL, INET_PROT_FILE ); DateTime aDateTime; @@ -449,7 +449,7 @@ DateTime OFileAccess::getDateTimeModified( const OUString& FileURL ) typedef vector< OUString* > StringList_Impl; Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { // SfxContentHelper::GetFolderContents @@ -505,7 +505,7 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, } sal_Bool OFileAccess::exists( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { sal_Bool bRet = sal_False; try @@ -524,7 +524,7 @@ sal_Bool OFileAccess::exists( const OUString& FileURL ) } Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { Reference< XInputStream > xRet; INetURLObject aObj( FileURL, INET_PROT_FILE ); @@ -547,7 +547,7 @@ Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL ) } Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { Reference< XOutputStream > xRet; Reference< XStream > xStream = OFileAccess::openFileReadWrite( FileURL ); @@ -557,7 +557,7 @@ Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL ) } Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { Reference< XActiveDataStreamer > xSink = (XActiveDataStreamer*)new OActiveDataStreamer(); Reference< XInterface > xSinkIface = Reference< XInterface >::query( xSink ); @@ -619,7 +619,7 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL ) } void OFileAccess::setInteractionHandler( const Reference< XInteractionHandler >& Handler ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if( !mpEnvironment ) { @@ -688,7 +688,7 @@ bool OFileAccess::createNewFile( const OUString & rParentURL, void SAL_CALL OFileAccess::writeFile( const OUString& FileURL, const Reference< XInputStream >& data ) - throw ( Exception, RuntimeException ) + throw ( Exception, RuntimeException, std::exception ) { INetURLObject aURL( FileURL, INET_PROT_FILE ); try @@ -738,7 +738,7 @@ void SAL_CALL OFileAccess::writeFile( const OUString& FileURL, } sal_Bool OFileAccess::isHidden( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aURLObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); @@ -749,7 +749,7 @@ sal_Bool OFileAccess::isHidden( const OUString& FileURL ) } void OFileAccess::setHidden( const OUString& FileURL, sal_Bool bHidden ) - throw(CommandAbortedException, Exception, RuntimeException) + throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aURLObj( FileURL, INET_PROT_FILE ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::NO_DECODE ), mxEnvironment, comphelper::getProcessComponentContext() ); diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index 0171383c578d..e0f53fc6b6d9 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -62,7 +62,7 @@ UcbCommandEnvironment::~UcbCommandEnvironment() void SAL_CALL UcbCommandEnvironment::initialize( const uno::Sequence< uno::Any >& aArguments ) throw( uno::Exception, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( ( aArguments.getLength() < 2 ) || !( aArguments[ 0 ] >>= m_xIH ) || @@ -78,7 +78,7 @@ void SAL_CALL UcbCommandEnvironment::initialize( // virtual OUString SAL_CALL UcbCommandEnvironment::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -87,7 +87,7 @@ OUString SAL_CALL UcbCommandEnvironment::getImplementationName() // virtual sal_Bool SAL_CALL UcbCommandEnvironment::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -96,7 +96,7 @@ UcbCommandEnvironment::supportsService( const OUString& ServiceName ) // virtual uno::Sequence< OUString > SAL_CALL UcbCommandEnvironment::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } @@ -127,7 +127,7 @@ UcbCommandEnvironment::getSupportedServiceNames_Static() // virtual uno::Reference< task::XInteractionHandler > SAL_CALL UcbCommandEnvironment::getInteractionHandler() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xIH; } @@ -136,7 +136,7 @@ UcbCommandEnvironment::getInteractionHandler() // virtual uno::Reference< ucb::XProgressHandler > SAL_CALL UcbCommandEnvironment::getProgressHandler() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xPH; } diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx index 4ba7c7c3bf6d..87e57181ccaf 100644 --- a/ucb/source/core/cmdenv.hxx +++ b/ucb/source/core/cmdenv.hxx @@ -50,29 +50,29 @@ public: initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XCommandEnvironment virtual com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XProgressHandler > SAL_CALL getProgressHandler() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // Non-UNO interfaces static OUString diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx index 0eacd9f81cb2..e20ef5af6d95 100644 --- a/ucb/source/core/identify.cxx +++ b/ucb/source/core/identify.cxx @@ -77,7 +77,7 @@ XTYPEPROVIDER_IMPL_2( ContentIdentifier, // virtual OUString SAL_CALL ContentIdentifier::getContentIdentifier() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return m_aContentId; } @@ -85,7 +85,7 @@ OUString SAL_CALL ContentIdentifier::getContentIdentifier() // virtual OUString SAL_CALL ContentIdentifier::getContentProviderScheme() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( m_aProviderScheme.isEmpty() && !m_aContentId.isEmpty() ) { diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx index 2aa7803919ba..a7bfec4d6725 100644 --- a/ucb/source/core/identify.hxx +++ b/ucb/source/core/identify.hxx @@ -46,9 +46,9 @@ public: // XContentIdentifier virtual OUString SAL_CALL getContentIdentifier() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getContentProviderScheme() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: OUString m_aContentId; diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index a9c4356ff8f3..f0864f03ca68 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -98,7 +98,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbContentProviderProxyFactory ); Reference< XContentProvider > SAL_CALL UcbContentProviderProxyFactory::createContentProvider( const OUString& Service ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return Reference< XContentProvider >( new UcbContentProviderProxy( m_xSMgr, Service ) ); @@ -140,7 +140,7 @@ XINTERFACE_COMMON_IMPL( UcbContentProviderProxy ); // virtual Any SAL_CALL UcbContentProviderProxy::queryInterface( const Type & rType ) - throw ( RuntimeException ) + throw ( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, static_cast< XTypeProvider * >( this ), @@ -175,7 +175,7 @@ XTYPEPROVIDER_COMMON_IMPL( UcbContentProviderProxy ); Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() \ - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // Get original provider an forward the call... osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -216,7 +216,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy, Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent( const Reference< XContentIdentifier >& Identifier ) throw( IllegalIdentifierException, - RuntimeException ) + RuntimeException, std::exception ) { // Get original provider an forward the call... @@ -234,7 +234,7 @@ Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent( sal_Int32 SAL_CALL UcbContentProviderProxy::compareContentIds( const Reference< XContentIdentifier >& Id1, const Reference< XContentIdentifier >& Id2 ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // Get original provider an forward the call... @@ -261,7 +261,7 @@ UcbContentProviderProxy::registerInstance( const OUString& Template, const OUString& Arguments, sal_Bool ReplaceExisting ) throw( IllegalArgumentException, - RuntimeException ) + RuntimeException, std::exception ) { // Just remember that this method was called ( and the params ). @@ -285,7 +285,7 @@ Reference< XContentProvider > SAL_CALL UcbContentProviderProxy::deregisterInstance( const OUString& Template, const OUString& Arguments ) throw( IllegalArgumentException, - RuntimeException ) + RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -323,7 +323,7 @@ UcbContentProviderProxy::deregisterInstance( const OUString& Template, // virtual Reference< XContentProvider > SAL_CALL UcbContentProviderProxy::getContentProvider() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if ( !m_xProvider.is() ) diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index 4bfc5799a4f1..842375ac0d9e 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -72,7 +72,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL createContentProvider( const OUString& Service ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; @@ -123,7 +123,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL getContentProvider() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XContentProvider virtual ::com::sun::star::uno::Reference< @@ -131,13 +131,13 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL compareContentIds( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Id1, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XParameterizedContentProvider virtual ::com::sun::star::uno::Reference< @@ -146,13 +146,13 @@ public: const OUString& Arguments, sal_Bool ReplaceExisting ) throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentProvider > SAL_CALL deregisterInstance( const OUString& Template, const OUString& Arguments ) throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); }; #endif /* !_PROVPROX_HXX */ diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index b95ad1f2240e..70ea59b49b96 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -290,7 +290,7 @@ XTYPEPROVIDER_IMPL_9( UniversalContentBroker, // virtual void SAL_CALL UniversalContentBroker::dispose() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() ) { @@ -307,7 +307,7 @@ void SAL_CALL UniversalContentBroker::dispose() // virtual void SAL_CALL UniversalContentBroker::addEventListener( const Reference< XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { if ( !m_pDisposeEventListeners ) m_pDisposeEventListeners = new OInterfaceContainerHelper( m_aMutex ); @@ -319,7 +319,7 @@ void SAL_CALL UniversalContentBroker::addEventListener( // virtual void SAL_CALL UniversalContentBroker::removeEventListener( const Reference< XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { if ( m_pDisposeEventListeners ) m_pDisposeEventListeners->removeInterface( Listener ); @@ -355,7 +355,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UniversalContentBroker ); void SAL_CALL UniversalContentBroker::initialize( const com::sun::star::uno::Sequence< Any >& aArguments ) throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { { osl::MutexGuard aGuard(m_aMutex); @@ -399,7 +399,7 @@ UniversalContentBroker::registerContentProvider( const Reference< XContentProvider >& Provider, const OUString& Scheme, sal_Bool ReplaceExisting ) - throw( DuplicateProviderException, com::sun::star::uno::RuntimeException ) + throw( DuplicateProviderException, com::sun::star::uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); @@ -445,7 +445,7 @@ UniversalContentBroker::registerContentProvider( void SAL_CALL UniversalContentBroker::deregisterContentProvider( const Reference< XContentProvider >& Provider, const OUString& Scheme ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); @@ -483,7 +483,7 @@ void SAL_CALL UniversalContentBroker::deregisterContentProvider( // virtual com::sun::star::uno::Sequence< ContentProviderInfo > SAL_CALL UniversalContentBroker::queryContentProviders() - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { // Return a list with information about active(!) content providers. @@ -511,7 +511,7 @@ com::sun::star::uno::Sequence< ContentProviderInfo > SAL_CALL Reference< XContentProvider > SAL_CALL UniversalContentBroker::queryContentProvider( const OUString& Identifier ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { return queryContentProvider( Identifier, sal_False ); } @@ -525,7 +525,7 @@ Reference< XContentProvider > SAL_CALL // virtual Reference< XContent > SAL_CALL UniversalContentBroker::queryContent( const Reference< XContentIdentifier >& Identifier ) - throw( IllegalIdentifierException, com::sun::star::uno::RuntimeException ) + throw( IllegalIdentifierException, com::sun::star::uno::RuntimeException, std::exception ) { // Let the content provider for the scheme given with the content @@ -548,7 +548,7 @@ Reference< XContent > SAL_CALL UniversalContentBroker::queryContent( sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds( const Reference< XContentIdentifier >& Id1, const Reference< XContentIdentifier >& Id2 ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { OUString aURI1( Id1->getContentIdentifier() ); OUString aURI2( Id2->getContentIdentifier() ); @@ -577,7 +577,7 @@ sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds( Reference< XContentIdentifier > SAL_CALL UniversalContentBroker::createContentIdentifier( const OUString& ContentId ) - throw( com::sun::star::uno::RuntimeException ) + throw( com::sun::star::uno::RuntimeException, std::exception ) { // Let the content provider for the scheme given with content @@ -611,7 +611,7 @@ Reference< XContentIdentifier > SAL_CALL // virtual sal_Int32 SAL_CALL UniversalContentBroker::createCommandIdentifier() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -625,7 +625,7 @@ Any SAL_CALL UniversalContentBroker::execute( const Command& aCommand, sal_Int32, const Reference< XCommandEnvironment >& Environment ) - throw( Exception, CommandAbortedException, RuntimeException ) + throw( Exception, CommandAbortedException, RuntimeException, std::exception ) { Any aRet; @@ -713,7 +713,7 @@ Any SAL_CALL UniversalContentBroker::execute( // virtual void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aCommandId*/) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // @@@ Not implemeted ( yet). } @@ -721,7 +721,7 @@ void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aComm // virtual void SAL_CALL UniversalContentBroker::abort( sal_Int32 ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // @@@ Not implemeted ( yet). } @@ -733,7 +733,7 @@ void SAL_CALL UniversalContentBroker::abort( sal_Int32 ) // virtual void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& Event ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { sal_Int32 nCount = Event.Changes.getLength(); if ( nCount ) @@ -780,7 +780,7 @@ void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& // virtual void SAL_CALL UniversalContentBroker::disposing(const lang::EventObject&) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_xNotifier.is() ) { diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx index 36ba6412d7ec..d702a76b6851 100644 --- a/ucb/source/core/ucb.hxx +++ b/ucb/source/core/ucb.hxx @@ -77,22 +77,22 @@ public: // XComponent virtual void SAL_CALL dispose() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XInitialization virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XContentProviderManager virtual com::sun::star::uno::Reference< @@ -103,21 +103,21 @@ public: const OUString& Scheme, sal_Bool ReplaceExisting ) throw( com::sun::star::ucb::DuplicateProviderException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL deregisterContentProvider( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider >& Provider, const OUString& Scheme ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentProviderInfo > SAL_CALL queryContentProviders() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > SAL_CALL queryContentProvider( const OUString& Identifier ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XContentProvider virtual com::sun::star::uno::Reference< @@ -125,24 +125,24 @@ public: queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL compareContentIds( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id1, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XContentIdentifierFactory virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( const OUString& ContentId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor virtual sal_Int32 SAL_CALL createCommandIdentifier() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL execute( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, @@ -150,22 +150,22 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor2 virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XChangesListener virtual void SAL_CALL changesOccurred( const com::sun::star::util::ChangesEvent& Event ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XEventListener ( base of XChangesLisetenr ) virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: com::sun::star::uno::Reference< com::sun::star::ucb::XContentProvider > diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index a3ffcd4b9270..daeee1fd483d 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -111,14 +111,14 @@ public: // XInteractionHandler methods. virtual void SAL_CALL handle( const uno::Reference< task::XInteractionRequest >& Request ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); }; // virtual void SAL_CALL InteractionHandlerProxy::handle( const uno::Reference< task::XInteractionRequest >& Request ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { if ( !m_xOrig.is() ) return; @@ -180,16 +180,16 @@ public: // XActiveDataSink methods. virtual void SAL_CALL setInputStream( const uno::Reference< io::XInputStream >& aStream ) - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); }; // virtual void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< io::XInputStream >& aStream ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { m_xStream = aStream; } @@ -197,7 +197,7 @@ void SAL_CALL ActiveDataSink::setInputStream( // virtual uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_xStream; } @@ -219,17 +219,17 @@ public: // XCommandInfo methods virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands() - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); virtual ucb::CommandInfo SAL_CALL getCommandInfoByName( const OUString& Name ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException ); + throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ); virtual ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException ); + throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) - throw( uno::RuntimeException ); + throw( uno::RuntimeException, std::exception ); }; @@ -269,7 +269,7 @@ CommandProcessorInfo::~CommandProcessorInfo() // virtual uno::Sequence< ucb::CommandInfo > SAL_CALL CommandProcessorInfo::getCommands() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return uno::Sequence< ucb::CommandInfo >( *m_pInfo ); } @@ -278,7 +278,7 @@ CommandProcessorInfo::getCommands() // virtual ucb::CommandInfo SAL_CALL CommandProcessorInfo::getCommandInfoByName( const OUString& Name ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException ) + throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) { @@ -293,7 +293,7 @@ CommandProcessorInfo::getCommandInfoByName( const OUString& Name ) // virtual ucb::CommandInfo SAL_CALL CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException ) + throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) { @@ -308,7 +308,7 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) // virtual sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( const OUString& Name ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) { @@ -322,7 +322,7 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( // virtual sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) { diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 11fdf82e7f97..ff1b4a2a3ac2 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -354,7 +354,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbPropertiesManager ); // virtual Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -404,7 +404,7 @@ Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties() // virtual Property SAL_CALL UcbPropertiesManager::getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException ) + throw( UnknownPropertyException, RuntimeException, std::exception ) { Property aProp; if ( queryProperty( aName, aProp ) ) @@ -416,7 +416,7 @@ Property SAL_CALL UcbPropertiesManager::getPropertyByName( const OUString& aName // virtual sal_Bool SAL_CALL UcbPropertiesManager::hasPropertyByName( const OUString& Name ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Property aProp; return queryProperty( Name, aProp ); diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx index 1ab89649ae57..853a4c748054 100644 --- a/ucb/source/core/ucbprops.hxx +++ b/ucb/source/core/ucbprops.hxx @@ -71,14 +71,14 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL getProperties() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); }; #endif /* !_UCBPROPS_HXX */ diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 9a8fe60498f9..be2e6ddf755a 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -140,11 +140,11 @@ public: // XPropertySetInfo virtual Sequence< Property > SAL_CALL getProperties() - throw( RuntimeException ); + throw( RuntimeException, std::exception ); virtual Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException ); + throw( UnknownPropertyException, RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); // Non-interface methods. void reset() { delete m_pProps; m_pProps = 0; } @@ -237,7 +237,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbStore ); // virtual Reference< XPropertySetRegistry > SAL_CALL UcbStore::createPropertySetRegistry( const OUString& ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // The URL parameter is ignored by this interface implementation. It always // uses the configuration server as storage medium. @@ -260,7 +260,7 @@ UcbStore::createPropertySetRegistry( const OUString& ) // virtual void SAL_CALL UcbStore::initialize( const Sequence< Any >& aArguments ) - throw( Exception, RuntimeException ) + throw( Exception, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); m_pImpl->m_aInitArgs = aArguments; @@ -366,7 +366,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( PropertySetRegistry, // virtual Reference< XPersistentPropertySet > SAL_CALL PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( !key.isEmpty() ) { @@ -496,7 +496,7 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) // virtual void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( key.isEmpty() ) return; @@ -558,7 +558,7 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) // virtual com::sun::star::uno::Type SAL_CALL PropertySetRegistry::getElementType() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return getCppuType( ( Reference< XPersistentPropertySet > * ) 0 ); } @@ -566,7 +566,7 @@ com::sun::star::uno::Type SAL_CALL PropertySetRegistry::getElementType() // virtual sal_Bool SAL_CALL PropertySetRegistry::hasElements() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -586,7 +586,7 @@ sal_Bool SAL_CALL PropertySetRegistry::hasElements() // virtual Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName ) - throw( NoSuchElementException, WrappedTargetException, RuntimeException ) + throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -615,7 +615,7 @@ Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName ) // virtual Sequence< OUString > SAL_CALL PropertySetRegistry::getElementNames() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -631,7 +631,7 @@ Sequence< OUString > SAL_CALL PropertySetRegistry::getElementNames() // virtual sal_Bool SAL_CALL PropertySetRegistry::hasByName( const OUString& aName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -1312,7 +1312,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( PersistentPropertySet, // virtual void SAL_CALL PersistentPropertySet::dispose() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( m_pImpl->m_pDisposeEventListeners && m_pImpl->m_pDisposeEventListeners->getLength() ) @@ -1342,7 +1342,7 @@ void SAL_CALL PersistentPropertySet::dispose() // virtual void SAL_CALL PersistentPropertySet::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( !m_pImpl->m_pDisposeEventListeners ) m_pImpl->m_pDisposeEventListeners = @@ -1355,7 +1355,7 @@ void SAL_CALL PersistentPropertySet::addEventListener( // virtual void SAL_CALL PersistentPropertySet::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( m_pImpl->m_pDisposeEventListeners ) m_pImpl->m_pDisposeEventListeners->removeInterface( Listener ); @@ -1372,7 +1372,7 @@ void SAL_CALL PersistentPropertySet::removeEventListener( // virtual Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -1393,7 +1393,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( PropertyVetoException, IllegalArgumentException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { if ( aPropertyName.isEmpty() ) throw UnknownPropertyException(); @@ -1499,7 +1499,7 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue( const OUString& PropertyName ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { if ( PropertyName.isEmpty() ) throw UnknownPropertyException(); @@ -1534,7 +1534,7 @@ void SAL_CALL PersistentPropertySet::addPropertyChangeListener( const Reference< XPropertyChangeListener >& xListener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { // load(); @@ -1553,7 +1553,7 @@ void SAL_CALL PersistentPropertySet::removePropertyChangeListener( const Reference< XPropertyChangeListener >& aListener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { // load(); @@ -1571,7 +1571,7 @@ void SAL_CALL PersistentPropertySet::addVetoableChangeListener( const Reference< XVetoableChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { // load(); // OSL_FAIL( // "PersistentPropertySet::addVetoableChangeListener - N.Y.I." ); @@ -1584,7 +1584,7 @@ void SAL_CALL PersistentPropertySet::removeVetoableChangeListener( const Reference< XVetoableChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { // load(); // OSL_FAIL( // "PersistentPropertySet::removeVetoableChangeListener - N.Y.I." ); @@ -1598,7 +1598,7 @@ void SAL_CALL PersistentPropertySet::removeVetoableChangeListener( // virtual Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return Reference< XPropertySetRegistry >( m_pImpl->m_pCreator ); } @@ -1606,7 +1606,7 @@ Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry() // virtual OUString SAL_CALL PersistentPropertySet::getKey() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return m_pImpl->m_aKey; } @@ -1619,7 +1619,7 @@ OUString SAL_CALL PersistentPropertySet::getKey() // virtual OUString SAL_CALL PersistentPropertySet::getName() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // same as getKey() return m_pImpl->m_aKey; @@ -1628,7 +1628,7 @@ OUString SAL_CALL PersistentPropertySet::getName() // virtual void SAL_CALL PersistentPropertySet::setName( const OUString& aName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( aName != m_pImpl->m_aKey ) m_pImpl->m_pCreator->renamePropertySet( m_pImpl->m_aKey, aName ); @@ -1646,7 +1646,7 @@ void SAL_CALL PersistentPropertySet::addProperty( throw( PropertyExistException, IllegalTypeException, IllegalArgumentException, - RuntimeException ) + RuntimeException, std::exception ) { if ( Name.isEmpty() ) throw IllegalArgumentException(); @@ -1808,7 +1808,7 @@ void SAL_CALL PersistentPropertySet::addProperty( void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) throw( UnknownPropertyException, NotRemoveableException, - RuntimeException ) + RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -1960,7 +1960,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) // virtual void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener( const Reference< XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( !m_pImpl->m_pPropSetChangeListeners ) m_pImpl->m_pPropSetChangeListeners = @@ -1973,7 +1973,7 @@ void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener( // virtual void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener( const Reference< XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( m_pImpl->m_pPropSetChangeListeners ) m_pImpl->m_pPropSetChangeListeners->removeInterface( Listener ); @@ -1987,7 +1987,7 @@ void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener( // virtual Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -2124,7 +2124,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues( PropertyVetoException, IllegalArgumentException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { sal_Int32 nCount = aProps.getLength(); if ( !nCount ) @@ -2384,7 +2384,7 @@ XTYPEPROVIDER_IMPL_2( PropertySetInfo_Impl, // virtual Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( !m_pProps ) { @@ -2532,7 +2532,7 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() // virtual Property SAL_CALL PropertySetInfo_Impl::getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException ) + throw( UnknownPropertyException, RuntimeException, std::exception ) { Reference< XHierarchicalNameAccess > xRootHierNameAccess( m_pOwner->getPropertySetRegistry().getRootConfigReadAccess(), @@ -2616,7 +2616,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName( // virtual sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName( const OUString& Name ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XHierarchicalNameAccess > xRootHierNameAccess( m_pOwner->getPropertySetRegistry().getRootConfigReadAccess(), diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index 2af51b2203ef..929466c13ed5 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -76,14 +76,14 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry > SAL_CALL createPropertySetRegistry( const OUString& URL ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& getInitArgs() const; @@ -138,31 +138,31 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPersistentPropertySet > SAL_CALL openPropertySet( const OUString& key, sal_Bool create ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removePropertySet( const OUString& key ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XElementAccess ( XNameAccess is derived from it ) virtual com::sun::star::uno::Type SAL_CALL getElementType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasElements() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XNameAccess virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Non-interface methods com::sun::star::uno::Reference< com::sun::star::uno::XInterface > @@ -216,21 +216,21 @@ public: // XComponent virtual void SAL_CALL dispose() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XPropertySet virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const com::sun::star::uno::Any& aValue ) @@ -238,57 +238,57 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XPersistentPropertySet virtual com::sun::star::uno::Reference< com::sun::star::ucb::XPropertySetRegistry > SAL_CALL getRegistry() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getKey() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XNamed virtual OUString SAL_CALL getName() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setName( const OUString& aName ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XPropertyContainer virtual void SAL_CALL @@ -298,28 +298,28 @@ public: throw( com::sun::star::beans::PropertyExistException, com::sun::star::beans::IllegalTypeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XPropertySetInfoChangeNotifier virtual void SAL_CALL addPropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removePropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XPropertyAccess virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValues( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& aProps ) @@ -327,7 +327,7 @@ public: com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // Non-interface methods. PropertySetRegistry& getPropertySetRegistry(); diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index c9546c1681e4..618f45a78fbd 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -132,7 +132,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( SortedDynamicResultSet, // XComponent methods. void SAL_CALL SortedDynamicResultSet::dispose() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -155,7 +155,7 @@ void SAL_CALL SortedDynamicResultSet::dispose() void SAL_CALL SortedDynamicResultSet::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -169,7 +169,7 @@ void SAL_CALL SortedDynamicResultSet::addEventListener( void SAL_CALL SortedDynamicResultSet::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -182,7 +182,7 @@ void SAL_CALL SortedDynamicResultSet::removeEventListener( Reference< XResultSet > SAL_CALL SortedDynamicResultSet::getStaticResultSet() - throw( ListenerAlreadySetException, RuntimeException ) + throw( ListenerAlreadySetException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -204,7 +204,7 @@ SortedDynamicResultSet::getStaticResultSet() void SAL_CALL SortedDynamicResultSet::setListener( const Reference< XDynamicResultSetListener >& Listener ) - throw( ListenerAlreadySetException, RuntimeException ) + throw( ListenerAlreadySetException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -226,7 +226,7 @@ SortedDynamicResultSet::connectToCache( throw( ListenerAlreadySetException, AlreadyInitializedException, ServiceNotFoundException, - RuntimeException ) + RuntimeException, std::exception ) { if( mxListener.is() ) throw ListenerAlreadySetException(); @@ -259,7 +259,7 @@ SortedDynamicResultSet::connectToCache( sal_Int16 SAL_CALL SortedDynamicResultSet::getCapabilities() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -515,7 +515,7 @@ SortedDynamicResultSetFactory::createSortedDynamicResultSet( const Reference< XDynamicResultSet > & Source, const Sequence< NumberedSortingInfo > & Info, const Reference< XAnyCompareFactory > & CompareFactory ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Reference< XDynamicResultSet > xRet; xRet = new SortedDynamicResultSet( Source, Info, CompareFactory, m_xContext ); @@ -580,7 +580,7 @@ XINTERFACE_IMPL_2( SortedDynamicResultSetListener, void SAL_CALL SortedDynamicResultSetListener::disposing( const EventObject& Source ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -593,7 +593,7 @@ SortedDynamicResultSetListener::disposing( const EventObject& Source ) void SAL_CALL SortedDynamicResultSetListener::notify( const ListEvent& Changes ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx index ae875e6d5454..a6c3d7e08041 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -106,37 +106,37 @@ public: // XComponent virtual void SAL_CALL - dispose() throw( css::uno::RuntimeException ); + dispose() throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); // XDynamicResultSet virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet( ) - throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException ); + throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) - throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException ); + throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) throw( css::ucb::ListenerAlreadySetException, css::ucb::AlreadyInitializedException, css::ucb::ServiceNotFoundException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual sal_Int16 SAL_CALL getCapabilities() - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); // own methods: @@ -173,14 +173,14 @@ public: virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); // XDynamicResultSetListener virtual void SAL_CALL notify( const css::ucb::ListEvent& Changes ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); // own methods: @@ -229,7 +229,7 @@ public: const css::uno::Reference< css::ucb::XDynamicResultSet > & Source, const css::uno::Sequence< css::ucb::NumberedSortingInfo > & Info, const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); }; #endif diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index fb2e0d61225d..e6616dba3e5c 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -111,11 +111,11 @@ public: // XPropertySetInfo virtual Sequence< Property > SAL_CALL getProperties() - throw( RuntimeException ); + throw( RuntimeException, std::exception ); virtual Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException ); + throw( UnknownPropertyException, RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); }; @@ -244,7 +244,7 @@ XSERVICEINFO_NOFACTORY_IMPL_1( SortedResultSet, // XComponent methods. void SAL_CALL SortedResultSet::dispose() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -276,7 +276,7 @@ void SAL_CALL SortedResultSet::dispose() void SAL_CALL SortedResultSet::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -290,7 +290,7 @@ void SAL_CALL SortedResultSet::addEventListener( void SAL_CALL SortedResultSet::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -304,7 +304,7 @@ void SAL_CALL SortedResultSet::removeEventListener( OUString SAL_CALL SortedResultSet::queryContentIdentifierString() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifierString(); @@ -313,7 +313,7 @@ SortedResultSet::queryContentIdentifierString() Reference< XContentIdentifier > SAL_CALL SortedResultSet::queryContentIdentifier() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifier(); @@ -322,7 +322,7 @@ SortedResultSet::queryContentIdentifier() Reference< XContent > SAL_CALL SortedResultSet::queryContent() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XContentAccess >::query(mxOriginal)->queryContent(); @@ -333,7 +333,7 @@ SortedResultSet::queryContent() // XResultSet methods. sal_Bool SAL_CALL SortedResultSet::next() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -356,7 +356,7 @@ sal_Bool SAL_CALL SortedResultSet::next() sal_Bool SAL_CALL SortedResultSet::isBeforeFirst() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { if ( mnCurEntry ) return sal_False; @@ -366,7 +366,7 @@ sal_Bool SAL_CALL SortedResultSet::isBeforeFirst() sal_Bool SAL_CALL SortedResultSet::isAfterLast() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { if ( mnCurEntry > mnCount ) return sal_True; @@ -376,7 +376,7 @@ sal_Bool SAL_CALL SortedResultSet::isAfterLast() sal_Bool SAL_CALL SortedResultSet::isFirst() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { if ( mnCurEntry == 1 ) return sal_True; @@ -386,7 +386,7 @@ sal_Bool SAL_CALL SortedResultSet::isFirst() sal_Bool SAL_CALL SortedResultSet::isLast() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { if ( mnCurEntry == mnCount ) return sal_True; @@ -396,7 +396,7 @@ sal_Bool SAL_CALL SortedResultSet::isLast() void SAL_CALL SortedResultSet::beforeFirst() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); mnCurEntry = 0; @@ -405,7 +405,7 @@ void SAL_CALL SortedResultSet::beforeFirst() void SAL_CALL SortedResultSet::afterLast() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); mnCurEntry = mnCount+1; @@ -414,7 +414,7 @@ void SAL_CALL SortedResultSet::afterLast() sal_Bool SAL_CALL SortedResultSet::first() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -433,7 +433,7 @@ sal_Bool SAL_CALL SortedResultSet::first() sal_Bool SAL_CALL SortedResultSet::last() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -452,7 +452,7 @@ sal_Bool SAL_CALL SortedResultSet::last() sal_Int32 SAL_CALL SortedResultSet::getRow() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { return mnCurEntry; } @@ -484,7 +484,7 @@ sal_Int32 SAL_CALL SortedResultSet::getRow() type is FORWARD_ONLY. */ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row ) - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -547,7 +547,7 @@ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row ) current row, or the result set type is FORWARD_ONLY. */ sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows ) - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -592,7 +592,7 @@ sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows ) is FORWARD_ONLY. */ sal_Bool SAL_CALL SortedResultSet::previous() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -614,7 +614,7 @@ sal_Bool SAL_CALL SortedResultSet::previous() void SAL_CALL SortedResultSet::refreshRow() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -628,7 +628,7 @@ void SAL_CALL SortedResultSet::refreshRow() sal_Bool SAL_CALL SortedResultSet::rowUpdated() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -642,7 +642,7 @@ sal_Bool SAL_CALL SortedResultSet::rowUpdated() sal_Bool SAL_CALL SortedResultSet::rowInserted() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -656,7 +656,7 @@ sal_Bool SAL_CALL SortedResultSet::rowInserted() sal_Bool SAL_CALL SortedResultSet::rowDeleted() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -670,7 +670,7 @@ sal_Bool SAL_CALL SortedResultSet::rowDeleted() Reference< XInterface > SAL_CALL SortedResultSet::getStatement() - throw ( SQLException, RuntimeException ) + throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -687,7 +687,7 @@ Reference< XInterface > SAL_CALL SortedResultSet::getStatement() sal_Bool SAL_CALL SortedResultSet::wasNull() - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->wasNull(); @@ -695,7 +695,7 @@ sal_Bool SAL_CALL SortedResultSet::wasNull() OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getString( columnIndex ); @@ -703,7 +703,7 @@ OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex ) sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getBoolean( columnIndex ); @@ -711,7 +711,7 @@ sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex ) sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getByte( columnIndex ); @@ -719,7 +719,7 @@ sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex ) sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getShort( columnIndex ); @@ -727,14 +727,14 @@ sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex ) sal_Int32 SAL_CALL SortedResultSet::getInt( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getInt( columnIndex ); } sal_Int64 SAL_CALL SortedResultSet::getLong( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getLong( columnIndex ); @@ -742,7 +742,7 @@ sal_Int64 SAL_CALL SortedResultSet::getLong( sal_Int32 columnIndex ) float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getFloat( columnIndex ); @@ -750,7 +750,7 @@ float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex ) double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getDouble( columnIndex ); @@ -758,7 +758,7 @@ double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex ) Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getBytes( columnIndex ); @@ -766,7 +766,7 @@ Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex ) Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getDate( columnIndex ); @@ -774,7 +774,7 @@ Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex ) Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getTime( columnIndex ); @@ -782,7 +782,7 @@ Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex ) DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getTimestamp( columnIndex ); @@ -791,7 +791,7 @@ DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex ) Reference< XInputStream > SAL_CALL SortedResultSet::getBinaryStream( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getBinaryStream( columnIndex ); @@ -800,7 +800,7 @@ SortedResultSet::getBinaryStream( sal_Int32 columnIndex ) Reference< XInputStream > SAL_CALL SortedResultSet::getCharacterStream( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getCharacterStream( columnIndex ); @@ -809,7 +809,7 @@ SortedResultSet::getCharacterStream( sal_Int32 columnIndex ) Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& typeMap ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getObject( columnIndex, @@ -818,7 +818,7 @@ Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex, Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getRef( columnIndex ); @@ -826,7 +826,7 @@ Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex ) Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getBlob( columnIndex ); @@ -834,7 +834,7 @@ Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex ) Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getClob( columnIndex ); @@ -842,7 +842,7 @@ Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex ) Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getArray( columnIndex ); @@ -854,7 +854,7 @@ Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex ) void SAL_CALL SortedResultSet::close() - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); Reference< XCloseable >::query(mxOriginal)->close(); @@ -865,7 +865,7 @@ void SAL_CALL SortedResultSet::close() Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData() - throw( SQLException, RuntimeException ) + throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XResultSetMetaDataSupplier >::query(mxOriginal)->getMetaData(); @@ -877,7 +877,7 @@ Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData() Reference< XPropertySetInfo > SAL_CALL -SortedResultSet::getPropertySetInfo() throw( RuntimeException ) +SortedResultSet::getPropertySetInfo() throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -898,7 +898,7 @@ void SAL_CALL SortedResultSet::setPropertyValue( PropertyVetoException, IllegalArgumentException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -913,7 +913,7 @@ void SAL_CALL SortedResultSet::setPropertyValue( Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -956,7 +956,7 @@ void SAL_CALL SortedResultSet::addPropertyChangeListener( const Reference< XPropertyChangeListener >& Listener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -973,7 +973,7 @@ void SAL_CALL SortedResultSet::removePropertyChangeListener( const Reference< XPropertyChangeListener >& Listener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -987,7 +987,7 @@ void SAL_CALL SortedResultSet::addVetoableChangeListener( const Reference< XVetoableChangeListener >& Listener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -1004,7 +1004,7 @@ void SAL_CALL SortedResultSet::removeVetoableChangeListener( const Reference< XVetoableChangeListener >& Listener ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -2033,7 +2033,7 @@ XTYPEPROVIDER_IMPL_2( SRSPropertySetInfo, // XPropertySetInfo methods. Sequence< Property > SAL_CALL -SRSPropertySetInfo::getProperties() throw( RuntimeException ) +SRSPropertySetInfo::getProperties() throw( RuntimeException, std::exception ) { return Sequence < Property > ( maProps, 2 ); } @@ -2041,7 +2041,7 @@ SRSPropertySetInfo::getProperties() throw( RuntimeException ) Property SAL_CALL SRSPropertySetInfo::getPropertyByName( const OUString& Name ) - throw( UnknownPropertyException, RuntimeException ) + throw( UnknownPropertyException, RuntimeException, std::exception ) { if ( Name.equalsAscii( "RowCount" ) ) return maProps[0]; @@ -2054,7 +2054,7 @@ SRSPropertySetInfo::getPropertyByName( const OUString& Name ) sal_Bool SAL_CALL SRSPropertySetInfo::hasPropertyByName( const OUString& Name ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if ( Name.equalsAscii( "RowCount" ) ) return sal_True; diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index 683fad9a538b..49160502dac9 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/ucb/source/sorter/sortresult.hxx @@ -202,186 +202,186 @@ public: // XComponent virtual void SAL_CALL - dispose() throw( css::uno::RuntimeException ); + dispose() throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString() - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier() - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent() - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); // XResultSet virtual sal_Bool SAL_CALL next() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isBeforeFirst() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isAfterLast() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isFirst() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isLast() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL beforeFirst() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL afterLast() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL first() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL last() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL getRow() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL previous() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual void SAL_CALL refreshRow() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL rowUpdated() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL rowInserted() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL rowDeleted() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); // XRow virtual sal_Bool SAL_CALL - wasNull() throw( css::sdbc::SQLException, css::uno::RuntimeException ); + wasNull() throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); 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 ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); // XCloseable virtual void SAL_CALL close() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); // XResultSetMetaDataSupplier virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData() - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( css::uno::RuntimeException ); + throw( css::uno::RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValue( const OUString& PropertyName, @@ -390,13 +390,13 @@ public: css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL addPropertyChangeListener( const OUString& PropertyName, @@ -404,7 +404,7 @@ public: css::beans::XPropertyChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL removePropertyChangeListener( const OUString& PropertyName, @@ -412,7 +412,7 @@ public: css::beans::XPropertyChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, @@ -420,7 +420,7 @@ public: css::beans::XVetoableChangeListener >& Listener ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, @@ -428,7 +428,7 @@ public: css::beans::XVetoableChangeListener >& aListener ) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException ); + css::uno::RuntimeException, std::exception ); }; #endif diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 15d7b5c8f4d9..0d909412869d 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -1577,26 +1577,26 @@ namespace cmis ContentImplHelper::release(); } - uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException ) + uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< ucb::XContentCreator * >( this ) ); return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface(rType); } - OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.CmisContent"); } uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = "com.sun.star.ucb.CmisContent"; return aSNS; } - OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) + OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) { return isFolder( uno::Reference< ucb::XCommandEnvironment >() ) ? OUString(CMIS_FOLDER_TYPE) @@ -1607,7 +1607,7 @@ namespace cmis const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException ) + throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.cmis", "Content::execute( ) - " << aCommand.Name ); uno::Any aRet; @@ -1732,20 +1732,20 @@ namespace cmis return aRet; } - void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException ) + void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.cmis", "TODO - Content::abort()" ); // TODO Implement me } uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return queryCreatableContentsInfo( uno::Reference< ucb::XCommandEnvironment >() ); } uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( - const ucb::ContentInfo& Info ) throw( uno::RuntimeException ) + const ucb::ContentInfo& Info ) throw( uno::RuntimeException, std::exception ) { bool create_document; @@ -1775,7 +1775,7 @@ namespace cmis } } - uno::Sequence< uno::Type > SAL_CALL Content::getTypes() throw( uno::RuntimeException ) + uno::Sequence< uno::Type > SAL_CALL Content::getTypes() throw( uno::RuntimeException, std::exception ) { if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) ) { diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 46f4578624ce..1fee368f3805 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -163,32 +163,32 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL execute( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > queryCreatableContentsInfo( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index dbf49d75f8f1..9c3b2c48b9af 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -27,7 +27,7 @@ ContentProvider::queryContent( const uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx index 86a033619836..fd23cac0c2df 100644 --- a/ucb/source/ucp/cmis/cmis_provider.hxx +++ b/ucb/source/ucp/cmis/cmis_provider.hxx @@ -42,7 +42,7 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); libcmis::Session* getSession( const OUString& sBindingUrl ); void registerSession( const OUString& sBindingUrl, libcmis::Session* pSession ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 26c2f2652477..116c4b270e96 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -284,25 +284,25 @@ namespace cmis ContentImplHelper::release(); } - uno::Any SAL_CALL RepoContent::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException ) + uno::Any SAL_CALL RepoContent::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception ) { return ContentImplHelper::queryInterface(rType); } - OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.CmisRepoContent"); } uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = "com.sun.star.ucb.Content"; return aSNS; } - OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException ) + OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException, std::exception ) { return OUString( CMIS_REPO_TYPE ); } @@ -311,7 +311,7 @@ namespace cmis const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException ) + throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.cmis", "RepoContent::execute( ) - " << aCommand.Name ); @@ -348,13 +348,13 @@ namespace cmis return aRet; } - void SAL_CALL RepoContent::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException ) + void SAL_CALL RepoContent::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.cmis", "TODO - RepoContent::abort()" ); // TODO Implement me } - uno::Sequence< uno::Type > SAL_CALL RepoContent::getTypes() throw( uno::RuntimeException ) + uno::Sequence< uno::Type > SAL_CALL RepoContent::getTypes() throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection aFolderCollection (CPPU_TYPE_REF( lang::XTypeProvider ), diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx index 7c7061243c1a..68118e44336a 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -98,24 +98,24 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL execute( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual std::list< com::sun::star::uno::Reference< com::sun::star::ucb::XContent > > getChildren( ); }; diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 5bdbcce7e6c5..3b335b4ff9bb 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -73,20 +73,20 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); // XContentProvider virtual uno::Reference< ucb::XContent > SAL_CALL queryContent( uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) - throw (ucb::IllegalIdentifierException, uno::RuntimeException); + throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL compareContentIds( uno::Reference< ucb::XContentIdentifier > const & xId1, uno::Reference< ucb::XContentIdentifier > const & xId2 ) - throw (uno::RuntimeException); + throw (uno::RuntimeException, std::exception); }; @@ -142,7 +142,7 @@ static uno::Sequence< OUString > SAL_CALL supportedServices() // XServiceInfo OUString ExpandContentProviderImpl::getImplementationName() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { check(); return implName(); @@ -150,14 +150,14 @@ OUString ExpandContentProviderImpl::getImplementationName() uno::Sequence< OUString > ExpandContentProviderImpl::getSupportedServiceNames() - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { check(); return supportedServices(); } sal_Bool ExpandContentProviderImpl::supportsService(OUString const & serviceName ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } @@ -186,7 +186,7 @@ OUString ExpandContentProviderImpl::expandUri( uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent( uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) - throw (ucb::IllegalIdentifierException, uno::RuntimeException) + throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception) { check(); OUString uri( expandUri( xIdentifier ) ); @@ -208,7 +208,7 @@ uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent( sal_Int32 ExpandContentProviderImpl::compareContentIds( uno::Reference< ucb::XContentIdentifier > const & xId1, uno::Reference< ucb::XContentIdentifier > const & xId2 ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { check(); try diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index b0f3fa5133ff..081ee0627b93 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -175,13 +175,13 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL Content::getImplementationName() throw( RuntimeException ) + OUString SAL_CALL Content::getImplementationName() throw( RuntimeException, std::exception ) { return OUString( "org.openoffice.comp.ucp.ext.Content" ); } - Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) + Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aServiceNames(2); aServiceNames[0] = "com.sun.star.ucb.Content"; @@ -190,7 +190,7 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL Content::getContentType() throw( RuntimeException ) + OUString SAL_CALL Content::getContentType() throw( RuntimeException, std::exception ) { impl_determineContentType(); return *m_aContentType; @@ -198,7 +198,7 @@ namespace ucb { namespace ucp { namespace ext Any SAL_CALL Content::execute( const Command& aCommand, sal_Int32 /* CommandId */, const Reference< XCommandEnvironment >& i_rEvironment ) - throw( Exception, CommandAbortedException, RuntimeException ) + throw( Exception, CommandAbortedException, RuntimeException, std::exception ) { Any aRet; @@ -289,7 +289,7 @@ namespace ucb { namespace ucp { namespace ext } - void SAL_CALL Content::abort( sal_Int32 ) throw( RuntimeException ) + void SAL_CALL Content::abort( sal_Int32 ) throw( RuntimeException, std::exception ) { } diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index 9fbea8a55833..50f55307c6d6 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -90,11 +90,11 @@ namespace ucb { namespace ucp { namespace ext virtual ~Content(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XContent - virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -105,14 +105,14 @@ namespace ucb { namespace ucp { namespace ext ) throw ( ::com::sun::star::uno::Exception , ::com::sun::star::ucb::CommandAbortedException - , ::com::sun::star::uno::RuntimeException + , ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw ( ::com::sun::star::uno::RuntimeException + throw ( ::com::sun::star::uno::RuntimeException, std::exception ); private: diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 13413dd8d9b8..eb253161b406 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -68,7 +68,7 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException) + OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException, std::exception) { return getImplementationName_static(); } @@ -83,7 +83,7 @@ namespace ucb { namespace ucp { namespace ext } - Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException, std::exception) { return getSupportedServiceNames_static(); } @@ -120,7 +120,7 @@ namespace ucb { namespace ucp { namespace ext Reference< XContent > SAL_CALL ContentProvider::queryContent( const Reference< XContentIdentifier >& i_rIdentifier ) - throw( IllegalIdentifierException, RuntimeException ) + throw( IllegalIdentifierException, RuntimeException, std::exception ) { // Check URL scheme... const OUString sScheme( "vnd.sun.star.extension" ); diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index 6483ac68bac9..98a397a26aa6 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -38,8 +38,8 @@ namespace ucb { namespace ucp { namespace ext virtual ~ContentProvider(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - static versions static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); @@ -47,7 +47,7 @@ namespace ucb { namespace ucp { namespace ext static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); // XContentProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException, std::exception); public: static OUString getRootURL(); diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index e5b92482203e..06ea3a994bb5 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -156,7 +156,7 @@ BaseContent::release( void ) Any SAL_CALL BaseContent::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< lang::XComponent* >(this)), @@ -181,7 +181,7 @@ BaseContent::queryInterface( const Type& rType ) void SAL_CALL BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -195,7 +195,7 @@ BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener void SAL_CALL BaseContent::removeEventListener( const Reference< lang::XEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -206,7 +206,7 @@ BaseContent::removeEventListener( const Reference< lang::XEventListener >& Liste void SAL_CALL BaseContent::dispose() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { lang::EventObject aEvt; cppu::OInterfaceContainerHelper* pDisposeEventListeners; @@ -259,7 +259,7 @@ BaseContent::dispose() OUString SAL_CALL BaseContent::getImplementationName() - throw( RuntimeException) + throw( RuntimeException, std::exception) { return OUString("com.sun.star.comp.ucb.FileContent"); } @@ -268,7 +268,7 @@ BaseContent::getImplementationName() sal_Bool SAL_CALL BaseContent::supportsService( const OUString& ServiceName ) - throw( RuntimeException) + throw( RuntimeException, std::exception) { if ( ServiceName == "com.sun.star.ucb.FileContent" ) return true; @@ -280,7 +280,7 @@ BaseContent::supportsService( const OUString& ServiceName ) Sequence< OUString > SAL_CALL BaseContent::getSupportedServiceNames() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Sequence< OUString > ret( 1 ); ret[0] = "com.sun.star.ucb.FileContent"; @@ -312,7 +312,7 @@ XTYPEPROVIDER_IMPL_10( BaseContent, sal_Int32 SAL_CALL BaseContent::createCommandIdentifier( void ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return m_pMyShell->getCommandId(); } @@ -320,7 +320,7 @@ BaseContent::createCommandIdentifier( void ) void SAL_CALL BaseContent::abort( sal_Int32 CommandId ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { m_pMyShell->abort( CommandId ); } @@ -332,7 +332,7 @@ BaseContent::execute( const Command& aCommand, const Reference< XCommandEnvironment >& Environment ) throw( Exception, CommandAbortedException, - RuntimeException ) + RuntimeException, std::exception ) { if( ! CommandId ) // A Command with commandid zero cannot be aborted @@ -450,7 +450,7 @@ void SAL_CALL BaseContent::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( ! Listener.is() ) return; @@ -476,7 +476,7 @@ BaseContent::addPropertiesChangeListener( void SAL_CALL BaseContent::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( ! Listener.is() ) return; @@ -499,7 +499,7 @@ BaseContent::removePropertiesChangeListener( const Sequence< OUString >& Propert Reference< ucb::XContentIdentifier > SAL_CALL BaseContent::getIdentifier() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return m_xContentIdentifier; } @@ -507,7 +507,7 @@ BaseContent::getIdentifier() OUString SAL_CALL BaseContent::getContentType() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { if( !( m_nState & Deleted ) ) { @@ -558,7 +558,7 @@ BaseContent::getContentType() void SAL_CALL BaseContent::addContentEventListener( const Reference< XContentEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -574,7 +574,7 @@ BaseContent::addContentEventListener( void SAL_CALL BaseContent::removeContentEventListener( const Reference< XContentEventListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -597,7 +597,7 @@ BaseContent::addProperty( throw( beans::PropertyExistException, beans::IllegalTypeException, lang::IllegalArgumentException, - RuntimeException) + RuntimeException, std::exception) { if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name.isEmpty() ) { @@ -613,7 +613,7 @@ BaseContent::removeProperty( const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, - RuntimeException) + RuntimeException, std::exception) { if( m_nState & Deleted ) @@ -629,7 +629,7 @@ BaseContent::removeProperty( Sequence< ContentInfo > SAL_CALL BaseContent::queryCreatableContentsInfo( void ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return m_pMyShell->queryCreatableContentsInfo(); } @@ -638,7 +638,7 @@ BaseContent::queryCreatableContentsInfo( Reference< XContent > SAL_CALL BaseContent::createNewContent( const ContentInfo& Info ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // Check type. if ( Info.Type.isEmpty() ) @@ -704,7 +704,7 @@ BaseContent::createNewContent( void SAL_CALL BaseContent::addPropertySetInfoChangeListener( const Reference< beans::XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); if( ! m_pPropertySetInfoChangeListeners ) @@ -717,7 +717,7 @@ BaseContent::addPropertySetInfoChangeListener( void SAL_CALL BaseContent::removePropertySetInfoChangeListener( const Reference< beans::XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -733,7 +733,7 @@ BaseContent::removePropertySetInfoChangeListener( Reference< XInterface > SAL_CALL BaseContent::getParent( void ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUString ParentUnq = getParentName( m_aUncPath ); OUString ParentUrl; @@ -761,7 +761,7 @@ void SAL_CALL BaseContent::setParent( const Reference< XInterface >& ) throw( lang::NoSupportException, - RuntimeException) + RuntimeException, std::exception) { throw lang::NoSupportException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >() ); } diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 73aa5cdb278d..39f65ed292ff 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -90,7 +90,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -107,16 +107,16 @@ namespace fileaccess { virtual void SAL_CALL dispose( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XTypeProvider @@ -127,22 +127,22 @@ namespace fileaccess { // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor virtual sal_Int32 SAL_CALL createCommandIdentifier( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL execute( @@ -151,34 +151,34 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XContent virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getContentType( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addContentEventListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeContentEventListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentEventListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XPropertiesChangeNotifier @@ -187,13 +187,13 @@ namespace fileaccess { const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removePropertiesChangeListener( const com::sun::star::uno::Sequence< OUString >& PropertyNames, const com::sun::star::uno::Reference< com::sun::star::beans::XPropertiesChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XPropertyContainer @@ -205,14 +205,14 @@ namespace fileaccess { throw( com::sun::star::beans::PropertyExistException, com::sun::star::beans::IllegalTypeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XPropertySetInfoChangeNotifier @@ -220,13 +220,13 @@ namespace fileaccess { addPropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removePropertySetInfoChangeListener( const com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfoChangeListener >& Listener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XContentCreator @@ -234,24 +234,24 @@ namespace fileaccess { virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XChild virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getParent( - void ) throw( com::sun::star::uno::RuntimeException ); + void ) throw( com::sun::star::uno::RuntimeException, std::exception ); // Not supported virtual void SAL_CALL setParent( const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& Parent ) throw( com::sun::star::lang::NoSupportException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); // Notifier diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index 467d31ed0584..90227091f7f1 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -64,7 +64,7 @@ XCommandInfo_impl::release( uno::Any SAL_CALL XCommandInfo_impl::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< XCommandInfo* >(this)) ); @@ -75,7 +75,7 @@ XCommandInfo_impl::queryInterface( uno::Sequence< CommandInfo > SAL_CALL XCommandInfo_impl::getCommands( void ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_pMyShell->m_sCommandInfo; } @@ -85,7 +85,7 @@ CommandInfo SAL_CALL XCommandInfo_impl::getCommandInfoByName( const OUString& aName ) throw( UnsupportedCommandException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); i++ ) if( m_pMyShell->m_sCommandInfo[i].Name == aName ) @@ -99,7 +99,7 @@ CommandInfo SAL_CALL XCommandInfo_impl::getCommandInfoByHandle( sal_Int32 Handle ) throw( UnsupportedCommandException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i ) if( m_pMyShell->m_sCommandInfo[i].Handle == Handle ) @@ -112,7 +112,7 @@ XCommandInfo_impl::getCommandInfoByHandle( sal_Bool SAL_CALL XCommandInfo_impl::hasCommandByName( const OUString& aName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i ) if( m_pMyShell->m_sCommandInfo[i].Name == aName ) @@ -125,7 +125,7 @@ XCommandInfo_impl::hasCommandByName( sal_Bool SAL_CALL XCommandInfo_impl::hasCommandByHandle( sal_Int32 Handle ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i ) if( m_pMyShell->m_sCommandInfo[i].Handle == Handle ) diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx index 52df9ab8b7c9..5ea01552c22b 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -47,7 +47,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -64,29 +64,29 @@ namespace fileaccess { virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > SAL_CALL getCommands( void ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::ucb::CommandInfo SAL_CALL getCommandInfoByName( const OUString& Name ) throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::ucb::CommandInfo SAL_CALL getCommandInfoByHandle( sal_Int32 Handle ) throw( com::sun::star::ucb::UnsupportedCommandException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx index 75c9f3c83826..0fb38f5d52ac 100644 --- a/ucb/source/ucp/file/filid.cxx +++ b/ucb/source/ucp/file/filid.cxx @@ -71,7 +71,7 @@ FileContentIdentifier::release( uno::Any SAL_CALL FileContentIdentifier::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -82,7 +82,7 @@ FileContentIdentifier::queryInterface( uno::Sequence< sal_Int8 > SAL_CALL FileContentIdentifier::getImplementationId() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { static cppu::OImplementationId* pId = NULL; if ( !pId ) @@ -101,7 +101,7 @@ FileContentIdentifier::getImplementationId() uno::Sequence< uno::Type > SAL_CALL FileContentIdentifier::getTypes( void ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = NULL; if ( !pCollection ) { @@ -122,7 +122,7 @@ OUString SAL_CALL FileContentIdentifier::getContentIdentifier( void ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aContentId; } @@ -131,7 +131,7 @@ FileContentIdentifier::getContentIdentifier( OUString SAL_CALL FileContentIdentifier::getContentProviderScheme( void ) - throw( uno::RuntimeException ) + 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 febe3e61a609..43fd1c50fe8b 100644 --- a/ucb/source/ucp/file/filid.hxx +++ b/ucb/source/ucp/file/filid.hxx @@ -46,7 +46,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire( @@ -62,23 +62,23 @@ namespace fileaccess { virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XContentIdentifier virtual OUString SAL_CALL getContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getContentProviderScheme( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: shell* m_pMyShell; diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 568909a7d323..376bbe99d42c 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -101,7 +101,7 @@ XTYPEPROVIDER_IMPL_3( XInputStream_impl, uno::Any SAL_CALL XInputStream_impl::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< io::XInputStream* >(this)), @@ -137,7 +137,7 @@ XInputStream_impl::readBytes( throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( ! m_nIsOpen ) throw io::IOException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >() ); @@ -165,7 +165,7 @@ XInputStream_impl::readSomeBytes( throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return readBytes( aData,nMaxBytesToRead ); } @@ -177,7 +177,7 @@ XInputStream_impl::skipBytes( throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) ); } @@ -188,7 +188,7 @@ XInputStream_impl::available( void ) throw( io::NotConnectedException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return 0; } @@ -199,7 +199,7 @@ XInputStream_impl::closeInput( void ) throw( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if( m_nIsOpen ) { @@ -216,7 +216,7 @@ XInputStream_impl::seek( sal_Int64 location ) throw( lang::IllegalArgumentException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if( location < 0 ) throw lang::IllegalArgumentException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), 0 ); @@ -229,7 +229,7 @@ sal_Int64 SAL_CALL XInputStream_impl::getPosition( void ) throw( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { sal_uInt64 uPos; if( osl::FileBase::E_None != m_aFile.getPos( uPos ) ) @@ -241,7 +241,7 @@ sal_Int64 SAL_CALL XInputStream_impl::getLength( void ) throw( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { sal_uInt64 uEndPos; if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx index 55514b68c8fb..1af95bb59c1b 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -64,7 +64,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -83,7 +83,7 @@ namespace fileaccess { throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL readSomeBytes( @@ -92,7 +92,7 @@ namespace fileaccess { throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes( @@ -100,40 +100,40 @@ namespace fileaccess { throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL available( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL closeInput( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL seek( sal_Int64 location ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getPosition( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getLength( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); private: diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index 8809360d3e39..4ae082618aa4 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -58,7 +58,7 @@ XInteractionSupplyNameImpl::release( void ) Any SAL_CALL XInteractionSupplyNameImpl::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -97,7 +97,7 @@ XInteractionAbortImpl::release( void ) Any SAL_CALL XInteractionAbortImpl::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -155,7 +155,7 @@ XInteractionRequestImpl::release( void ) Any SAL_CALL XInteractionRequestImpl::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( @@ -177,7 +177,7 @@ XTYPEPROVIDER_IMPL_2( XInteractionRequestImpl, Any SAL_CALL XInteractionRequestImpl::getRequest() - throw(RuntimeException) + throw(RuntimeException, std::exception) { Any aAny; if(m_nErrorCode == TASKHANDLING_FOLDER_EXISTS_MKDIR) diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index fb00e5ff22ec..a3cc8d93e132 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -52,7 +52,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -71,13 +71,13 @@ namespace fileaccess { virtual void SAL_CALL select() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { m_bSelected = true; } void SAL_CALL setName(const OUString& Name) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { m_aNewName = Name; } @@ -115,7 +115,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -134,7 +134,7 @@ namespace fileaccess { virtual void SAL_CALL select() - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { m_bSelected = true; } @@ -169,7 +169,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -187,13 +187,13 @@ namespace fileaccess { XTYPEPROVIDER_DECL() ::com::sun::star::uno::Any SAL_CALL getRequest( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations( ) - throw (::com::sun::star::uno::RuntimeException) + throw (::com::sun::star::uno::RuntimeException, std::exception) { return m_aSeq; } diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index cf8461c21e59..6987c80e0bd3 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -102,7 +102,7 @@ XTYPEPROVIDER_IMPL_2( XPropertySetInfo_impl, Any SAL_CALL XPropertySetInfo_impl::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -115,7 +115,7 @@ beans::Property SAL_CALL XPropertySetInfo_impl::getPropertyByName( const OUString& aName ) throw( beans::UnknownPropertyException, - RuntimeException) + RuntimeException, std::exception) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) return m_seq[i]; @@ -128,7 +128,7 @@ XPropertySetInfo_impl::getPropertyByName( Sequence< beans::Property > SAL_CALL XPropertySetInfo_impl::getProperties( void ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return m_seq; } @@ -137,7 +137,7 @@ XPropertySetInfo_impl::getProperties( sal_Bool SAL_CALL XPropertySetInfo_impl::hasPropertyByName( const OUString& aName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) return true; diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx index fca4ce9a5921..63540854b796 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -45,7 +45,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -65,17 +65,17 @@ namespace fileaccess { virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > SAL_CALL getProperties( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: shell* m_pMyShell; diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index 8cb010223ec7..b91525cde3ca 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -108,7 +108,7 @@ XRow_impl::release( uno::Any SAL_CALL XRow_impl::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -126,7 +126,7 @@ sal_Bool SAL_CALL XRow_impl::wasNull( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return m_nWasNull; } @@ -136,7 +136,7 @@ OUString SAL_CALL XRow_impl::getString( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -150,7 +150,7 @@ sal_Bool SAL_CALL XRow_impl::getBoolean( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -165,7 +165,7 @@ sal_Int8 SAL_CALL XRow_impl::getByte( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -179,7 +179,7 @@ sal_Int16 SAL_CALL XRow_impl::getShort( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -194,7 +194,7 @@ sal_Int32 SAL_CALL XRow_impl::getInt( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -208,7 +208,7 @@ sal_Int64 SAL_CALL XRow_impl::getLong( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -222,7 +222,7 @@ float SAL_CALL XRow_impl::getFloat( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -236,7 +236,7 @@ double SAL_CALL XRow_impl::getDouble( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -250,7 +250,7 @@ uno::Sequence< sal_Int8 > SAL_CALL XRow_impl::getBytes( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -264,7 +264,7 @@ util::Date SAL_CALL XRow_impl::getDate( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -278,7 +278,7 @@ util::Time SAL_CALL XRow_impl::getTime( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -292,7 +292,7 @@ util::DateTime SAL_CALL XRow_impl::getTimestamp( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -307,7 +307,7 @@ uno::Reference< io::XInputStream > SAL_CALL XRow_impl::getBinaryStream( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -322,7 +322,7 @@ uno::Reference< io::XInputStream > SAL_CALL XRow_impl::getCharacterStream( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -338,7 +338,7 @@ XRow_impl::getObject( sal_Int32 columnIndex, const uno::Reference< container::XNameAccess >& ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -352,7 +352,7 @@ uno::Reference< sdbc::XRef > SAL_CALL XRow_impl::getRef( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -369,7 +369,7 @@ uno::Reference< sdbc::XBlob > SAL_CALL XRow_impl::getBlob( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -386,7 +386,7 @@ uno::Reference< sdbc::XClob > SAL_CALL XRow_impl::getClob( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -404,7 +404,7 @@ uno::Reference< sdbc::XArray > SAL_CALL XRow_impl::getArray( sal_Int32 columnIndex ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx index d5b4ba093f37..e7de455589df 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -44,7 +44,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -64,123 +64,123 @@ namespace fileaccess { wasNull( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); private: osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index ae0878958279..952b0abec57d 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -128,7 +128,7 @@ XResultSet_impl::release( uno::Any SAL_CALL XResultSet_impl::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, @@ -148,7 +148,7 @@ XResultSet_impl::queryInterface( void SAL_CALL XResultSet_impl::disposing( const lang::EventObject& ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { // To do, but what } @@ -170,7 +170,7 @@ XTYPEPROVIDER_IMPL_10( XResultSet_impl, void SAL_CALL XResultSet_impl::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -185,7 +185,7 @@ XResultSet_impl::addEventListener( void SAL_CALL XResultSet_impl::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -197,7 +197,7 @@ XResultSet_impl::removeEventListener( void SAL_CALL XResultSet_impl::dispose() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -359,7 +359,7 @@ sal_Bool SAL_CALL XResultSet_impl::next( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { sal_Bool test; if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) test = true; @@ -373,7 +373,7 @@ sal_Bool SAL_CALL XResultSet_impl::isBeforeFirst( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_nRow == -1; } @@ -383,7 +383,7 @@ sal_Bool SAL_CALL XResultSet_impl::isAfterLast( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()); // Cannot happen, if m_aFolder.isOpen() } @@ -393,7 +393,7 @@ sal_Bool SAL_CALL XResultSet_impl::isFirst( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_nRow == 0; } @@ -403,7 +403,7 @@ sal_Bool SAL_CALL XResultSet_impl::isLast( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( m_nRow == sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1 ) return ! OneMore(); @@ -416,7 +416,7 @@ void SAL_CALL XResultSet_impl::beforeFirst( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_nRow = -1; } @@ -426,7 +426,7 @@ void SAL_CALL XResultSet_impl::afterLast( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size()); while( OneMore() ) @@ -438,7 +438,7 @@ sal_Bool SAL_CALL XResultSet_impl::first( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_nRow = -1; return next(); @@ -449,7 +449,7 @@ sal_Bool SAL_CALL XResultSet_impl::last( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1; while( OneMore() ) @@ -462,7 +462,7 @@ sal_Int32 SAL_CALL XResultSet_impl::getRow( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { // Test, whether behind last row if( -1 == m_nRow || m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -474,7 +474,7 @@ XResultSet_impl::getRow( sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row ) - throw( sdbc::SQLException, uno::RuntimeException) + throw( sdbc::SQLException, uno::RuntimeException, std::exception) { if( row >= 0 ) { @@ -501,7 +501,7 @@ sal_Bool SAL_CALL XResultSet_impl::relative( sal_Int32 row ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( isAfterLast() || isBeforeFirst() ) throw sdbc::SQLException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -519,7 +519,7 @@ sal_Bool SAL_CALL XResultSet_impl::previous( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( m_nRow > sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size()); // Correct Handling of afterLast @@ -533,7 +533,7 @@ void SAL_CALL XResultSet_impl::refreshRow( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { // get the row from the filesystem return; @@ -544,7 +544,7 @@ sal_Bool SAL_CALL XResultSet_impl::rowUpdated( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return false; } @@ -553,7 +553,7 @@ sal_Bool SAL_CALL XResultSet_impl::rowInserted( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return false; } @@ -562,7 +562,7 @@ sal_Bool SAL_CALL XResultSet_impl::rowDeleted( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return false; } @@ -572,7 +572,7 @@ uno::Reference< uno::XInterface > SAL_CALL XResultSet_impl::getStatement( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return uno::Reference< uno::XInterface >(); } @@ -584,7 +584,7 @@ void SAL_CALL XResultSet_impl::close( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( m_nIsOpen ) { @@ -600,7 +600,7 @@ XResultSet_impl::close( OUString SAL_CALL XResultSet_impl::queryContentIdentifierString( void ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Reference< ucb::XContentIdentifier > xContentId = queryContentIdentifier(); @@ -615,7 +615,7 @@ XResultSet_impl::queryContentIdentifierString( uno::Reference< ucb::XContentIdentifier > SAL_CALL XResultSet_impl::queryContentIdentifier( void ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) { @@ -635,7 +635,7 @@ XResultSet_impl::queryContentIdentifier( uno::Reference< ucb::XContent > SAL_CALL XResultSet_impl::queryContent( void ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_pMyShell->m_pProvider->queryContent( queryContentIdentifier() ); @@ -651,7 +651,7 @@ XResultSet_impl::queryContent( uno::Reference< sdbc::XResultSet > SAL_CALL XResultSet_impl::getStaticResultSet() throw( ucb::ListenerAlreadySetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -667,7 +667,7 @@ void SAL_CALL XResultSet_impl::setListener( const uno::Reference< ucb::XDynamicResultSetListener >& Listener ) throw( ucb::ListenerAlreadySetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -709,7 +709,7 @@ XResultSet_impl::connectToCache( throw( ucb::ListenerAlreadySetException, ucb::AlreadyInitializedException, ucb::ServiceNotFoundException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if( m_xListener.is() ) throw ucb::ListenerAlreadySetException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >() ); @@ -745,7 +745,7 @@ XResultSet_impl::connectToCache( // virtual sal_Int16 SAL_CALL XResultSet_impl::getCapabilities() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { // Never set ucb::ContentResultSetCapability::SORTED // - Underlying content cannot provide sorted data... @@ -757,7 +757,7 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL XResultSet_impl::getMetaData( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_sProperty.getLength(); ++n ) { @@ -790,7 +790,7 @@ XResultSet_impl::getMetaData( // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL XResultSet_impl::getPropertySetInfo() - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > seq(2); @@ -817,7 +817,7 @@ void SAL_CALL XResultSet_impl::setPropertyValue( beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" || aPropertyName == "RowCount" ) @@ -830,7 +830,7 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue( const OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( PropertyName == "IsRowCountFinal" ) { @@ -855,7 +855,7 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" ) { @@ -884,7 +884,7 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" && m_pIsFinalListeners ) @@ -908,7 +908,7 @@ void SAL_CALL XResultSet_impl::addVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { } @@ -918,7 +918,7 @@ void SAL_CALL XResultSet_impl::removeVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { } diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index 67519c0ce666..9543e3108c1e 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -106,7 +106,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -128,22 +128,22 @@ namespace fileaccess { virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& Source ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XComponent virtual void SAL_CALL dispose( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XRow @@ -151,7 +151,7 @@ namespace fileaccess { wasNull( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -164,7 +164,7 @@ namespace fileaccess { getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getString( columnIndex ); @@ -176,7 +176,7 @@ namespace fileaccess { getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -188,7 +188,7 @@ namespace fileaccess { getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -201,7 +201,7 @@ namespace fileaccess { sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -213,7 +213,7 @@ namespace fileaccess { getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -225,7 +225,7 @@ namespace fileaccess { getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -237,7 +237,7 @@ namespace fileaccess { getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -249,7 +249,7 @@ namespace fileaccess { getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -261,7 +261,7 @@ namespace fileaccess { getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); @@ -273,7 +273,7 @@ namespace fileaccess { getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); @@ -285,7 +285,7 @@ namespace fileaccess { getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); @@ -297,7 +297,7 @@ namespace fileaccess { getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); @@ -309,7 +309,7 @@ namespace fileaccess { getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); @@ -321,7 +321,7 @@ namespace fileaccess { getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); @@ -334,7 +334,7 @@ namespace fileaccess { sal_Int32 columnIndex, const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); @@ -346,7 +346,7 @@ namespace fileaccess { getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); @@ -358,7 +358,7 @@ namespace fileaccess { getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); @@ -370,7 +370,7 @@ namespace fileaccess { getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); @@ -382,7 +382,7 @@ namespace fileaccess { getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); @@ -397,110 +397,110 @@ namespace fileaccess { next( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isBeforeFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAfterLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL beforeFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL afterLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL first( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL last( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getRow( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL previous( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL refreshRow( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL rowUpdated( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL rowInserted( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL rowDeleted( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL getStatement( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); // XDynamicResultSet @@ -509,25 +509,25 @@ namespace fileaccess { getStaticResultSet( void ) throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setListener( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSetListener >& Listener ) throw( com::sun::star::ucb::ListenerAlreadySetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL connectToCache( const com::sun::star::uno::Reference< com::sun::star::ucb::XDynamicResultSet > & xCache ) throw( com::sun::star::ucb::ListenerAlreadySetException, com::sun::star::ucb::AlreadyInitializedException, com::sun::star::ucb::ServiceNotFoundException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int16 SAL_CALL getCapabilities() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCloseable @@ -536,37 +536,37 @@ namespace fileaccess { close( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL queryContent( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XResultSetMetaDataSupplier virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, @@ -575,14 +575,14 @@ namespace fileaccess { com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( @@ -590,7 +590,7 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertyChangeListener( @@ -598,7 +598,7 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addVetoableChangeListener( @@ -606,14 +606,14 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); private: diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 2fa7da6822bb..054f2fbe1ea7 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star::ucb; uno::Any SAL_CALL XStream_impl::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -152,7 +152,7 @@ sal_Int32 SAL_CALL XStream_impl::getMinorError() uno::Reference< io::XInputStream > SAL_CALL XStream_impl::getInputStream( ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { { osl::MutexGuard aGuard( m_aMutex ); @@ -164,7 +164,7 @@ XStream_impl::getInputStream( ) uno::Reference< io::XOutputStream > SAL_CALL XStream_impl::getOutputStream( ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { { osl::MutexGuard aGuard( m_aMutex ); @@ -175,7 +175,7 @@ XStream_impl::getOutputStream( ) void SAL_CALL XStream_impl::truncate(void) - throw( io::IOException, uno::RuntimeException ) + throw( io::IOException, uno::RuntimeException, std::exception ) { if (osl::FileBase::E_None != m_aFile.setSize(0)) throw io::IOException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >() ); @@ -197,7 +197,7 @@ XStream_impl::readBytes( throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( ! m_nIsOpen ) throw io::IOException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >() ); @@ -233,7 +233,7 @@ XStream_impl::readSomeBytes( throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return readBytes( aData,nMaxBytesToRead ); } @@ -245,7 +245,7 @@ XStream_impl::skipBytes( throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) ); } @@ -256,7 +256,7 @@ XStream_impl::available( void ) throw( io::NotConnectedException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { return 0; } @@ -267,7 +267,7 @@ XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData ) throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { sal_uInt32 length = aData.getLength(); if(length) @@ -307,7 +307,7 @@ XStream_impl::closeInput( void ) throw( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); m_bInputStreamCalled = false; @@ -322,7 +322,7 @@ XStream_impl::closeOutput( void ) throw( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); m_bOutputStreamCalled = false; @@ -337,7 +337,7 @@ XStream_impl::seek( sal_Int64 location ) throw( lang::IllegalArgumentException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if( location < 0 ) throw lang::IllegalArgumentException( OUString(THROW_WHERE), uno::Reference< uno::XInterface >(), 0 ); @@ -350,7 +350,7 @@ sal_Int64 SAL_CALL XStream_impl::getPosition( void ) throw( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { sal_uInt64 uPos; if( osl::FileBase::E_None != m_aFile.getPos( uPos ) ) @@ -362,7 +362,7 @@ sal_Int64 SAL_CALL XStream_impl::getLength( void ) throw( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { sal_uInt64 uEndPos; if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) @@ -376,11 +376,11 @@ XStream_impl::flush() throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) {} void XStream_impl::waitForCompletion() - throw (io::IOException, uno::RuntimeException) + throw (io::IOException, uno::RuntimeException, std::exception) { // At least on UNIX, to reliably learn about any errors encountered by // asynchronous NFS write operations, without closing the file directly diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index 78fc1530cbdb..66f7f9376be5 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -70,7 +70,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -92,18 +92,18 @@ namespace fileaccess { virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getInputStream( ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL getOutputStream( ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XTruncate virtual void SAL_CALL truncate( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XInputStream @@ -115,7 +115,7 @@ namespace fileaccess { throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); sal_Int32 SAL_CALL readSomeBytes( @@ -124,7 +124,7 @@ namespace fileaccess { throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL @@ -133,21 +133,21 @@ namespace fileaccess { throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); sal_Int32 SAL_CALL available( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); void SAL_CALL closeInput( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XSeekable @@ -156,19 +156,19 @@ namespace fileaccess { sal_Int64 location ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); sal_Int64 SAL_CALL getPosition( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); sal_Int64 SAL_CALL getLength( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XOutputStream @@ -178,7 +178,7 @@ namespace fileaccess { throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); @@ -187,7 +187,7 @@ namespace fileaccess { throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL @@ -195,12 +195,12 @@ namespace fileaccess { void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL waitForCompletion() throw ( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); private: diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 60b79bda9e5f..56c579ce3297 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -125,7 +125,7 @@ FileProvider::release( Any SAL_CALL FileProvider::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, @@ -152,7 +152,7 @@ void SAL_CALL FileProvider::init() void SAL_CALL FileProvider::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException) + throw (Exception, RuntimeException, std::exception) { if( ! m_pMyShell ) { OUString config; @@ -186,7 +186,7 @@ XTYPEPROVIDER_IMPL_7( FileProvider, OUString SAL_CALL FileProvider::getImplementationName() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return fileaccess::shell::getImplementationName_static(); } @@ -195,7 +195,7 @@ FileProvider::getImplementationName() sal_Bool SAL_CALL FileProvider::supportsService( const OUString& ServiceName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return ServiceName == "com.sun.star.ucb.FileContentProvider"; } @@ -204,7 +204,7 @@ FileProvider::supportsService( Sequence< OUString > SAL_CALL FileProvider::getSupportedServiceNames( void ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return fileaccess::shell::getSupportedServiceNames_static(); } @@ -265,7 +265,7 @@ Reference< XContent > SAL_CALL FileProvider::queryContent( const Reference< XContentIdentifier >& xIdentifier ) throw( IllegalIdentifierException, - RuntimeException) + RuntimeException, std::exception) { init(); OUString aUnc; @@ -284,7 +284,7 @@ sal_Int32 SAL_CALL FileProvider::compareContentIds( const Reference< XContentIdentifier >& Id1, const Reference< XContentIdentifier >& Id2 ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { init(); OUString aUrl1 = Id1->getContentIdentifier(); @@ -342,7 +342,7 @@ FileProvider::compareContentIds( Reference< XContentIdentifier > SAL_CALL FileProvider::createContentIdentifier( const OUString& ContentId ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { init(); FileContentIdentifier* p = new FileContentIdentifier( m_pMyShell,ContentId,false ); @@ -365,7 +365,7 @@ public: virtual Any SAL_CALL queryInterface( const Type& aType ) - throw( RuntimeException); + throw( RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -381,17 +381,17 @@ public: virtual Sequence< Property > SAL_CALL getProperties( void ) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); virtual Property SAL_CALL getPropertyByName( const OUString& aName ) throw( UnknownPropertyException, - RuntimeException); + RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException ); + throw( RuntimeException, std::exception ); private: @@ -446,7 +446,7 @@ XPropertySetInfoImpl2::release( Any SAL_CALL XPropertySetInfoImpl2::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< XPropertySetInfo* >(this)) ); @@ -458,7 +458,7 @@ Property SAL_CALL XPropertySetInfoImpl2::getPropertyByName( const OUString& aName ) throw( UnknownPropertyException, - RuntimeException) + RuntimeException, std::exception) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) @@ -472,7 +472,7 @@ XPropertySetInfoImpl2::getPropertyByName( Sequence< Property > SAL_CALL XPropertySetInfoImpl2::getProperties( void ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return m_seq; } @@ -481,7 +481,7 @@ XPropertySetInfoImpl2::getProperties( sal_Bool SAL_CALL XPropertySetInfoImpl2::hasPropertyByName( const OUString& aName ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) @@ -525,7 +525,7 @@ void SAL_CALL FileProvider::initProperties( void ) Reference< XPropertySetInfo > SAL_CALL FileProvider::getPropertySetInfo( ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { initProperties(); return m_xPropertySetInfo; @@ -539,7 +539,7 @@ FileProvider::setPropertyValue( const OUString& aPropertyName, PropertyVetoException, IllegalArgumentException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { if( aPropertyName.equalsAscii( "FileSystemNotation" ) || aPropertyName.equalsAscii( "HomeDirectory" ) || @@ -556,7 +556,7 @@ FileProvider::getPropertyValue( const OUString& aPropertyName ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { initProperties(); if( aPropertyName.equalsAscii( "FileSystemNotation" ) ) @@ -588,7 +588,7 @@ FileProvider::addPropertyChangeListener( const Reference< XPropertyChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException) + RuntimeException, std::exception) { return; } @@ -600,7 +600,7 @@ FileProvider::removePropertyChangeListener( const Reference< XPropertyChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { return; } @@ -611,7 +611,7 @@ FileProvider::addVetoableChangeListener( const Reference< XVetoableChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException ) + RuntimeException, std::exception ) { return; } @@ -623,7 +623,7 @@ FileProvider::removeVetoableChangeListener( const Reference< XVetoableChangeListener >& ) throw( UnknownPropertyException, WrappedTargetException, - RuntimeException) + RuntimeException, std::exception) { return; } @@ -634,7 +634,7 @@ FileProvider::removeVetoableChangeListener( sal_Int32 SAL_CALL FileProvider::getFileProviderLocality( const OUString& BaseURL ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { // If the base URL is a 'file' URL, return 10 (very 'local'), otherwise // return -1 (missmatch). What is missing is a fast comparison to ASCII, @@ -650,7 +650,7 @@ FileProvider::getFileProviderLocality( const OUString& BaseURL ) OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&, const OUString& SystemPath ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUString aNormalizedPath; if ( osl::FileBase::getFileURLFromSystemPath( SystemPath,aNormalizedPath ) != osl::FileBase::E_None ) @@ -660,7 +660,7 @@ OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&, } OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const OUString& URL ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { OUString aSystemPath; if (osl::FileBase::getSystemPathFromFileURL( URL,aSystemPath ) != osl::FileBase::E_None ) diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index 6f2a63fdd321..20179668e6cf 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -67,7 +67,7 @@ namespace fileaccess { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -83,17 +83,17 @@ namespace fileaccess { virtual OUString SAL_CALL getImplementationName( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw(com::sun::star::uno::RuntimeException ); + throw(com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); static com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > SAL_CALL @@ -112,7 +112,7 @@ namespace fileaccess { virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) - throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception); // XContentProvider @@ -120,27 +120,27 @@ namespace fileaccess { queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XContentIdentifierFactory virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( const OUString& ContentId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL compareContentIds( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id1, const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Id2 ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XProperySet virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL setPropertyValue( @@ -150,14 +150,14 @@ namespace fileaccess { com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addPropertyChangeListener( @@ -165,7 +165,7 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertyChangeListener( @@ -173,7 +173,7 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addVetoableChangeListener( @@ -181,7 +181,7 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeVetoableChangeListener( @@ -189,21 +189,21 @@ namespace fileaccess { const com::sun::star::uno::Reference< com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); // XFileIdentifierConverter virtual sal_Int32 SAL_CALL getFileProviderLocality( const OUString& BaseURL ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL, const OUString& SystemPath ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index c798c41e0e59..cbb7a5e9a4e6 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -178,7 +178,7 @@ XSERVICEINFO_IMPL_1( FTPContent, // virtual OUString SAL_CALL FTPContent::getContentType() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return OUString(FTP_CONTENT_TYPE); } @@ -193,7 +193,7 @@ OUString SAL_CALL FTPContent::getContentType() //virtual void SAL_CALL FTPContent::abort( sal_Int32 /*CommandId*/ ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { } @@ -274,7 +274,7 @@ Any SAL_CALL FTPContent::execute( throw( Exception, CommandAbortedException, - RuntimeException + RuntimeException, std::exception ) { ACTION action(NOACTION); @@ -620,7 +620,7 @@ Any SAL_CALL FTPContent::execute( Sequence<ContentInfo > SAL_CALL FTPContent::queryCreatableContentsInfo( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return queryCreatableContentsInfo_Static(); } @@ -654,7 +654,7 @@ FTPContent::queryCreatableContentsInfo_Static( ) Reference<XContent > SAL_CALL FTPContent::createNewContent( const ContentInfo& Info ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if( Info.Type =="application/vnd.sun.staroffice.ftp-file" || Info.Type == "application/vnd.sun.staroffice.ftp-folder" ) return new FTPContent(m_xContext, @@ -669,7 +669,7 @@ FTPContent::createNewContent( const ContentInfo& Info ) Reference<XInterface > SAL_CALL FTPContent::getParent( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Reference<XContentIdentifier> xIdent(new FTPContentIdentifier(m_aFTPURL.parent(false))); @@ -680,7 +680,7 @@ FTPContent::getParent( ) void SAL_CALL FTPContent::setParent(const Reference<XInterface >& /*Parent*/ ) throw (NoSupportException, - RuntimeException) + RuntimeException, std::exception) { throw NoSupportException(); } diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx index 1023c35c4bc2..e797cb266a28 100644 --- a/ucb/source/ucp/ftp/ftpcontent.hxx +++ b/ucb/source/ucp/ftp/ftpcontent.hxx @@ -80,7 +80,7 @@ namespace ftp // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -90,35 +90,35 @@ namespace ftp com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort(sal_Int32 CommandId) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); // XContentCreator virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); // XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); static com::sun::star::uno::Sequence< diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 402372ca83dd..0232bd5194e3 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -50,7 +50,7 @@ FTPContentIdentifier::queryInterface( const Type& rType ) throw( - RuntimeException + RuntimeException, std::exception ) { Any aRet = @@ -74,7 +74,7 @@ void SAL_CALL FTPContentIdentifier::release( void ) throw() { Sequence<sal_Int8> SAL_CALL FTPContentIdentifier::getImplementationId() - throw(RuntimeException) + throw(RuntimeException, std::exception) { static cppu::OImplementationId* pId = NULL; if(!pId) @@ -93,7 +93,7 @@ FTPContentIdentifier::getImplementationId() Sequence<Type> SAL_CALL FTPContentIdentifier::getTypes( void ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { static cppu::OTypeCollection* pCollection = NULL; if ( !pCollection ) { @@ -116,7 +116,7 @@ OUString SAL_CALL FTPContentIdentifier::getContentIdentifier( ) throw ( - com::sun::star::uno::RuntimeException + com::sun::star::uno::RuntimeException, std::exception ) { return m_ident; @@ -127,7 +127,7 @@ OUString SAL_CALL FTPContentIdentifier::getContentProviderScheme( ) throw ( - com::sun::star::uno::RuntimeException + com::sun::star::uno::RuntimeException, std::exception ) { return OUString("ftp"); diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index f4d1c443b128..96122eac72e5 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -54,7 +54,7 @@ namespace ftp { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire( void ) throw(); @@ -67,14 +67,14 @@ namespace ftp { getTypes( ) throw( - com::sun::star::uno::RuntimeException + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw( - com::sun::star::uno::RuntimeException + com::sun::star::uno::RuntimeException, std::exception ); @@ -84,14 +84,14 @@ namespace ftp { getContentIdentifier( ) throw ( - com::sun::star::uno::RuntimeException + com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getContentProviderScheme( ) throw ( - ::com::sun::star::uno::RuntimeException + ::com::sun::star::uno::RuntimeException, std::exception ); diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 982f1c39d331..f2130cdb5a96 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -120,7 +120,7 @@ FTPContentProvider::queryContent( ) throw( IllegalIdentifierException, - RuntimeException + RuntimeException, std::exception ) { // Check, if a content with given id already exists... diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx index 3ec371cd3998..ade75efe20f9 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx @@ -73,7 +73,7 @@ namespace ftp { queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // FTPHandleProvider. diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index fff1d3d3ed39..e968e9c5be18 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -56,7 +56,7 @@ XInteractionApproveImpl::release( void ) Any SAL_CALL XInteractionApproveImpl::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, @@ -76,7 +76,7 @@ XTYPEPROVIDER_IMPL_2( XInteractionApproveImpl, void SAL_CALL XInteractionApproveImpl::select() - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_bSelected = true; } @@ -115,7 +115,7 @@ XInteractionDisapproveImpl::release( void ) Any SAL_CALL XInteractionDisapproveImpl::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, @@ -135,7 +135,7 @@ XTYPEPROVIDER_IMPL_2( XInteractionDisapproveImpl, void SAL_CALL XInteractionDisapproveImpl::select() - throw (RuntimeException) + throw (RuntimeException, std::exception) { m_bSelected = true; @@ -175,7 +175,7 @@ XInteractionRequestImpl::release( void ) Any SAL_CALL XInteractionRequestImpl::queryInterface( const Type& rType ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, @@ -195,7 +195,7 @@ XTYPEPROVIDER_IMPL_2( XInteractionRequestImpl, Any SAL_CALL XInteractionRequestImpl::getRequest( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { Any aAny; UnsupportedNameClashException excep; @@ -207,7 +207,7 @@ Any SAL_CALL XInteractionRequestImpl::getRequest( ) Sequence<Reference<XInteractionContinuation > > SAL_CALL XInteractionRequestImpl::getContinuations( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return m_aSeq; } diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 00fbc5d7c9d9..1fedb441d25c 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -45,7 +45,7 @@ namespace ftp { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -63,7 +63,7 @@ namespace ftp { XTYPEPROVIDER_DECL() virtual void SAL_CALL select() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); bool isSelected() const; @@ -87,7 +87,7 @@ namespace ftp { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -105,7 +105,7 @@ namespace ftp { XTYPEPROVIDER_DECL() virtual void SAL_CALL select() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: @@ -126,7 +126,7 @@ namespace ftp { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& rType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -145,13 +145,13 @@ namespace ftp { com::sun::star::uno::Any SAL_CALL getRequest( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::task::XInteractionContinuation > > SAL_CALL getContinuations( ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); bool approved() const; diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 8ace75c65de2..b63b1596496e 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -82,7 +82,7 @@ ResultSetBase::release( uno::Any SAL_CALL ResultSetBase::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, @@ -103,7 +103,7 @@ ResultSetBase::queryInterface( void SAL_CALL ResultSetBase::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -118,7 +118,7 @@ ResultSetBase::addEventListener( void SAL_CALL ResultSetBase::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -130,7 +130,7 @@ ResultSetBase::removeEventListener( void SAL_CALL ResultSetBase::dispose() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -159,7 +159,7 @@ sal_Bool SAL_CALL ResultSetBase::next( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { sal_Bool test; if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -174,7 +174,7 @@ sal_Bool SAL_CALL ResultSetBase::isBeforeFirst( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_nRow == -1; } @@ -184,7 +184,7 @@ sal_Bool SAL_CALL ResultSetBase::isAfterLast( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()); // Cannot happen, if m_aFolder.isOpen() } @@ -194,7 +194,7 @@ sal_Bool SAL_CALL ResultSetBase::isFirst( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_nRow == 0; } @@ -204,7 +204,7 @@ sal_Bool SAL_CALL ResultSetBase::isLast( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( m_nRow == sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1 ) return true; @@ -217,7 +217,7 @@ void SAL_CALL ResultSetBase::beforeFirst( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_nRow = -1; } @@ -227,7 +227,7 @@ void SAL_CALL ResultSetBase::afterLast( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_nRow = m_aItems.size(); } @@ -237,7 +237,7 @@ sal_Bool SAL_CALL ResultSetBase::first( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_nRow = -1; return next(); @@ -248,7 +248,7 @@ sal_Bool SAL_CALL ResultSetBase::last( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_nRow = m_aItems.size() - 1; return true; @@ -259,7 +259,7 @@ sal_Int32 SAL_CALL ResultSetBase::getRow( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { // Test, whether behind last row if( -1 == m_nRow || m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -270,7 +270,7 @@ ResultSetBase::getRow( sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row ) - throw( sdbc::SQLException, uno::RuntimeException) + throw( sdbc::SQLException, uno::RuntimeException, std::exception) { if( row >= 0 ) m_nRow = row - 1; @@ -292,7 +292,7 @@ sal_Bool SAL_CALL ResultSetBase::relative( sal_Int32 row ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( isAfterLast() || isBeforeFirst() ) throw sdbc::SQLException(); @@ -313,7 +313,7 @@ sal_Bool SAL_CALL ResultSetBase::previous( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( m_nRow > sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nRow = m_aItems.size(); // Correct Handling of afterLast @@ -327,7 +327,7 @@ void SAL_CALL ResultSetBase::refreshRow( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { } @@ -336,7 +336,7 @@ sal_Bool SAL_CALL ResultSetBase::rowUpdated( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return false; } @@ -345,7 +345,7 @@ sal_Bool SAL_CALL ResultSetBase::rowInserted( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return false; } @@ -354,7 +354,7 @@ sal_Bool SAL_CALL ResultSetBase::rowDeleted( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return false; } @@ -364,7 +364,7 @@ uno::Reference< uno::XInterface > SAL_CALL ResultSetBase::getStatement( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > test( 0 ); return test; @@ -377,7 +377,7 @@ void SAL_CALL ResultSetBase::close( void ) throw( sdbc::SQLException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { } @@ -385,7 +385,7 @@ ResultSetBase::close( OUString SAL_CALL ResultSetBase::queryContentIdentifierString( void ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aPath[m_nRow]; @@ -399,7 +399,7 @@ ResultSetBase::queryContentIdentifier( void ) throw( - uno::RuntimeException + uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -421,7 +421,7 @@ ResultSetBase::queryContentIdentifier( uno::Reference< ucb::XContent > SAL_CALL ResultSetBase::queryContent( void ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_xProvider->queryContent(queryContentIdentifier()); @@ -456,7 +456,7 @@ public: } uno::Any SAL_CALL queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, @@ -465,14 +465,14 @@ public: } uno::Sequence< beans::Property > SAL_CALL getProperties() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aSeq; } beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw( beans::UnknownPropertyException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { for( int i = 0; i < m_aSeq.getLength(); ++i ) if( aName == m_aSeq[i].Name ) @@ -481,7 +481,7 @@ public: } sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { for( int i = 0; i < m_aSeq.getLength(); ++i ) if( Name == m_aSeq[i].Name ) @@ -499,7 +499,7 @@ private: // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSetBase::getPropertySetInfo() - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > seq(2); seq[0].Name = "RowCount"; @@ -525,7 +525,7 @@ void SAL_CALL ResultSetBase::setPropertyValue( beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" || aPropertyName == "RowCount" ) @@ -539,7 +539,7 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue( const OUString& PropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( PropertyName == "IsRowCountFinal" ) { @@ -564,7 +564,7 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& xListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" ) { @@ -593,7 +593,7 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& aListener ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" && m_pIsFinalListeners ) @@ -617,7 +617,7 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { } @@ -627,7 +627,7 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { } @@ -638,7 +638,7 @@ uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSetBase::getMetaData( void ) throw( sdbc::SQLException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { ::ucbhelper::ResultSetMetaData* p = new ::ucbhelper::ResultSetMetaData( m_xContext, m_sProperty ); diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index 0c9803148110..13acb45b5204 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -66,7 +66,7 @@ namespace ftp { virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL acquire( @@ -82,18 +82,18 @@ namespace ftp { virtual void SAL_CALL dispose( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XRow @@ -101,7 +101,7 @@ namespace ftp { wasNull( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -114,7 +114,7 @@ namespace ftp { getString( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { OUString ret; if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -127,7 +127,7 @@ namespace ftp { getBoolean( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -139,7 +139,7 @@ namespace ftp { getByte( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -152,7 +152,7 @@ namespace ftp { sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -164,7 +164,7 @@ namespace ftp { getInt( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -176,7 +176,7 @@ namespace ftp { getLong( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -188,7 +188,7 @@ namespace ftp { getFloat( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -200,7 +200,7 @@ namespace ftp { getDouble( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -212,7 +212,7 @@ namespace ftp { getBytes( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException ) + com::sun::star::uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); @@ -224,7 +224,7 @@ namespace ftp { getDate( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); @@ -236,7 +236,7 @@ namespace ftp { getTime( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); @@ -248,7 +248,7 @@ namespace ftp { getTimestamp( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); @@ -262,7 +262,7 @@ namespace ftp { getBinaryStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); @@ -276,7 +276,7 @@ namespace ftp { getCharacterStream( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); @@ -291,7 +291,7 @@ namespace ftp { const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& typeMap ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); @@ -304,7 +304,7 @@ namespace ftp { getRef( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); @@ -317,7 +317,7 @@ namespace ftp { getBlob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); @@ -330,7 +330,7 @@ namespace ftp { getClob( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); @@ -344,7 +344,7 @@ namespace ftp { getArray( sal_Int32 columnIndex ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException) + com::sun::star::uno::RuntimeException, std::exception) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); @@ -360,103 +360,103 @@ namespace ftp { next( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isBeforeFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isAfterLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL beforeFirst( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL afterLast( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL first( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL last( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getRow( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL previous( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL refreshRow( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL rowUpdated( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL rowInserted( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL rowDeleted( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Reference< @@ -464,7 +464,7 @@ namespace ftp { getStatement( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); // XCloseable @@ -472,26 +472,26 @@ namespace ftp { close( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); // XContentAccess virtual OUString SAL_CALL queryContentIdentifierString( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL queryContentIdentifier( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL queryContent( void ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XResultSetMetaDataSupplier virtual com::sun::star::uno::Reference< @@ -499,14 +499,14 @@ namespace ftp { getMetaData( void ) throw( com::sun::star::sdbc::SQLException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); // XPropertySet virtual com::sun::star::uno::Reference< com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( com::sun::star::uno::RuntimeException); + throw( com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, @@ -515,14 +515,14 @@ namespace ftp { com::sun::star::beans::PropertyVetoException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addPropertyChangeListener( @@ -531,7 +531,7 @@ namespace ftp { com::sun::star::beans::XPropertyChangeListener >& xListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removePropertyChangeListener( @@ -540,7 +540,7 @@ namespace ftp { com::sun::star::beans::XPropertyChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL addVetoableChangeListener( @@ -549,7 +549,7 @@ namespace ftp { com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, @@ -557,7 +557,7 @@ namespace ftp { com::sun::star::beans::XVetoableChangeListener >& aListener ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); protected: diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index b0787fa7dd3f..c5ee29c26a99 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -129,14 +129,14 @@ OUString Content::getParentURL() } void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { //TODO //stick a map from each CommandId to a new GCancellable and propogate //it throughout the g_file_* calls } -OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) { return isFolder(uno::Reference< ucb::XCommandEnvironment >()) ? OUString( GIO_FOLDER_TYPE ) @@ -914,7 +914,7 @@ uno::Any SAL_CALL Content::execute( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( uno::Exception, ucb::CommandAbortedException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { #if OSL_DEBUG_LEVEL > 1 fprintf(stderr, "Content::execute %s\n", OUStringToOString(aCommand.Name, RTL_TEXTENCODING_UTF8).getStr()); @@ -1139,14 +1139,14 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( } uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return queryCreatableContentsInfo( uno::Reference< ucb::XCommandEnvironment >() ); } uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { bool create_document; const char *name; @@ -1188,7 +1188,7 @@ uno::Reference< ucb::XContent > } uno::Sequence< uno::Type > SAL_CALL Content::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) ) { @@ -1325,19 +1325,19 @@ void SAL_CALL Content::release() throw() ContentImplHelper::release(); } -uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException ) +uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< ucb::XContentCreator * >( this ) ); return aRet.hasValue() ? aRet : ContentImplHelper::queryInterface(rType); } -OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.GIOContent"); } uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = "com.sun.star.ucb.GIOContent"; diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx index bda3c6255a2a..f55716b613d9 100644 --- a/ucb/source/ucp/gio/gio_content.hxx +++ b/ucb/source/ucp/gio/gio_content.hxx @@ -152,31 +152,31 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Any SAL_CALL execute( const com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > queryCreatableContentsInfo( diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx index 82d7aa0dca1c..49b6b386b3c7 100644 --- a/ucb/source/ucp/gio/gio_inputstream.cxx +++ b/ucb/source/ucp/gio/gio_inputstream.cxx @@ -41,13 +41,13 @@ InputStream::~InputStream( void ) } sal_Int32 SAL_CALL InputStream::available() - throw( io::NotConnectedException, io::IOException, uno::RuntimeException ) + throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception ) { return 0; } void SAL_CALL InputStream::closeInput() - throw( io::NotConnectedException, io::IOException, uno::RuntimeException ) + throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception ) { if (mpStream) g_input_stream_close(G_INPUT_STREAM(mpStream), NULL, NULL); @@ -55,7 +55,7 @@ void SAL_CALL InputStream::closeInput() void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException ) + io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -71,7 +71,7 @@ void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL InputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException ) + io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -95,12 +95,12 @@ sal_Int32 SAL_CALL InputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal sal_Int32 SAL_CALL InputStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException ) + io::IOException, uno::RuntimeException, std::exception ) { return readBytes(aData, nMaxBytesToRead); } -uno::Any InputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException ) +uno::Any InputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception ) { uno::Any aRet = ::cppu::queryInterface ( type, static_cast< XInputStream * >( this ) ); diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx index 879e1d9d5b12..8fcc71bd781f 100644 --- a/ucb/source/ucp/gio/gio_inputstream.hxx +++ b/ucb/source/ucp/gio/gio_inputstream.hxx @@ -46,7 +46,7 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire( void ) throw () { OWeakObject::acquire(); } virtual void SAL_CALL release( void ) throw() { OWeakObject::release(); } @@ -56,30 +56,30 @@ public: throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData, sal_Int32 nMaxBytesToRead ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL available( void ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL closeInput( void ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); }; } // namespace gio diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx index 050133ebc9af..b4e4c1291392 100644 --- a/ucb/source/ucp/gio/gio_outputstream.cxx +++ b/ucb/source/ucp/gio/gio_outputstream.cxx @@ -42,7 +42,7 @@ OutputStream::~OutputStream( void ) void SAL_CALL OutputStream::writeBytes( const com::sun::star::uno::Sequence< sal_Int8 >& rData ) throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException) + io::IOException, uno::RuntimeException, std::exception) { if (!mpStream) throw io::NotConnectedException(); @@ -54,7 +54,7 @@ void SAL_CALL OutputStream::writeBytes( const com::sun::star::uno::Sequence< sal void SAL_CALL OutputStream::flush( void ) throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException ) + io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -66,13 +66,13 @@ void SAL_CALL OutputStream::flush( void ) void SAL_CALL OutputStream::closeOutput( void ) throw( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if (mpStream) g_output_stream_close(G_OUTPUT_STREAM(mpStream), NULL, NULL); } -uno::Any OutputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException ) +uno::Any OutputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception ) { uno::Any aRet = ::cppu::queryInterface ( type, static_cast< XOutputStream * >( this ) ); diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx index 4c4732a6ef34..37c8b6c8d01d 100644 --- a/ucb/source/ucp/gio/gio_outputstream.hxx +++ b/ucb/source/ucp/gio/gio_outputstream.hxx @@ -46,7 +46,7 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire( void ) throw () { OWeakObject::acquire(); } virtual void SAL_CALL release( void ) throw() { OWeakObject::release(); } @@ -55,19 +55,19 @@ public: throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL flush( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL closeOutput( void ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); }; } // namespace gio diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index fa3c806a1b92..721cb9ec5119 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -34,7 +34,7 @@ ContentProvider::queryContent( const uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { #if OSL_DEBUG_LEVEL > 1 fprintf(stderr, "QueryContent: '%s'", diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx index 076a9c74a72e..c4c61243baa3 100644 --- a/ucb/source/ucp/gio/gio_provider.hxx +++ b/ucb/source/ucp/gio/gio_provider.hxx @@ -50,7 +50,7 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); }; } diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index 0561dbed8b89..26e222a9461b 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -40,7 +40,7 @@ Seekable::~Seekable( void ) } void SAL_CALL Seekable::truncate( void ) - throw( io::IOException, uno::RuntimeException ) + throw( io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -55,7 +55,7 @@ void SAL_CALL Seekable::truncate( void ) } void SAL_CALL Seekable::seek( sal_Int64 location ) - throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException ) + throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -69,7 +69,7 @@ void SAL_CALL Seekable::seek( sal_Int64 location ) convertToException(pError, static_cast< cppu::OWeakObject * >(this)); } -sal_Int64 SAL_CALL Seekable::getPosition() throw( io::IOException, uno::RuntimeException ) +sal_Int64 SAL_CALL Seekable::getPosition() throw( io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -77,7 +77,7 @@ sal_Int64 SAL_CALL Seekable::getPosition() throw( io::IOException, uno::RuntimeE return g_seekable_tell(mpStream); } -sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeException ) +sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -117,7 +117,7 @@ sal_Int64 SAL_CALL Seekable::getLength() throw( io::IOException, uno::RuntimeExc return nSize; } -uno::Any Seekable::queryInterface( const uno::Type &type ) throw( uno::RuntimeException ) +uno::Any Seekable::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception ) { uno::Any aRet = ::cppu::queryInterface ( type, static_cast< XSeekable * >( this ) ); diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx index 1b4fabe5a2f6..eaee55f66cd3 100644 --- a/ucb/source/ucp/gio/gio_seekable.hxx +++ b/ucb/source/ucp/gio/gio_seekable.hxx @@ -44,7 +44,7 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire( void ) throw () { OWeakObject::acquire(); } virtual void SAL_CALL release( void ) throw() { OWeakObject::release(); } @@ -52,20 +52,20 @@ public: virtual void SAL_CALL seek( sal_Int64 location ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getPosition() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getLength() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XTruncate virtual void SAL_CALL truncate( void ) throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); }; } // namespace gio diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 31f9dbd785b3..0704bc24180f 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -174,7 +174,7 @@ void SAL_CALL HierarchyContent::release() // virtual uno::Any SAL_CALL HierarchyContent::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = ContentImplHelper::queryInterface( rType ); @@ -205,7 +205,7 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyContent ); // virtual uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = 0; @@ -286,7 +286,7 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() // virtual OUString SAL_CALL HierarchyContent::getImplementationName() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.HierarchyContent" ); } @@ -295,7 +295,7 @@ OUString SAL_CALL HierarchyContent::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL HierarchyContent::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSNS( 1 ); @@ -317,7 +317,7 @@ HierarchyContent::getSupportedServiceNames() // virtual OUString SAL_CALL HierarchyContent::getContentType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aProps.getContentType(); } @@ -326,7 +326,7 @@ OUString SAL_CALL HierarchyContent::getContentType() // virtual uno::Reference< ucb::XContentIdentifier > SAL_CALL HierarchyContent::getIdentifier() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { // Transient? if ( m_eState == TRANSIENT ) @@ -351,7 +351,7 @@ uno::Any SAL_CALL HierarchyContent::execute( const uno::Reference< ucb::XCommandEnvironment >& Environment ) throw( uno::Exception, ucb::CommandAbortedException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Any aRet; @@ -566,7 +566,7 @@ uno::Any SAL_CALL HierarchyContent::execute( // virtual void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { // @@@ Generally, no action takes much time... } @@ -580,7 +580,7 @@ void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL HierarchyContent::queryCreatableContentsInfo() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aProps.getCreatableContentsInfo(); } @@ -589,7 +589,7 @@ HierarchyContent::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL HierarchyContent::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( isFolder() ) { diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index a91b9f59566a..69d0f1052dd5 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -243,19 +243,19 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -265,10 +265,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Additional interfaces @@ -278,11 +278,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Non-interface methods. diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 856c826f1210..f57e0ada7856 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -111,30 +111,30 @@ public: // XComponent virtual void SAL_CALL dispose() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XSingleServiceFactory virtual uno::Reference< uno::XInterface > SAL_CALL createInstance() - throw ( uno::Exception, uno::RuntimeException ); + throw ( uno::Exception, uno::RuntimeException, std::exception ); virtual uno::Reference< uno::XInterface > SAL_CALL createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) - throw ( uno::Exception, uno::RuntimeException ); + throw ( uno::Exception, uno::RuntimeException, std::exception ); // XHierarchicalNameAccess virtual uno::Any SAL_CALL getByHierarchicalName( const OUString & aName ) - throw ( container::NoSuchElementException, uno::RuntimeException ); + throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString & aName ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XNameContainer virtual void SAL_CALL @@ -142,12 +142,12 @@ public: throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, - uno::RuntimeException ); + uno::RuntimeException, std::exception ); virtual void SAL_CALL removeByName( const OUString & Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ); + uno::RuntimeException, std::exception ); // XNameReplace ( base of XNameContainer ) virtual void SAL_CALL @@ -155,49 +155,49 @@ public: throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ); + uno::RuntimeException, std::exception ); // XNameAccess ( base of XNameReplace ) virtual uno::Any SAL_CALL getByName( const OUString & aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ); + uno::RuntimeException, std::exception ); virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasByName( const OUString & aName ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XElementAccess ( base of XNameAccess ) virtual uno::Type SAL_CALL getElementType() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasElements() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XChangesNotifier virtual void SAL_CALL addChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual void SAL_CALL removeChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XChangesBatch virtual void SAL_CALL commitChanges() - throw ( lang::WrappedTargetException, uno::RuntimeException ); + throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasPendingChanges() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual uno::Sequence< util::ElementChange > SAL_CALL getPendingChanges() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); }; } // namespace hcp_impl @@ -275,7 +275,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource ); // virtual void SAL_CALL HierarchyDataSource::dispose() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -291,7 +291,7 @@ void SAL_CALL HierarchyDataSource::dispose() // virtual void SAL_CALL HierarchyDataSource::addEventListener( const uno::Reference< lang::XEventListener > & Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -306,7 +306,7 @@ void SAL_CALL HierarchyDataSource::addEventListener( // virtual void SAL_CALL HierarchyDataSource::removeEventListener( const uno::Reference< lang::XEventListener > & Listener ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -323,7 +323,7 @@ void SAL_CALL HierarchyDataSource::removeEventListener( // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstance( const OUString & aServiceSpecifier ) - throw ( uno::Exception, uno::RuntimeException ) + throw ( uno::Exception, uno::RuntimeException, std::exception ) { // Create view to root node. @@ -343,7 +343,7 @@ uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments ) - throw ( uno::Exception, uno::RuntimeException ) + throw ( uno::Exception, uno::RuntimeException, std::exception ) { return createInstanceWithArguments( ServiceSpecifier, Arguments, true ); } @@ -352,7 +352,7 @@ HierarchyDataSource::createInstanceWithArguments( // virtual uno::Sequence< OUString > SAL_CALL HierarchyDataSource::getAvailableServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aNames( 2 ); aNames[ 0 ] = READ_SERVICE_NAME; @@ -613,7 +613,7 @@ XINTERFACE_COMMON_IMPL( HierarchyDataAccess ); // virtual uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { // Interfaces supported in read-only and read-write mode. uno::Any aRet = cppu::queryInterface( aType, @@ -649,7 +649,7 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyDataAccess ); // virtual uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = 0; @@ -739,7 +739,7 @@ XSERVICEINFO_NOFACTORY_IMPL_0( // virtual void SAL_CALL HierarchyDataAccess::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -753,7 +753,7 @@ void SAL_CALL HierarchyDataAccess::dispose() // virtual void SAL_CALL HierarchyDataAccess::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -767,7 +767,7 @@ void SAL_CALL HierarchyDataAccess::addEventListener( // virtual void SAL_CALL HierarchyDataAccess::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -786,7 +786,7 @@ void SAL_CALL HierarchyDataAccess::removeEventListener( // virtual uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( const OUString & aName ) - throw ( container::NoSuchElementException, uno::RuntimeException ) + throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ) { uno::Reference< container::XHierarchicalNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA ); @@ -801,7 +801,7 @@ uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( const OUString & aName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XHierarchicalNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA ); @@ -822,7 +822,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -835,7 +835,7 @@ uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) // virtual uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -848,7 +848,7 @@ uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -866,7 +866,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) // virtual uno::Type SAL_CALL HierarchyDataAccess::getElementType() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XElementAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA ); @@ -879,7 +879,7 @@ uno::Type SAL_CALL HierarchyDataAccess::getElementType() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasElements() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XElementAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA ); @@ -898,7 +898,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasElements() // virtual void SAL_CALL HierarchyDataAccess::addChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesNotifier > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN ); @@ -912,7 +912,7 @@ void SAL_CALL HierarchyDataAccess::addChangesListener( // virtual void SAL_CALL HierarchyDataAccess::removeChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesNotifier > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN ); @@ -930,7 +930,7 @@ void SAL_CALL HierarchyDataAccess::removeChangesListener( // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance() - throw ( uno::Exception, uno::RuntimeException ) + throw ( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< lang::XSingleServiceFactory > xOrig = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF ); @@ -945,7 +945,7 @@ uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance() uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) - throw ( uno::Exception, uno::RuntimeException ) + throw ( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< lang::XSingleServiceFactory > xOrig = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF ); @@ -968,7 +968,7 @@ HierarchyDataAccess::insertByName( const OUString & aName, throw ( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< container::XNameContainer > xOrig = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC ); @@ -984,7 +984,7 @@ void SAL_CALL HierarchyDataAccess::removeByName( const OUString & Name ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< container::XNameContainer > xOrig = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC ); @@ -1006,7 +1006,7 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, throw ( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< container::XNameReplace > xOrig = ENSURE_ORIG_INTERFACE( container::XNameReplace, NR ); @@ -1024,7 +1024,7 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, // virtual void SAL_CALL HierarchyDataAccess::commitChanges() - throw ( lang::WrappedTargetException, uno::RuntimeException ) + throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); @@ -1037,7 +1037,7 @@ void SAL_CALL HierarchyDataAccess::commitChanges() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); @@ -1051,7 +1051,7 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges() // virtual uno::Sequence< util::ElementChange > SAL_CALL HierarchyDataAccess::getPendingChanges() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index deafa70c063c..38489e05ee94 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -66,32 +66,32 @@ public: // XComponent virtual void SAL_CALL dispose() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > & xListener ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > & aListener ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XMultiServiceFactory virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString & aServiceSpecifier ) throw ( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier, const com::sun::star::uno::Sequence< com::sun::star::uno::Any > & Arguments ) throw ( com::sun::star::uno::Exception, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // Non-Interface methods diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index a16aff7b03c2..e5e981a68fe0 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -112,7 +112,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyContentProvider ); uno::Reference< ucb::XContent > SAL_CALL HierarchyContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) - throw( ucb::IllegalIdentifierException, uno::RuntimeException ) + throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception ) { HierarchyUri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) @@ -148,7 +148,7 @@ HierarchyContentProvider::queryContent( // virtual void SAL_CALL HierarchyContentProvider::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw( uno::Exception, uno::RuntimeException ) + throw( uno::Exception, uno::RuntimeException, std::exception ) { if ( aArguments.getLength() > 0 ) OSL_FAIL( "HierarchyContentProvider::initialize : not supported!" ); diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index 76206a2f062e..dff3aa942733 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -119,14 +119,14 @@ public: queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw( ::com::sun::star::uno::Exception, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // Non-Interface methods com::sun::star::uno::Reference< diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index a683d347469f..06d1dc696fae 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -302,7 +302,7 @@ void SAL_CALL Content::release() // virtual uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Any aRet; @@ -324,7 +324,7 @@ XTYPEPROVIDER_COMMON_IMPL( Content ); // virtual uno::Sequence< uno::Type > SAL_CALL Content::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = 0; @@ -405,7 +405,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.PackageContent" ); } @@ -413,7 +413,7 @@ OUString SAL_CALL Content::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSNS( 1 ); if ( isFolder() ) @@ -432,7 +432,7 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() // virtual OUString SAL_CALL Content::getContentType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aProps.aContentType; } @@ -450,7 +450,7 @@ uno::Any SAL_CALL Content::execute( const uno::Reference< ucb::XCommandEnvironment >& Environment ) throw( uno::Exception, ucb::CommandAbortedException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Any aRet; @@ -688,7 +688,7 @@ uno::Any SAL_CALL Content::execute( // virtual void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { // @@@ Implement logic to abort running commands, if this makes // sense for your content. @@ -703,7 +703,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aProps.getCreatableContentsInfo( m_aUri ); } @@ -712,7 +712,7 @@ Content::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( isFolder() ) { diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index 77499bfb2b10..f67581e7a37b 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -263,15 +263,15 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -281,10 +281,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Additional interfaces @@ -294,11 +294,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Non-interface methods. diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 3f65059e3e3d..82ebd7a07443 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -65,7 +65,7 @@ public: // XInterface virtual uno::Any SAL_CALL queryInterface( const uno::Type& aType ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_xNA->queryInterface( aType ); } virtual void SAL_CALL acquire() throw() @@ -77,11 +77,11 @@ public: // XHierarchicalNameAccess virtual uno::Any SAL_CALL getByHierarchicalName( const OUString& aName ) - throw( container::NoSuchElementException, uno::RuntimeException ) + throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) { return m_xNA->getByHierarchicalName( aName ); } virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& aName ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_xNA->hasByHierarchicalName( aName ); } }; @@ -194,7 +194,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) - throw( ucb::IllegalIdentifierException, uno::RuntimeException ) + throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception ) { if ( !Identifier.is() ) return uno::Reference< ucb::XContent >(); diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx index 4dcc06b37feb..ebab55583ea6 100644 --- a/ucb/source/ucp/package/pkgprovider.hxx +++ b/ucb/source/ucp/package/pkgprovider.hxx @@ -75,7 +75,7 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // Additional interfaces diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 519e4ae5c143..928601ded7a3 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -189,7 +189,7 @@ void SAL_CALL Content::release() // virtual uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = ContentImplHelper::queryInterface( rType ); @@ -218,7 +218,7 @@ XTYPEPROVIDER_COMMON_IMPL( Content ); // virtual uno::Sequence< uno::Type > SAL_CALL Content::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = 0; @@ -299,7 +299,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.TransientDocumentsContent" ); } @@ -307,7 +307,7 @@ OUString SAL_CALL Content::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -333,7 +333,7 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() // virtual OUString SAL_CALL Content::getContentType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); return m_aProps.getContentType(); @@ -343,7 +343,7 @@ OUString SAL_CALL Content::getContentType() // virtual uno::Reference< ucb::XContentIdentifier > SAL_CALL Content::getIdentifier() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -371,7 +371,7 @@ uno::Any SAL_CALL Content::execute( const uno::Reference< ucb::XCommandEnvironment >& Environment ) throw( uno::Exception, ucb::CommandAbortedException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Any aRet; @@ -663,7 +663,7 @@ uno::Any SAL_CALL Content::execute( // virtual void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { } @@ -676,7 +676,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return m_aProps.getCreatableContentsInfo(); } @@ -685,7 +685,7 @@ Content::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { if ( m_aProps.isContentCreator() ) { diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index 798abf522a35..e73131714b45 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -269,19 +269,19 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -291,10 +291,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Additional interfaces @@ -304,11 +304,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Non-interface methods. diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 5bf5c326ba5f..25eea05807d0 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -65,14 +65,14 @@ using ::comphelper::DocumentInfo; void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::queryClosing( const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ ) throw ( util::CloseVetoException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { } void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosing( const lang::EventObject& Source ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { document::EventObject aDocEvent; aDocEvent.Source = Source.Source; @@ -89,7 +89,7 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin // virtual void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing( const lang::EventObject& /*Source*/ ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { } @@ -183,7 +183,7 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) // virtual void SAL_CALL OfficeDocumentsManager::notifyEvent( const document::EventObject & Event ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { /* Events documentation: OOo Developer's Guide / Writing UNO Components / Jobs @@ -434,7 +434,7 @@ void SAL_CALL OfficeDocumentsManager::notifyEvent( // virtual void SAL_CALL OfficeDocumentsManager::disposing( const lang::EventObject& /*Source*/ ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { } diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 8edd62a671d5..33c1334fd7fc 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -97,16 +97,16 @@ namespace tdoc_ucp { const ::com::sun::star::lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL notifyClosing( const ::com::sun::star::lang::EventObject& Source ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); // lang::XEventListener (base of util::XCloseListener) virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject & Source ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); private: OfficeDocumentsManager * m_pManager; }; @@ -123,12 +123,12 @@ namespace tdoc_ucp { // document::XEventListener virtual void SAL_CALL notifyEvent( const com::sun::star::document::EventObject & Event ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // lang::XEventListener (base of document::XEventListener) virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject & Source ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // Non-interface com::sun::star::uno::Reference< com::sun::star::embed::XStorage > diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index fe67948d25d3..bdda0fa5c96b 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -60,7 +60,7 @@ DocumentContentFactory::~DocumentContentFactory() // virtual OUString SAL_CALL DocumentContentFactory::getImplementationName() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -68,7 +68,7 @@ OUString SAL_CALL DocumentContentFactory::getImplementationName() // virtual sal_Bool SAL_CALL DocumentContentFactory::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -76,7 +76,7 @@ DocumentContentFactory::supportsService( const OUString& ServiceName ) // virtual uno::Sequence< OUString > SAL_CALL DocumentContentFactory::getSupportedServiceNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } @@ -111,7 +111,7 @@ DocumentContentFactory::getSupportedServiceNames_Static() uno::Reference< ucb::XContent > SAL_CALL DocumentContentFactory::createDocumentContent( const uno::Reference< frame::XModel >& Model ) - throw ( lang::IllegalArgumentException, uno::RuntimeException ) + throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { uno::Reference< frame::XTransientDocumentsDocumentContentFactory > xDocFac; try diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx index 6551c7fe46d7..9c8d2f02c1ba 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx @@ -40,15 +40,15 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XTransientDocumentsDocumentContentFactory virtual com::sun::star::uno::Reference< @@ -56,7 +56,7 @@ public: createDocumentContent( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& Model ) throw ( com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // Non-UNO interfaces static OUString diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index 5a3593719343..1a5ddcc35248 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -44,7 +44,7 @@ namespace tdoc_ucp // XInterface virtual uno::Any SAL_CALL queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() @@ -52,19 +52,19 @@ namespace tdoc_ucp // XTypeProvider virtual uno::Sequence< uno::Type > SAL_CALL getTypes() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XInteractionContinuation virtual void SAL_CALL select() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); // XInteractionPassword virtual void SAL_CALL setPassword( const OUString & aPasswd ) - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); virtual OUString SAL_CALL getPassword() - throw ( uno::RuntimeException ); + throw ( uno::RuntimeException, std::exception ); private: osl::Mutex m_aMutex; @@ -105,7 +105,7 @@ void SAL_CALL InteractionSupplyPassword::release() // virtual uno::Any SAL_CALL InteractionSupplyPassword::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -125,7 +125,7 @@ InteractionSupplyPassword::queryInterface( const uno::Type & rType ) // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyPassword::getImplementationId() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { static cppu::OImplementationId * pId = 0; if ( !pId ) @@ -143,7 +143,7 @@ InteractionSupplyPassword::getImplementationId() // virtual uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection * pCollection = 0; if ( !pCollection ) @@ -170,7 +170,7 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes() // virtual void SAL_CALL InteractionSupplyPassword::select() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { recordSelection(); } @@ -184,7 +184,7 @@ void SAL_CALL InteractionSupplyPassword::select() // virtual void SAL_CALL InteractionSupplyPassword::setPassword( const OUString& aPasswd ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); m_aPassword = aPasswd; @@ -192,7 +192,7 @@ InteractionSupplyPassword::setPassword( const OUString& aPasswd ) // virtual OUString SAL_CALL InteractionSupplyPassword::getPassword() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); return m_aPassword; diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 87e360bdc122..422609100a95 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -118,7 +118,7 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) - throw( ucb::IllegalIdentifierException, uno::RuntimeException ) + throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception ) { Uri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) @@ -156,7 +156,7 @@ ContentProvider::queryContent( uno::Reference< ucb::XContent > SAL_CALL ContentProvider::createDocumentContent( const uno::Reference< frame::XModel >& Model ) - throw ( lang::IllegalArgumentException, uno::RuntimeException ) + throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { // model -> id -> content identifier -> queryContent if ( m_xDocsMgr.is() ) diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index d9a54d421b8e..465aa6bbface 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -82,7 +82,7 @@ public: queryContent( const com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( com::sun::star::ucb::IllegalIdentifierException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XTransientDocumentsDocumentContentFactory virtual com::sun::star::uno::Reference< @@ -90,7 +90,7 @@ public: createDocumentContent( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& Model ) throw ( com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // Non-UNO interfaces com::sun::star::uno::Reference< com::sun::star::embed::XStorage > diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index 89183e36f878..a0ec619e44e1 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -154,7 +154,7 @@ Storage::~Storage() // virtual uno::Any SAL_CALL Storage::queryInterface( const uno::Type& aType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { // First, try to use interfaces implemented by myself and base class(es) uno::Any aRet = StorageUNOBase::queryInterface( aType ); @@ -197,7 +197,7 @@ void SAL_CALL Storage::release() // virtual uno::Sequence< uno::Type > SAL_CALL Storage::getTypes() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedTypeProv->getTypes(); } @@ -205,7 +205,7 @@ uno::Sequence< uno::Type > SAL_CALL Storage::getTypes() // virtual uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedTypeProv->getImplementationId(); } @@ -217,7 +217,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId() // virtual void SAL_CALL Storage::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { m_xWrappedStorage->dispose(); } @@ -226,7 +226,7 @@ void SAL_CALL Storage::dispose() // virtual void SAL_CALL Storage::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { m_xWrappedStorage->addEventListener( xListener ); } @@ -234,7 +234,7 @@ void SAL_CALL Storage::addEventListener( // virtual void SAL_CALL Storage::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { m_xWrappedStorage->removeEventListener( aListener ); } @@ -247,7 +247,7 @@ void SAL_CALL Storage::removeEventListener( // virtual uno::Type SAL_CALL Storage::getElementType() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedStorage->getElementType(); } @@ -255,7 +255,7 @@ uno::Type SAL_CALL Storage::getElementType() // virtual ::sal_Bool SAL_CALL Storage::hasElements() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedStorage->hasElements(); } @@ -270,7 +270,7 @@ uno::Type SAL_CALL Storage::getElementType() uno::Any SAL_CALL Storage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedStorage->getByName( aName ); } @@ -278,7 +278,7 @@ uno::Any SAL_CALL Storage::getByName( const OUString& aName ) // virtual uno::Sequence< OUString > SAL_CALL Storage::getElementNames() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedStorage->getElementNames(); } @@ -286,7 +286,7 @@ uno::Sequence< OUString > SAL_CALL Storage::getElementNames() // virtual ::sal_Bool SAL_CALL Storage::hasByName( const OUString& aName ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedStorage->hasByName( aName ); } @@ -304,7 +304,7 @@ void SAL_CALL Storage::copyToStorage( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedStorage->copyToStorage( xDest ); } @@ -318,7 +318,7 @@ uno::Reference< io::XStream > SAL_CALL Storage::openStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedStorage->openStreamElement( aStreamName, nOpenMode ); } @@ -335,7 +335,7 @@ uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedStorage->openEncryptedStreamElement( aStreamName, nOpenMode, aPassword ); @@ -349,7 +349,7 @@ uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedStorage->openStorageElement( aStorName, nOpenMode ); } @@ -363,7 +363,7 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedStorage->cloneStreamElement( aStreamName ); } @@ -379,7 +379,7 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneEncryptedStreamElement( packages::WrongPasswordException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedStorage->cloneEncryptedStreamElement( aStreamName, aPassword ); @@ -393,7 +393,7 @@ void SAL_CALL Storage::copyLastCommitTo( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_xWrappedStorage->copyLastCommitTo( xTargetStorage ); } @@ -407,7 +407,7 @@ void SAL_CALL Storage::copyStorageElementLastCommitTo( lang::IllegalArgumentException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException) + uno::RuntimeException, std::exception) { m_xWrappedStorage->copyStorageElementLastCommitTo( aStorName, xTargetStorage ); } @@ -419,7 +419,7 @@ sal_Bool SAL_CALL Storage::isStreamElement( throw ( container::NoSuchElementException, lang::IllegalArgumentException, embed::InvalidStorageException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedStorage->isStreamElement( aElementName ); } @@ -431,7 +431,7 @@ sal_Bool SAL_CALL Storage::isStorageElement( throw ( container::NoSuchElementException, lang::IllegalArgumentException, embed::InvalidStorageException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedStorage->isStorageElement( aElementName ); } @@ -444,7 +444,7 @@ void SAL_CALL Storage::removeElement( const OUString& aElementName ) container::NoSuchElementException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedStorage->removeElement( aElementName ); } @@ -459,7 +459,7 @@ void SAL_CALL Storage::renameElement( const OUString& aEleName, container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedStorage->renameElement( aEleName, aNewName ); } @@ -476,7 +476,7 @@ void SAL_CALL Storage::copyElementTo( container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedStorage->copyElementTo( aElementName, xDest, aNewName ); } @@ -493,7 +493,7 @@ void SAL_CALL Storage::moveElementTo( container::ElementExistException, io::IOException, embed::StorageWrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedStorage->moveElementTo( aElementName, xDest, rNewName ); } @@ -508,7 +508,7 @@ void SAL_CALL Storage::moveElementTo( void SAL_CALL Storage::commit() throw ( io::IOException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // Never commit a root storage (-> has no parent)! // Would lead in writing the whole document to disk. @@ -540,7 +540,7 @@ void SAL_CALL Storage::commit() void SAL_CALL Storage::revert() throw ( io::IOException, lang::WrappedTargetException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { uno::Reference< embed::XStorage > xParentStorage = getParentStorage(); if ( xParentStorage.is() ) @@ -639,7 +639,7 @@ OutputStream::~OutputStream() // virtual uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = OutputStreamUNOBase::queryInterface( aType ); @@ -660,7 +660,7 @@ uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType ) // virtual uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedTypeProv->getTypes(); } @@ -668,7 +668,7 @@ uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes() // virtual uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedTypeProv->getImplementationId(); } @@ -685,7 +685,7 @@ OutputStream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedStream->writeBytes( aData ); } @@ -697,7 +697,7 @@ OutputStream::flush() throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedStream->flush(); } @@ -709,7 +709,7 @@ OutputStream::closeOutput( ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedStream->closeOutput(); @@ -727,7 +727,7 @@ OutputStream::closeOutput( ) // virtual void SAL_CALL OutputStream::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->dispose(); @@ -741,7 +741,7 @@ OutputStream::dispose() void SAL_CALL OutputStream::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->addEventListener( xListener ); } @@ -751,7 +751,7 @@ OutputStream::addEventListener( void SAL_CALL OutputStream::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->removeEventListener( aListener ); } @@ -834,7 +834,7 @@ Stream::~Stream() // virtual uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = StreamUNOBase::queryInterface( aType ); @@ -855,7 +855,7 @@ uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType ) // virtual uno::Sequence< uno::Type > SAL_CALL Stream::getTypes() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedTypeProv->getTypes(); } @@ -863,7 +863,7 @@ uno::Sequence< uno::Type > SAL_CALL Stream::getTypes() // virtual uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { return m_xWrappedTypeProv->getImplementationId(); } @@ -876,7 +876,7 @@ uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId() // virtual uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return uno::Reference< io::XInputStream >( this ); } @@ -884,7 +884,7 @@ uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream() // virtual uno::Reference< io::XOutputStream > SAL_CALL Stream::getOutputStream() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return uno::Reference< io::XOutputStream >( this ); } @@ -900,7 +900,7 @@ void SAL_CALL Stream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( m_xWrappedOutputStream.is() ) { @@ -915,7 +915,7 @@ void SAL_CALL Stream::flush() throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( m_xWrappedOutputStream.is() ) { @@ -929,7 +929,7 @@ void SAL_CALL Stream::flush() void SAL_CALL Stream::closeOutput() throw( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( m_xWrappedOutputStream.is() ) { @@ -951,7 +951,7 @@ void SAL_CALL Stream::closeOutput() // virtual void SAL_CALL Stream::truncate() throw( io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { if ( m_xWrappedTruncate.is() ) { @@ -972,7 +972,7 @@ sal_Int32 SAL_CALL Stream::readBytes( uno::Sequence< sal_Int8 >& aData, throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedInputStream->readBytes( aData, nBytesToRead ); } @@ -984,7 +984,7 @@ sal_Int32 SAL_CALL Stream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedInputStream->readSomeBytes( aData, nMaxBytesToRead ); } @@ -995,7 +995,7 @@ void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip ) throw( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedInputStream->skipBytes( nBytesToSkip ); } @@ -1005,7 +1005,7 @@ void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL Stream::available() throw( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { return m_xWrappedInputStream->available(); } @@ -1015,7 +1015,7 @@ sal_Int32 SAL_CALL Stream::available() void SAL_CALL Stream::closeInput() throw( io::NotConnectedException, io::IOException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { m_xWrappedInputStream->closeInput(); } @@ -1028,7 +1028,7 @@ void SAL_CALL Stream::closeInput() // virtual void SAL_CALL Stream::dispose() - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->dispose(); @@ -1041,7 +1041,7 @@ void SAL_CALL Stream::dispose() // virtual void SAL_CALL Stream::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->addEventListener( xListener ); } @@ -1050,7 +1050,7 @@ void SAL_CALL Stream::addEventListener( // virtual void SAL_CALL Stream::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->removeEventListener( aListener ); } diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index f2087476ad8a..7f7c60515902 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -95,7 +95,7 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire() throw (); virtual void SAL_CALL release() @@ -105,44 +105,44 @@ public: // delegating to aggregate) virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XComponent ( one of XStorage bases ) virtual void SAL_CALL dispose() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > & xListener ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XNameAccess ( one of XStorage bases ) virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XElementAccess (base of XNameAccess) virtual com::sun::star::uno::Type SAL_CALL getElementType() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL hasElements() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XStorage virtual void SAL_CALL @@ -152,7 +152,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) @@ -161,7 +161,7 @@ public: com::sun::star::packages::WrongPasswordException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, @@ -172,7 +172,7 @@ public: com::sun::star::packages::WrongPasswordException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::embed::XStorage > SAL_CALL openStorageElement( const OUString& aStorName, sal_Int32 nOpenMode ) @@ -180,7 +180,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL cloneStreamElement( const OUString& aStreamName ) throw ( com::sun::star::embed::InvalidStorageException, @@ -188,7 +188,7 @@ public: com::sun::star::packages::WrongPasswordException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XStream > SAL_CALL cloneEncryptedStreamElement( const OUString& aStreamName, const OUString& aPassword ) @@ -198,7 +198,7 @@ public: com::sun::star::packages::WrongPasswordException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyLastCommitTo( const com::sun::star::uno::Reference< com::sun::star::embed::XStorage >& xTargetStorage ) @@ -206,7 +206,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyStorageElementLastCommitTo( const OUString& aStorName, const com::sun::star::uno::Reference< @@ -216,19 +216,19 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isStreamElement( const OUString& aElementName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::embed::InvalidStorageException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL isStorageElement( const OUString& aElementName ) throw ( com::sun::star::container::NoSuchElementException, com::sun::star::lang::IllegalArgumentException, com::sun::star::embed::InvalidStorageException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeElement( const OUString& aElementName ) throw ( com::sun::star::embed::InvalidStorageException, @@ -236,7 +236,7 @@ public: com::sun::star::container::NoSuchElementException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL renameElement( const OUString& aEleName, const OUString& aNewName ) @@ -246,7 +246,7 @@ public: com::sun::star::container::ElementExistException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL copyElementTo( const OUString& aElementName, const com::sun::star::uno::Reference< @@ -258,7 +258,7 @@ public: com::sun::star::container::ElementExistException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL moveElementTo( const OUString& aElementName, const com::sun::star::uno::Reference< @@ -270,17 +270,17 @@ public: com::sun::star::container::ElementExistException, com::sun::star::io::IOException, com::sun::star::embed::StorageWrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XTransactedObject virtual void SAL_CALL commit() throw ( com::sun::star::io::IOException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL revert() throw ( com::sun::star::io::IOException, com::sun::star::lang::WrappedTargetException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); private: Storage( const rtl::Reference< Storage > & rFactory ); // n.i. @@ -327,16 +327,16 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XOutputStream virtual void SAL_CALL @@ -344,34 +344,34 @@ public: throw ( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL flush( ) throw ( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // Note: We need to intercept this one. virtual void SAL_CALL closeOutput( ) throw ( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XComponent // Note: We need to intercept this one. virtual void SAL_CALL dispose() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); private: com::sun::star::uno::Reference< @@ -410,27 +410,27 @@ public: // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const com::sun::star::uno::Type& aType ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) virtual com::sun::star::uno::Sequence< com::sun::star::uno::Type > SAL_CALL getTypes() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); // XStream virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > SAL_CALL getInputStream() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > SAL_CALL getOutputStream() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XOutputStream virtual void SAL_CALL @@ -438,26 +438,26 @@ public: throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL flush() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL closeOutput() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XTruncate virtual void SAL_CALL truncate() throw( com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XInputStream virtual sal_Int32 SAL_CALL @@ -466,7 +466,7 @@ public: throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL readSomeBytes( com::sun::star::uno::Sequence< sal_Int8 >& aData, @@ -474,40 +474,40 @@ public: throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw( com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL available() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL closeInput() throw( com::sun::star::io::NotConnectedException, com::sun::star::io::IOException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // XComponent // Note: We need to intercept this one. virtual void SAL_CALL dispose() - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL addEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& xListener ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeEventListener( const com::sun::star::uno::Reference< com::sun::star::lang::XEventListener >& aListener ) - throw ( com::sun::star::uno::RuntimeException ); + throw ( com::sun::star::uno::RuntimeException, std::exception ); private: void commitChanges() diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx index 0a995ec657da..214391a285ae 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx @@ -54,7 +54,7 @@ void NeonInputStream::AddToStream( const char * inBuf, sal_Int32 inLen ) } Any NeonInputStream::queryInterface( const Type &type ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Any aRet = ::cppu::queryInterface( type, static_cast< XInputStream * >( this ), @@ -68,7 +68,7 @@ sal_Int32 SAL_CALL NeonInputStream::readBytes( throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { // Work out how much we're actually going to write sal_Int32 theBytes2Read = nBytesToRead; @@ -94,7 +94,7 @@ sal_Int32 SAL_CALL NeonInputStream::readSomeBytes( throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { // Warning: What should this be doing ? return readBytes( aData, nMaxBytesToRead ); @@ -105,7 +105,7 @@ void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { mPos += nBytesToSkip; if ( mPos >= mLen ) @@ -116,7 +116,7 @@ void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL NeonInputStream::available( ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { return sal::static_int_cast<sal_Int32>(mLen - mPos); } @@ -124,14 +124,14 @@ sal_Int32 SAL_CALL NeonInputStream::available( ) void SAL_CALL NeonInputStream::closeInput( void ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { } void SAL_CALL NeonInputStream::seek( sal_Int64 location ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { if ( location < 0 ) throw ::com::sun::star::lang::IllegalArgumentException(); @@ -144,14 +144,14 @@ void SAL_CALL NeonInputStream::seek( sal_Int64 location ) sal_Int64 SAL_CALL NeonInputStream::getPosition() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { return mPos; } sal_Int64 SAL_CALL NeonInputStream::getLength() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + ::com::sun::star::uno::RuntimeException, std::exception ) { return mLen; } diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx index 558821e6dc5c..c80b052deafe 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx @@ -60,7 +60,7 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, // XInterface virtual com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL acquire( void ) throw () @@ -78,7 +78,7 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 > & aData, @@ -86,37 +86,37 @@ class NeonInputStream : public ::com::sun::star::io::XInputStream, throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int32 SAL_CALL available( void ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL closeInput( void ) throw( ::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getPosition() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Int64 SAL_CALL getLength() throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index db4e883ff4e4..2ff4dd6beb09 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -190,7 +190,7 @@ void SAL_CALL Content::release() // virtual uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException ) + throw ( uno::RuntimeException, std::exception ) { // Note: isFolder may require network activities! So call it only // if it is really necessary!!! @@ -239,7 +239,7 @@ XTYPEPROVIDER_COMMON_IMPL( Content ); // virtual uno::Sequence< uno::Type > SAL_CALL Content::getTypes() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { sal_Bool bFolder = sal_False; try @@ -334,7 +334,7 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.WebDAVContent" ); } @@ -342,7 +342,7 @@ OUString SAL_CALL Content::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSNS( 1 ); aSNS[ 0 ] = WEBDAV_CONTENT_SERVICE_NAME; @@ -357,7 +357,7 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() // virtual OUString SAL_CALL Content::getContentType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { sal_Bool bFolder = sal_False; try @@ -392,7 +392,7 @@ uno::Any SAL_CALL Content::execute( const uno::Reference< ucb::XCommandEnvironment >& Environment ) throw( uno::Exception, ucb::CommandAbortedException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.webdav", "Content::execute: start: command: " << aCommand.Name << ", env: " << @@ -728,7 +728,7 @@ uno::Any SAL_CALL Content::execute( // virtual void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { try { @@ -991,7 +991,7 @@ void SAL_CALL Content::addProperty( const OUString& Name, throw( beans::PropertyExistException, beans::IllegalTypeException, lang::IllegalArgumentException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { beans::Property aProperty; aProperty.Name = Name; @@ -1007,7 +1007,7 @@ void SAL_CALL Content::addProperty( const OUString& Name, void SAL_CALL Content::removeProperty( const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { removeProperty( Name, uno::Reference< ucb::XCommandEnvironment >() ); @@ -1022,7 +1022,7 @@ void SAL_CALL Content::removeProperty( const OUString& Name ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -1057,7 +1057,7 @@ Content::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index 421db5007953..b7290735261d 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -247,16 +247,16 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -266,10 +266,10 @@ public: com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( com::sun::star::uno::Exception, com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // XPropertyContainer virtual void SAL_CALL @@ -279,13 +279,13 @@ public: throw( com::sun::star::beans::PropertyExistException, com::sun::star::beans::IllegalTypeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); virtual void SAL_CALL removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException ); + com::sun::star::uno::RuntimeException, std::exception ); // Additional interfaces @@ -295,11 +295,11 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > SAL_CALL createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // Non-interface methods. diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index 39de9eacf218..79d7e56e1859 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -117,7 +117,7 @@ ContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) throw( ucb::IllegalIdentifierException, - uno::RuntimeException ) + uno::RuntimeException, std::exception ) { // Check URL scheme... diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index 4e446f608618..6638637c6cea 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -103,7 +103,7 @@ public: queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException ); + ::com::sun::star::uno::RuntimeException, std::exception ); // Additional interfaces |