diff options
Diffstat (limited to 'ucb')
159 files changed, 1294 insertions, 4815 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index e08edb397bc5..93a26824f388 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -203,8 +203,6 @@ bool SAL_CALL CachedContentResultSet::CCRS_Cache Any& SAL_CALL CachedContentResultSet::CCRS_Cache ::getRowAny( sal_Int32 nRow ) - throw( SQLException, - RuntimeException ) { if( !nRow ) throw SQLException(); @@ -269,8 +267,6 @@ Sequence< sal_Bool >* SAL_CALL CachedContentResultSet::CCRS_Cache const Any& SAL_CALL CachedContentResultSet::CCRS_Cache ::getAny( sal_Int32 nRow, sal_Int32 nColumnIndex ) - throw( SQLException, - RuntimeException ) { if( !nColumnIndex ) throw SQLException(); @@ -297,7 +293,6 @@ const Any& SAL_CALL CachedContentResultSet::CCRS_Cache OUString SAL_CALL CachedContentResultSet::CCRS_Cache ::getContentIdentifierString( sal_Int32 nRow ) - throw( css::uno::RuntimeException ) { try { @@ -319,7 +314,6 @@ OUString SAL_CALL CachedContentResultSet::CCRS_Cache Reference< XContentIdentifier > SAL_CALL CachedContentResultSet::CCRS_Cache ::getContentIdentifier( sal_Int32 nRow ) - throw( css::uno::RuntimeException ) { try { @@ -341,7 +335,6 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet::CCRS_Cache Reference< XContent > SAL_CALL CachedContentResultSet::CCRS_Cache ::getContent( sal_Int32 nRow ) - throw( css::uno::RuntimeException ) { try { @@ -398,31 +391,25 @@ public: XPropertySetInfo > const & xPropertySetInfoOrigin ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XPropertySetInfo virtual Sequence< css::beans::Property > SAL_CALL - getProperties() - throw( RuntimeException, std::exception ) override; + getProperties() override; virtual css::beans::Property SAL_CALL - getPropertyByName( const OUString& aName ) - throw( css::beans::UnknownPropertyException, RuntimeException, std::exception ) override; + getPropertyByName( const OUString& aName ) override; virtual sal_Bool SAL_CALL - hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) override; + hasPropertyByName( const OUString& Name ) override; }; //some helping variables ( names for my special properties ) @@ -518,7 +505,6 @@ void SAL_CALL CCRS_PropertySetInfo::release() } css::uno::Any SAL_CALL CCRS_PropertySetInfo::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -539,7 +525,7 @@ XTYPEPROVIDER_IMPL_2( CCRS_PropertySetInfo //virtual Sequence< Property > SAL_CALL CCRS_PropertySetInfo - ::getProperties() throw( RuntimeException, std::exception ) + ::getProperties() { return *m_pProperties; } @@ -547,7 +533,6 @@ Sequence< Property > SAL_CALL CCRS_PropertySetInfo //virtual Property SAL_CALL CCRS_PropertySetInfo ::getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException, std::exception ) { if ( aName.isEmpty() ) throw UnknownPropertyException(); @@ -562,7 +547,6 @@ Property SAL_CALL CCRS_PropertySetInfo //virtual sal_Bool SAL_CALL CCRS_PropertySetInfo ::hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) { return ( impl_getPos( Name ) != -1 ); } @@ -696,8 +680,6 @@ CachedContentResultSet::~CachedContentResultSet() bool SAL_CALL CachedContentResultSet ::applyPositionToOrigin( sal_Int32 nRow ) - throw( SQLException, - RuntimeException ) { impl_EnsureNotDisposed(); @@ -825,7 +807,6 @@ if( bIsFinalCount && !bCurIsFinalCount ) \ void SAL_CALL CachedContentResultSet ::impl_fetchData( sal_Int32 nRow , sal_Int32 nFetchSize, sal_Int32 nFetchDirection ) - throw( css::uno::RuntimeException ) { FETCH_XXX( m_aCache, m_xFetchProvider, fetch ); } @@ -923,7 +904,6 @@ void SAL_CALL CachedContentResultSet::release() Any SAL_CALL CachedContentResultSet ::queryInterface( const Type& rType ) - throw ( RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces @@ -962,19 +942,16 @@ XTYPEPROVIDER_IMPL_11( CachedContentResultSet // XServiceInfo methods. OUString SAL_CALL CachedContentResultSet::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.CachedContentResultSet" ); } sal_Bool SAL_CALL CachedContentResultSet::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL CachedContentResultSet::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CACHED_CONTENT_RESULTSET_SERVICE_NAME }; } @@ -987,11 +964,6 @@ css::uno::Sequence< OUString > SAL_CALL CachedContentResultSet::getSupportedServ // virtual void SAL_CALL CachedContentResultSet ::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw( UnknownPropertyException, - PropertyVetoException, - IllegalArgumentException, - WrappedTargetException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1098,9 +1070,6 @@ void SAL_CALL CachedContentResultSet // virtual Any SAL_CALL CachedContentResultSet ::getPropertyValue( const OUString& rPropertyName ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1157,7 +1126,6 @@ Any SAL_CALL CachedContentResultSet //virtual void SAL_CALL CachedContentResultSet ::impl_disposing( const EventObject& rEventObject ) - throw( RuntimeException ) { { impl_EnsureNotDisposed(); @@ -1172,7 +1140,6 @@ void SAL_CALL CachedContentResultSet //virtual void SAL_CALL CachedContentResultSet ::impl_propertyChange( const PropertyChangeEvent& rEvt ) - throw( RuntimeException ) { impl_EnsureNotDisposed(); @@ -1226,8 +1193,6 @@ void SAL_CALL CachedContentResultSet //virtual void SAL_CALL CachedContentResultSet ::impl_vetoableChange( const PropertyChangeEvent& rEvt ) - throw( PropertyVetoException, - RuntimeException ) { impl_EnsureNotDisposed(); @@ -1306,7 +1271,6 @@ return m_aCache##XXX.get##XXX( nRow ); // virtual OUString SAL_CALL CachedContentResultSet ::queryContentIdentifierString() - throw( RuntimeException, std::exception ) { XCONTENTACCESS_queryXXX( queryContentIdentifierString, ContentIdentifierString, OUString ) } @@ -1315,7 +1279,6 @@ OUString SAL_CALL CachedContentResultSet // virtual Reference< XContentIdentifier > SAL_CALL CachedContentResultSet ::queryContentIdentifier() - throw( RuntimeException, std::exception ) { XCONTENTACCESS_queryXXX( queryContentIdentifier, ContentIdentifier, Reference< XContentIdentifier > ) } @@ -1324,7 +1287,6 @@ Reference< XContentIdentifier > SAL_CALL CachedContentResultSet // virtual Reference< XContent > SAL_CALL CachedContentResultSet ::queryContent() - throw( RuntimeException, std::exception ) { XCONTENTACCESS_queryXXX( queryContent, Content, Reference< XContent > ) } @@ -1336,8 +1298,6 @@ Reference< XContent > SAL_CALL CachedContentResultSet sal_Bool SAL_CALL CachedContentResultSet ::next() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1377,8 +1337,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::previous() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1418,8 +1376,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::absolute( sal_Int32 row ) - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1537,8 +1493,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::relative( sal_Int32 rows ) - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1592,8 +1546,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::first() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1627,8 +1579,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::last() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1676,8 +1626,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual void SAL_CALL CachedContentResultSet ::beforeFirst() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1692,8 +1640,6 @@ void SAL_CALL CachedContentResultSet //virtual void SAL_CALL CachedContentResultSet ::afterLast() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1708,8 +1654,6 @@ void SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::isAfterLast() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1741,8 +1685,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::isBeforeFirst() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1777,8 +1719,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::isFirst() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1812,8 +1752,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::isLast() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1845,8 +1783,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Int32 SAL_CALL CachedContentResultSet ::getRow() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1859,8 +1795,6 @@ sal_Int32 SAL_CALL CachedContentResultSet //virtual void SAL_CALL CachedContentResultSet ::refreshRow() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1871,8 +1805,6 @@ void SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::rowUpdated() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1882,8 +1814,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::rowInserted() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1894,8 +1824,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::rowDeleted() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1906,8 +1834,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual Reference< XInterface > SAL_CALL CachedContentResultSet ::getStatement() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); //@todo ?return anything @@ -1921,8 +1847,6 @@ Reference< XInterface > SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::wasNull() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xRowOrigin(); @@ -1942,8 +1866,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual OUString SAL_CALL CachedContentResultSet ::getString( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<OUString>(&css::sdbc::XRow::getString, columnIndex); } @@ -1951,8 +1873,6 @@ OUString SAL_CALL CachedContentResultSet //virtual sal_Bool SAL_CALL CachedContentResultSet ::getBoolean( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<sal_Bool>(&css::sdbc::XRow::getBoolean, columnIndex); } @@ -1960,8 +1880,6 @@ sal_Bool SAL_CALL CachedContentResultSet //virtual sal_Int8 SAL_CALL CachedContentResultSet ::getByte( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<sal_Int8>(&css::sdbc::XRow::getByte, columnIndex); } @@ -1969,8 +1887,6 @@ sal_Int8 SAL_CALL CachedContentResultSet //virtual sal_Int16 SAL_CALL CachedContentResultSet ::getShort( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<sal_Int16>(&css::sdbc::XRow::getShort, columnIndex); } @@ -1978,8 +1894,6 @@ sal_Int16 SAL_CALL CachedContentResultSet //virtual sal_Int32 SAL_CALL CachedContentResultSet ::getInt( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<sal_Int32>(&css::sdbc::XRow::getInt, columnIndex); } @@ -1987,8 +1901,6 @@ sal_Int32 SAL_CALL CachedContentResultSet //virtual sal_Int64 SAL_CALL CachedContentResultSet ::getLong( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<sal_Int64>(&css::sdbc::XRow::getLong, columnIndex); } @@ -1996,8 +1908,6 @@ sal_Int64 SAL_CALL CachedContentResultSet //virtual float SAL_CALL CachedContentResultSet ::getFloat( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<float>(&css::sdbc::XRow::getFloat, columnIndex); } @@ -2005,8 +1915,6 @@ float SAL_CALL CachedContentResultSet //virtual double SAL_CALL CachedContentResultSet ::getDouble( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<double>(&css::sdbc::XRow::getDouble, columnIndex); } @@ -2014,8 +1922,6 @@ double SAL_CALL CachedContentResultSet //virtual Sequence< sal_Int8 > SAL_CALL CachedContentResultSet ::getBytes( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet< css::uno::Sequence<sal_Int8> >( &css::sdbc::XRow::getBytes, columnIndex); @@ -2024,8 +1930,6 @@ Sequence< sal_Int8 > SAL_CALL CachedContentResultSet //virtual Date SAL_CALL CachedContentResultSet ::getDate( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<css::util::Date>( &css::sdbc::XRow::getDate, columnIndex); @@ -2034,8 +1938,6 @@ Date SAL_CALL CachedContentResultSet //virtual Time SAL_CALL CachedContentResultSet ::getTime( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<css::util::Time>( &css::sdbc::XRow::getTime, columnIndex); @@ -2044,8 +1946,6 @@ Time SAL_CALL CachedContentResultSet //virtual DateTime SAL_CALL CachedContentResultSet ::getTimestamp( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet<css::util::DateTime>( &css::sdbc::XRow::getTimestamp, columnIndex); @@ -2055,8 +1955,6 @@ DateTime SAL_CALL CachedContentResultSet Reference< css::io::XInputStream > SAL_CALL CachedContentResultSet ::getBinaryStream( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::io::XInputStream> >( &css::sdbc::XRow::getBinaryStream, columnIndex); @@ -2066,8 +1964,6 @@ Reference< css::io::XInputStream > Reference< css::io::XInputStream > SAL_CALL CachedContentResultSet ::getCharacterStream( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::io::XInputStream> >( &css::sdbc::XRow::getCharacterStream, columnIndex); @@ -2078,8 +1974,6 @@ Any SAL_CALL CachedContentResultSet ::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) - throw( SQLException, - RuntimeException, std::exception ) { //if you change this function please pay attention to //function template rowOriginGet, where this is similar implemented @@ -2126,8 +2020,6 @@ Any SAL_CALL CachedContentResultSet //virtual Reference< XRef > SAL_CALL CachedContentResultSet ::getRef( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::sdbc::XRef> >( &css::sdbc::XRow::getRef, columnIndex); @@ -2136,8 +2028,6 @@ Reference< XRef > SAL_CALL CachedContentResultSet //virtual Reference< XBlob > SAL_CALL CachedContentResultSet ::getBlob( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::sdbc::XBlob> >( &css::sdbc::XRow::getBlob, columnIndex); @@ -2146,8 +2036,6 @@ Reference< XBlob > SAL_CALL CachedContentResultSet //virtual Reference< XClob > SAL_CALL CachedContentResultSet ::getClob( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::sdbc::XClob> >( &css::sdbc::XRow::getClob, columnIndex); @@ -2156,8 +2044,6 @@ Reference< XClob > SAL_CALL CachedContentResultSet //virtual Reference< XArray > SAL_CALL CachedContentResultSet ::getArray( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { return rowOriginGet< css::uno::Reference<css::sdbc::XArray> >( &css::sdbc::XRow::getArray, columnIndex); @@ -2212,7 +2098,6 @@ void SAL_CALL CachedContentResultSetFactory::release() } css::uno::Any SAL_CALL CachedContentResultSetFactory::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -2238,7 +2123,6 @@ XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetFactory, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL CachedContentResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new CachedContentResultSetFactory( ucbhelper::getComponentContext(rSMgr) )); @@ -2266,7 +2150,6 @@ Reference< XResultSet > SAL_CALL CachedContentResultSetFactory ::createCachedContentResultSet( const Reference< XResultSet > & xSource, const Reference< XContentIdentifierMapping > & xMapping ) - throw( css::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 bced10f312e1..ae3c02c525b3 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -62,9 +62,7 @@ class CachedContentResultSet /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException css::uno::Any& SAL_CALL - getRowAny( sal_Int32 nRow ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException ); + getRowAny( sal_Int32 nRow ); void SAL_CALL clear(); @@ -97,24 +95,19 @@ class CachedContentResultSet /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException const css::uno::Any& SAL_CALL - getAny( sal_Int32 nRow, sal_Int32 nColumnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException ); + getAny( sal_Int32 nRow, sal_Int32 nColumnIndex ); /// @throws css::uno::RuntimeException OUString SAL_CALL - getContentIdentifierString( sal_Int32 nRow ) - throw( css::uno::RuntimeException ); + getContentIdentifierString( sal_Int32 nRow ); /// @throws css::uno::RuntimeException css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - getContentIdentifier( sal_Int32 nRow ) - throw( css::uno::RuntimeException ); + getContentIdentifier( sal_Int32 nRow ); /// @throws css::uno::RuntimeException css::uno::Reference< css::ucb::XContent > SAL_CALL - getContent( sal_Int32 nRow ) - throw( css::uno::RuntimeException ); + getContent( sal_Int32 nRow ); }; //members @@ -167,15 +160,12 @@ private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException bool SAL_CALL - applyPositionToOrigin( sal_Int32 nRow ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException ); + applyPositionToOrigin( sal_Int32 nRow ); /// @throws css::uno::RuntimeException void SAL_CALL impl_fetchData( sal_Int32 nRow, sal_Int32 nCount - , sal_Int32 nFetchDirection ) - throw( css::uno::RuntimeException ); + , sal_Int32 nFetchDirection ); bool SAL_CALL impl_isKnownValidPosition( sal_Int32 nRow ); @@ -199,8 +189,7 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() @@ -208,250 +197,154 @@ public: // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XPropertySet inherited virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL - getPropertyValue( const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + getPropertyValue( const OUString& PropertyName ) override; // own inherited virtual void SAL_CALL - impl_disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException ) override; + impl_disposing( const css::lang::EventObject& Source ) override; virtual void SAL_CALL - impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) - throw( css::uno::RuntimeException ) override; + impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) override; virtual void SAL_CALL - impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) - throw( css::beans::PropertyVetoException, - css::uno::RuntimeException ) override; + impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) override; // XContentAccess inherited virtual OUString SAL_CALL - queryContentIdentifierString() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifierString() override; virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - queryContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifier() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent() - throw( css::uno::RuntimeException, std::exception ) override; + queryContent() override; // XResultSet inherited virtual sal_Bool SAL_CALL - next() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + next() override; virtual sal_Bool SAL_CALL - isBeforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + isBeforeFirst() override; virtual sal_Bool SAL_CALL - isAfterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + isAfterLast() override; virtual sal_Bool SAL_CALL - isFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + isFirst() override; virtual sal_Bool SAL_CALL - isLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + isLast() override; virtual void SAL_CALL - beforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + beforeFirst() override; virtual void SAL_CALL - afterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + afterLast() override; virtual sal_Bool SAL_CALL - first() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + first() override; virtual sal_Bool SAL_CALL - last() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + last() override; virtual sal_Int32 SAL_CALL - getRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getRow() override; virtual sal_Bool SAL_CALL - absolute( sal_Int32 row ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + absolute( sal_Int32 row ) override; virtual sal_Bool SAL_CALL - relative( sal_Int32 rows ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + relative( sal_Int32 rows ) override; virtual sal_Bool SAL_CALL - previous() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + previous() override; virtual void SAL_CALL - refreshRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + refreshRow() override; virtual sal_Bool SAL_CALL - rowUpdated() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + rowUpdated() override; virtual sal_Bool SAL_CALL - rowInserted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + rowInserted() override; virtual sal_Bool SAL_CALL - rowDeleted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + rowDeleted() override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getStatement() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getStatement() override; // XRow inherited virtual sal_Bool SAL_CALL - wasNull() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + wasNull() override; virtual OUString SAL_CALL - getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getString( sal_Int32 columnIndex ) override; virtual sal_Bool SAL_CALL - getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getBoolean( sal_Int32 columnIndex ) override; virtual sal_Int8 SAL_CALL - getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getByte( sal_Int32 columnIndex ) override; virtual sal_Int16 SAL_CALL - getShort( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getShort( sal_Int32 columnIndex ) override; virtual sal_Int32 SAL_CALL - getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getInt( sal_Int32 columnIndex ) override; virtual sal_Int64 SAL_CALL - getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getLong( sal_Int32 columnIndex ) override; virtual float SAL_CALL - getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getFloat( sal_Int32 columnIndex ) override; virtual double SAL_CALL - getDouble( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getDouble( sal_Int32 columnIndex ) override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getBytes( sal_Int32 columnIndex ) override; virtual css::util::Date SAL_CALL - getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getDate( sal_Int32 columnIndex ) override; virtual css::util::Time SAL_CALL - getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getTime( sal_Int32 columnIndex ) override; virtual css::util::DateTime SAL_CALL - getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getTimestamp( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getBinaryStream( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getCharacterStream( sal_Int32 columnIndex ) override; virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL - getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getRef( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL - getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getBlob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL - getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getClob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL - getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getArray( sal_Int32 columnIndex ) override; // Type Converter support @@ -486,26 +379,20 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -519,8 +406,7 @@ public: virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createCachedContentResultSet( const css::uno::Reference< css::sdbc::XResultSet > & xSource, - const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xMapping ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifierMapping > & xMapping ) override; }; #endif diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 19cdff4d5205..99f45f02c9dd 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -67,7 +67,6 @@ void SAL_CALL CachedContentResultSetStub::release() Any SAL_CALL CachedContentResultSetStub ::queryInterface( const Type& rType ) - throw ( RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces @@ -92,7 +91,6 @@ Any SAL_CALL CachedContentResultSetStub //virtual void SAL_CALL CachedContentResultSetStub ::impl_propertyChange( const PropertyChangeEvent& rEvt ) - throw( RuntimeException ) { impl_EnsureNotDisposed(); @@ -113,8 +111,6 @@ void SAL_CALL CachedContentResultSetStub //virtual void SAL_CALL CachedContentResultSetStub ::impl_vetoableChange( const PropertyChangeEvent& rEvt ) - throw( PropertyVetoException, - RuntimeException ) { impl_EnsureNotDisposed(); @@ -139,7 +135,6 @@ XTYPEPROVIDER_COMMON_IMPL( CachedContentResultSetStub ) //list all interfaces exclusive baseclasses Sequence< Type > SAL_CALL CachedContentResultSetStub ::getTypes() - throw( RuntimeException, std::exception ) { static Sequence< Type >* pTypes = nullptr; if( !pTypes ) @@ -170,19 +165,16 @@ Sequence< Type > SAL_CALL CachedContentResultSetStub // XServiceInfo methods. OUString SAL_CALL CachedContentResultSetStub::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.CachedContentResultSetStub" ); } sal_Bool SAL_CALL CachedContentResultSetStub::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL CachedContentResultSetStub::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CACHED_CRS_STUB_SERVICE_NAME }; } @@ -308,7 +300,6 @@ return aRet; FetchResult SAL_CALL CachedContentResultSetStub ::fetch( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( RuntimeException, std::exception ) { impl_init_xRowOrigin(); FETCH_XXX( impl_getCurrentRowContent, m_xRowOrigin ); @@ -347,7 +338,6 @@ sal_Int32 SAL_CALL CachedContentResultSetStub void SAL_CALL CachedContentResultSetStub ::impl_getCurrentRowContent( Any& rRowContent , const Reference< XRow >& xRow ) - throw ( SQLException, RuntimeException ) { sal_Int32 nCount = impl_getColumnCount(); @@ -362,7 +352,6 @@ void SAL_CALL CachedContentResultSetStub void SAL_CALL CachedContentResultSetStub ::impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection ) - throw ( RuntimeException ) { //this is done only for the case, that there is another CachedContentResultSet in the chain of underlying ResultSets @@ -452,7 +441,6 @@ void SAL_CALL CachedContentResultSetStub void SAL_CALL CachedContentResultSetStub ::impl_getCurrentContentIdentifierString( Any& rAny , const Reference< XContentAccess >& xContentAccess ) - throw ( RuntimeException ) { rAny <<= xContentAccess->queryContentIdentifierString(); } @@ -460,7 +448,6 @@ void SAL_CALL CachedContentResultSetStub void SAL_CALL CachedContentResultSetStub ::impl_getCurrentContentIdentifier( Any& rAny , const Reference< XContentAccess >& xContentAccess ) - throw ( RuntimeException ) { rAny <<= xContentAccess->queryContentIdentifier(); } @@ -468,7 +455,6 @@ void SAL_CALL CachedContentResultSetStub void SAL_CALL CachedContentResultSetStub ::impl_getCurrentContent( Any& rAny , const Reference< XContentAccess >& xContentAccess ) - throw ( RuntimeException ) { rAny <<= xContentAccess->queryContent(); } @@ -477,7 +463,6 @@ void SAL_CALL CachedContentResultSetStub FetchResult SAL_CALL CachedContentResultSetStub ::fetchContentIdentifierStrings( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( css::uno::RuntimeException, std::exception ) { impl_init_xContentAccessOrigin(); FETCH_XXX( impl_getCurrentContentIdentifierString, m_xContentAccessOrigin ); @@ -487,7 +472,6 @@ FetchResult SAL_CALL CachedContentResultSetStub FetchResult SAL_CALL CachedContentResultSetStub ::fetchContentIdentifiers( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( css::uno::RuntimeException, std::exception ) { impl_init_xContentAccessOrigin(); FETCH_XXX( impl_getCurrentContentIdentifier, m_xContentAccessOrigin ); @@ -497,7 +481,6 @@ FetchResult SAL_CALL CachedContentResultSetStub FetchResult SAL_CALL CachedContentResultSetStub ::fetchContents( sal_Int32 nRowStartPosition , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( css::uno::RuntimeException, std::exception ) { impl_init_xContentAccessOrigin(); FETCH_XXX( impl_getCurrentContent, m_xContentAccessOrigin ); @@ -532,7 +515,6 @@ void SAL_CALL CachedContentResultSetStubFactory::release() } css::uno::Any SAL_CALL CachedContentResultSetStubFactory::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -558,7 +540,6 @@ XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetStubFactory, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL CachedContentResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new CachedContentResultSetStubFactory( rSMgr )); @@ -583,7 +564,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedContentResultSetStubFactory ); Reference< XResultSet > SAL_CALL CachedContentResultSetStubFactory ::createCachedContentResultSetStub( const Reference< XResultSet > & xSource ) - throw( RuntimeException, std::exception ) { if( xSource.is() ) { diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 85cbe1860c6f..81387c50867a 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -55,9 +55,7 @@ private: void SAL_CALL impl_getCurrentRowContent( css::uno::Any& rRowContent, - const css::uno::Reference< css::sdbc::XRow >& xRow ) - throw ( css::sdbc::SQLException - , css::uno::RuntimeException ); + const css::uno::Reference< css::sdbc::XRow >& xRow ); sal_Int32 SAL_CALL impl_getColumnCount(); @@ -66,27 +64,23 @@ private: static void SAL_CALL impl_getCurrentContentIdentifierString( css::uno::Any& rAny - , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ) - throw ( css::uno::RuntimeException ); + , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); /// @throws css::uno::RuntimeException static void SAL_CALL impl_getCurrentContentIdentifier( css::uno::Any& rAny - , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ) - throw ( css::uno::RuntimeException ); + , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); /// @throws css::uno::RuntimeException static void SAL_CALL impl_getCurrentContent( css::uno::Any& rAny - , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ) - throw ( css::uno::RuntimeException ); + , const css::uno::Reference< css::ucb::XContentAccess >& xContentAccess ); /// @throws css::uno::RuntimeException void SAL_CALL - impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection ) - throw ( css::uno::RuntimeException ); + impl_propagateFetchSizeAndDirection( sal_Int32 nFetchSize, bool bFetchDirection ); public: CachedContentResultSetStub( css::uno::Reference< css::sdbc::XResultSet > const & xOrigin ); @@ -95,8 +89,7 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() @@ -105,54 +98,42 @@ public: // own inherited virtual void SAL_CALL - impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) - throw( css::uno::RuntimeException ) override; + impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) override; virtual void SAL_CALL - impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) - throw( css::beans::PropertyVetoException, - css::uno::RuntimeException ) override; + impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XFetchProvider virtual css::ucb::FetchResult SAL_CALL fetch( sal_Int32 nRowStartPosition - , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( css::uno::RuntimeException, std::exception ) override; + , sal_Int32 nRowCount, sal_Bool bDirection ) override; // XFetchProviderForContentAccess virtual css::ucb::FetchResult SAL_CALL fetchContentIdentifierStrings( sal_Int32 nRowStartPosition - , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( css::uno::RuntimeException, std::exception ) override; + , sal_Int32 nRowCount, sal_Bool bDirection ) override; virtual css::ucb::FetchResult SAL_CALL fetchContentIdentifiers( sal_Int32 nRowStartPosition - , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( css::uno::RuntimeException, std::exception ) override; + , sal_Int32 nRowCount, sal_Bool bDirection ) override; virtual css::ucb::FetchResult SAL_CALL fetchContents( sal_Int32 nRowStartPosition - , sal_Int32 nRowCount, sal_Bool bDirection ) - throw( css::uno::RuntimeException, std::exception ) override; + , sal_Int32 nRowCount, sal_Bool bDirection ) override; }; @@ -174,27 +155,21 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -207,8 +182,7 @@ public: virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL createCachedContentResultSetStub( - const css::uno::Reference< css::sdbc::XResultSet > & xSource ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::sdbc::XResultSet > & xSource ) override; }; #endif diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index 783d35f6f341..d72688f8d688 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -89,7 +89,6 @@ void SAL_CALL CachedDynamicResultSet::release() Any SAL_CALL CachedDynamicResultSet ::queryInterface( const Type& rType ) - throw ( RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces @@ -119,19 +118,16 @@ XTYPEPROVIDER_IMPL_4( CachedDynamicResultSet // XServiceInfo methods. OUString SAL_CALL CachedDynamicResultSet::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.CachedDynamicResultSet" ); } sal_Bool SAL_CALL CachedDynamicResultSet::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSet::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CACHED_DRS_SERVICE_NAME }; } @@ -142,7 +138,6 @@ css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSet::getSupportedServ //virtual void SAL_CALL CachedDynamicResultSet ::impl_disposing( const EventObject& Source ) - throw( RuntimeException ) { DynamicResultSetWrapper::impl_disposing( Source ); m_xContentIdentifierMapping.clear(); @@ -177,7 +172,6 @@ void SAL_CALL CachedDynamicResultSetFactory::release() } css::uno::Any SAL_CALL CachedDynamicResultSetFactory::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -203,7 +197,6 @@ XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetFactory, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL CachedDynamicResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new CachedDynamicResultSetFactory( ucbhelper::getComponentContext(rSMgr) )); @@ -231,7 +224,6 @@ Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetFactory ::createCachedDynamicResultSet( const Reference< XDynamicResultSet > & SourceStub , const Reference< XContentIdentifierMapping > & ContentIdentifierMapping ) - 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 c16a272701ad..07b9f991d716 100644 --- a/ucb/source/cacher/cacheddynamicresultset.hxx +++ b/ucb/source/cacher/cacheddynamicresultset.hxx @@ -51,8 +51,7 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() @@ -60,24 +59,18 @@ public: // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // own methods ( inherited ) virtual void SAL_CALL - impl_disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException ) override; + impl_disposing( const css::lang::EventObject& Source ) override; }; @@ -99,27 +92,21 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -134,8 +121,7 @@ public: createCachedDynamicResultSet( const css::uno::Reference< css::ucb::XDynamicResultSet > & SourceStub , const css::uno::Reference< css::ucb::XContentIdentifierMapping > & ContentIdentifierMapping - ) - throw( css::uno::RuntimeException, std::exception ) override; + ) override; }; #endif diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 293063673652..e25fa173bcf1 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -90,7 +90,6 @@ void SAL_CALL CachedDynamicResultSetStub::release() Any SAL_CALL CachedDynamicResultSetStub ::queryInterface( const Type& rType ) - throw ( RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces @@ -121,19 +120,16 @@ XTYPEPROVIDER_IMPL_5( CachedDynamicResultSetStub // XServiceInfo methods. OUString SAL_CALL CachedDynamicResultSetStub::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.CachedDynamicResultSetStub" ); } sal_Bool SAL_CALL CachedDynamicResultSetStub::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL CachedDynamicResultSetStub::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CACHED_DRS_STUB_SERVICE_NAME }; } @@ -168,7 +164,6 @@ void SAL_CALL CachedDynamicResultSetStubFactory::release() } css::uno::Any SAL_CALL CachedDynamicResultSetStubFactory::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -194,7 +189,6 @@ XSERVICEINFO_COMMOM_IMPL( CachedDynamicResultSetStubFactory, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL CachedDynamicResultSetStubFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new CachedDynamicResultSetStubFactory( ucbhelper::getComponentContext(rSMgr) )); @@ -221,7 +215,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( CachedDynamicResultSetStubFactory ); Reference< XDynamicResultSet > SAL_CALL CachedDynamicResultSetStubFactory ::createCachedDynamicResultSetStub( const Reference< XDynamicResultSet > & Source ) - throw( RuntimeException, std::exception ) { Reference< XDynamicResultSet > xRet; xRet = new CachedDynamicResultSetStub( Source, m_xContext ); @@ -236,9 +229,6 @@ void SAL_CALL CachedDynamicResultSetStubFactory , const Sequence< NumberedSortingInfo > & SortingInfo , const Reference< XAnyCompareFactory > & CompareFactory ) - throw ( ListenerAlreadySetException - , AlreadyInitializedException - , 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 afc6144830d0..54edc472ad7b 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx @@ -46,8 +46,7 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() @@ -55,18 +54,13 @@ public: // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; @@ -87,26 +81,20 @@ public: virtual ~CachedDynamicResultSetStubFactory() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -119,8 +107,7 @@ public: virtual css::uno::Reference< css::ucb::XDynamicResultSet > SAL_CALL createCachedDynamicResultSetStub( - const css::uno::Reference< css::ucb::XDynamicResultSet > & Source ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XDynamicResultSet > & Source ) override; virtual void SAL_CALL connectToCache( @@ -128,12 +115,7 @@ public: , const css::uno::Reference< css::ucb::XDynamicResultSet > & TargetCache , const css::uno::Sequence< css::ucb::NumberedSortingInfo > & SortingInfo , const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory - ) - throw ( - css::ucb::ListenerAlreadySetException - , css::ucb::AlreadyInitializedException - , css::uno::RuntimeException, std::exception - ) override; + ) override; }; #endif diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index f336f607dd04..06a7b1f8a129 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -168,7 +168,6 @@ void SAL_CALL ContentResultSetWrapper::impl_initPropertySetInfo() } void SAL_CALL ContentResultSetWrapper::impl_EnsureNotDisposed() - throw( DisposedException, RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( m_bDisposed ) @@ -230,8 +229,6 @@ void SAL_CALL ContentResultSetWrapper::impl_notifyPropertyChangeListeners( const } void SAL_CALL ContentResultSetWrapper::impl_notifyVetoableChangeListeners( const PropertyChangeEvent& rEvt ) - throw( PropertyVetoException, - RuntimeException ) { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -324,7 +321,6 @@ bool SAL_CALL ContentResultSetWrapper::impl_isForwardOnly() // XInterface methods. css::uno::Any SAL_CALL ContentResultSetWrapper::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces css::uno::Any aRet = cppu::queryInterface( rType, @@ -343,7 +339,6 @@ css::uno::Any SAL_CALL ContentResultSetWrapper::queryInterface( const css::uno:: // virtual void SAL_CALL ContentResultSetWrapper::dispose() - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -437,7 +432,6 @@ void SAL_CALL ContentResultSetWrapper::dispose() // virtual void SAL_CALL ContentResultSetWrapper::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -452,7 +446,6 @@ void SAL_CALL ContentResultSetWrapper::addEventListener( const Reference< XEvent // virtual void SAL_CALL ContentResultSetWrapper::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -466,8 +459,6 @@ void SAL_CALL ContentResultSetWrapper::removeEventListener( const Reference< XEv //virtual void SAL_CALL ContentResultSetWrapper::close() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); dispose(); @@ -478,8 +469,6 @@ void SAL_CALL ContentResultSetWrapper::close() //virtual Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper::getMetaData() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -508,7 +497,6 @@ Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper::getMetaData() // virtual Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper::getPropertySetInfo() - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); { @@ -522,11 +510,6 @@ Reference< XPropertySetInfo > SAL_CALL ContentResultSetWrapper::getPropertySetIn // virtual void SAL_CALL ContentResultSetWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw( UnknownPropertyException, - PropertyVetoException, - IllegalArgumentException, - WrappedTargetException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xPropertySetOrigin(); @@ -541,9 +524,6 @@ void SAL_CALL ContentResultSetWrapper::setPropertyValue( const OUString& rProper // virtual Any SAL_CALL ContentResultSetWrapper::getPropertyValue( const OUString& rPropertyName ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xPropertySetOrigin(); @@ -558,9 +538,6 @@ Any SAL_CALL ContentResultSetWrapper::getPropertyValue( const OUString& rPropert // virtual void SAL_CALL ContentResultSetWrapper::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -607,9 +584,6 @@ void SAL_CALL ContentResultSetWrapper::addPropertyChangeListener( const OUString // virtual void SAL_CALL ContentResultSetWrapper::addVetoableChangeListener( const OUString& rPropertyName, const Reference< XVetoableChangeListener >& xListener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -655,9 +629,6 @@ void SAL_CALL ContentResultSetWrapper::addVetoableChangeListener( const OUString // virtual void SAL_CALL ContentResultSetWrapper::removePropertyChangeListener( const OUString& rPropertyName, const Reference< XPropertyChangeListener >& xListener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -711,9 +682,6 @@ void SAL_CALL ContentResultSetWrapper::removePropertyChangeListener( const OUStr // virtual void SAL_CALL ContentResultSetWrapper::removeVetoableChangeListener( const OUString& rPropertyName, const Reference< XVetoableChangeListener >& xListener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -770,7 +738,6 @@ void SAL_CALL ContentResultSetWrapper::removeVetoableChangeListener( const OUStr //virtual void SAL_CALL ContentResultSetWrapper::impl_disposing( const EventObject& ) - throw( RuntimeException ) { impl_EnsureNotDisposed(); @@ -794,7 +761,6 @@ void SAL_CALL ContentResultSetWrapper::impl_disposing( const EventObject& ) //virtual void SAL_CALL ContentResultSetWrapper::impl_propertyChange( const PropertyChangeEvent& rEvt ) - throw( RuntimeException ) { impl_EnsureNotDisposed(); @@ -806,8 +772,6 @@ void SAL_CALL ContentResultSetWrapper::impl_propertyChange( const PropertyChange //virtual void SAL_CALL ContentResultSetWrapper::impl_vetoableChange( const PropertyChangeEvent& rEvt ) - throw( PropertyVetoException, - RuntimeException ) { impl_EnsureNotDisposed(); @@ -824,7 +788,6 @@ void SAL_CALL ContentResultSetWrapper::impl_vetoableChange( const PropertyChange // virtual OUString SAL_CALL ContentResultSetWrapper::queryContentIdentifierString() - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xContentAccessOrigin(); @@ -839,7 +802,6 @@ OUString SAL_CALL ContentResultSetWrapper::queryContentIdentifierString() // virtual Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper::queryContentIdentifier() - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xContentAccessOrigin(); @@ -854,7 +816,6 @@ Reference< XContentIdentifier > SAL_CALL ContentResultSetWrapper::queryContentId // virtual Reference< XContent > SAL_CALL ContentResultSetWrapper::queryContent() - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xContentAccessOrigin(); @@ -872,8 +833,6 @@ Reference< XContent > SAL_CALL ContentResultSetWrapper::queryContent() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::next() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -887,8 +846,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::next() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::previous() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -902,8 +859,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::previous() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::absolute( sal_Int32 row ) - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -917,8 +872,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::absolute( sal_Int32 row ) //virtual sal_Bool SAL_CALL ContentResultSetWrapper::relative( sal_Int32 rows ) - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -933,8 +886,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::relative( sal_Int32 rows ) //virtual sal_Bool SAL_CALL ContentResultSetWrapper::first() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -948,8 +899,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::first() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::last() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -963,8 +912,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::last() //virtual void SAL_CALL ContentResultSetWrapper::beforeFirst() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -978,8 +925,6 @@ void SAL_CALL ContentResultSetWrapper::beforeFirst() //virtual void SAL_CALL ContentResultSetWrapper::afterLast() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -993,8 +938,6 @@ void SAL_CALL ContentResultSetWrapper::afterLast() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::isAfterLast() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1008,8 +951,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::isAfterLast() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::isBeforeFirst() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1023,8 +964,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::isBeforeFirst() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::isFirst() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1038,8 +977,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::isFirst() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::isLast() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1054,8 +991,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::isLast() //virtual sal_Int32 SAL_CALL ContentResultSetWrapper::getRow() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1069,8 +1004,6 @@ sal_Int32 SAL_CALL ContentResultSetWrapper::getRow() //virtual void SAL_CALL ContentResultSetWrapper::refreshRow() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1084,8 +1017,6 @@ void SAL_CALL ContentResultSetWrapper::refreshRow() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::rowUpdated() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1099,8 +1030,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::rowUpdated() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::rowInserted() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1114,8 +1043,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::rowInserted() //virtual sal_Bool SAL_CALL ContentResultSetWrapper::rowDeleted() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -1129,8 +1056,6 @@ sal_Bool SAL_CALL ContentResultSetWrapper::rowDeleted() //virtual Reference< XInterface > SAL_CALL ContentResultSetWrapper::getStatement() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); //@todo ?return anything @@ -1153,8 +1078,6 @@ return m_xRowOrigin->getXXX( columnIndex ); //virtual sal_Bool SAL_CALL ContentResultSetWrapper::wasNull() - throw( SQLException, - RuntimeException, std::exception ) { impl_EnsureNotDisposed(); impl_init_xRowOrigin(); @@ -1168,120 +1091,90 @@ sal_Bool SAL_CALL ContentResultSetWrapper::wasNull() //virtual OUString SAL_CALL ContentResultSetWrapper::getString( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getString ); } //virtual sal_Bool SAL_CALL ContentResultSetWrapper::getBoolean( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getBoolean ); } //virtual sal_Int8 SAL_CALL ContentResultSetWrapper::getByte( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getByte ); } //virtual sal_Int16 SAL_CALL ContentResultSetWrapper::getShort( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getShort ); } //virtual sal_Int32 SAL_CALL ContentResultSetWrapper::getInt( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getInt ); } //virtual sal_Int64 SAL_CALL ContentResultSetWrapper::getLong( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getLong ); } //virtual float SAL_CALL ContentResultSetWrapper::getFloat( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getFloat ); } //virtual double SAL_CALL ContentResultSetWrapper::getDouble( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getDouble ); } //virtual Sequence< sal_Int8 > SAL_CALL ContentResultSetWrapper::getBytes( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getBytes ); } //virtual Date SAL_CALL ContentResultSetWrapper::getDate( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getDate ); } //virtual Time SAL_CALL ContentResultSetWrapper::getTime( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getTime ); } //virtual DateTime SAL_CALL ContentResultSetWrapper::getTimestamp( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getTimestamp ); } //virtual Reference< css::io::XInputStream > SAL_CALL ContentResultSetWrapper::getBinaryStream( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getBinaryStream ); } //virtual Reference< css::io::XInputStream > SAL_CALL ContentResultSetWrapper::getCharacterStream( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getCharacterStream ); } //virtual Any SAL_CALL ContentResultSetWrapper::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) - throw( SQLException, - RuntimeException, std::exception ) { //if you change this macro please pay attention to //define XROW_GETXXX, where this is similar implemented @@ -1298,32 +1191,24 @@ Any SAL_CALL ContentResultSetWrapper::getObject( sal_Int32 columnIndex, const Re //virtual Reference< XRef > SAL_CALL ContentResultSetWrapper::getRef( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getRef ); } //virtual Reference< XBlob > SAL_CALL ContentResultSetWrapper::getBlob( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getBlob ); } //virtual Reference< XClob > SAL_CALL ContentResultSetWrapper::getClob( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getClob ); } //virtual Reference< XArray > SAL_CALL ContentResultSetWrapper::getArray( sal_Int32 columnIndex ) - throw( SQLException, - RuntimeException, std::exception ) { XROW_GETXXX( getArray ); } @@ -1357,7 +1242,6 @@ void SAL_CALL ContentResultSetWrapperListener::release() } css::uno::Any SAL_CALL ContentResultSetWrapperListener::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces css::uno::Any aRet = cppu::queryInterface( rType, @@ -1374,7 +1258,6 @@ css::uno::Any SAL_CALL ContentResultSetWrapperListener::queryInterface( const cs //virtual void SAL_CALL ContentResultSetWrapperListener::disposing( const EventObject& rEventObject ) - throw( RuntimeException, std::exception ) { if( m_pOwner ) m_pOwner->impl_disposing( rEventObject ); @@ -1386,7 +1269,6 @@ void SAL_CALL ContentResultSetWrapperListener::disposing( const EventObject& rEv //virtual void SAL_CALL ContentResultSetWrapperListener::propertyChange( const PropertyChangeEvent& rEvt ) - throw( RuntimeException, std::exception ) { if( m_pOwner ) m_pOwner->impl_propertyChange( rEvt ); @@ -1397,8 +1279,6 @@ void SAL_CALL ContentResultSetWrapperListener::propertyChange( const PropertyCha //virtual void SAL_CALL ContentResultSetWrapperListener::vetoableChange( const PropertyChangeEvent& rEvt ) - throw( PropertyVetoException, - 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 6ee731ee4bbf..7823f9f93041 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -126,9 +126,7 @@ protected: /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException void SAL_CALL - impl_EnsureNotDisposed() - throw( css::lang::DisposedException, - css::uno::RuntimeException ); + impl_EnsureNotDisposed(); void SAL_CALL impl_notifyPropertyChangeListeners( @@ -138,9 +136,7 @@ protected: /// @throws css::uno::RuntimeException void SAL_CALL impl_notifyVetoableChangeListeners( - const css::beans::PropertyChangeEvent& rEvt ) - throw( css::beans::PropertyVetoException, - css::uno::RuntimeException ); + const css::beans::PropertyChangeEvent& rEvt ); bool SAL_CALL impl_isForwardOnly(); @@ -150,304 +146,193 @@ public: // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + queryInterface( const css::uno::Type & rType ) override; // XComponent virtual void SAL_CALL - dispose() throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; //XCloseable virtual void SAL_CALL - close() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + close() override; //XResultSetMetaDataSupplier virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL - getMetaData() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getMetaData() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception ) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL - getPropertyValue( const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + getPropertyValue( const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // own methods /// @throws css::uno::RuntimeException virtual void SAL_CALL - impl_disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException ); + impl_disposing( const css::lang::EventObject& Source ); /// @throws css::uno::RuntimeException virtual void SAL_CALL - impl_propertyChange( const css::beans::PropertyChangeEvent& evt ) - throw( css::uno::RuntimeException ); + impl_propertyChange( const css::beans::PropertyChangeEvent& evt ); /// @throws css::beans::PropertyVetoException /// @throws css::uno::RuntimeException virtual void SAL_CALL - impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) - throw( css::beans::PropertyVetoException, - css::uno::RuntimeException ); + impl_vetoableChange( const css::beans::PropertyChangeEvent& aEvent ); // XContentAccess virtual OUString SAL_CALL - queryContentIdentifierString() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifierString() override; virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - queryContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifier() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent() - throw( css::uno::RuntimeException, std::exception ) override; + queryContent() override; // XResultSet virtual sal_Bool SAL_CALL - next() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + next() override; virtual sal_Bool SAL_CALL - isBeforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + isBeforeFirst() override; virtual sal_Bool SAL_CALL - isAfterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + isAfterLast() override; virtual sal_Bool SAL_CALL - isFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + isFirst() override; virtual sal_Bool SAL_CALL - isLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + isLast() override; virtual void SAL_CALL - beforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + beforeFirst() override; virtual void SAL_CALL - afterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + afterLast() override; virtual sal_Bool SAL_CALL - first() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + first() override; virtual sal_Bool SAL_CALL - last() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + last() override; virtual sal_Int32 SAL_CALL - getRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getRow() override; virtual sal_Bool SAL_CALL - absolute( sal_Int32 row ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + absolute( sal_Int32 row ) override; virtual sal_Bool SAL_CALL - relative( sal_Int32 rows ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + relative( sal_Int32 rows ) override; virtual sal_Bool SAL_CALL - previous() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + previous() override; virtual void SAL_CALL - refreshRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + refreshRow() override; virtual sal_Bool SAL_CALL - rowUpdated() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + rowUpdated() override; virtual sal_Bool SAL_CALL - rowInserted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + rowInserted() override; virtual sal_Bool SAL_CALL - rowDeleted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + rowDeleted() override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getStatement() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getStatement() override; // XRow virtual sal_Bool SAL_CALL - wasNull() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + wasNull() override; virtual OUString SAL_CALL - getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getString( sal_Int32 columnIndex ) override; virtual sal_Bool SAL_CALL - getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getBoolean( sal_Int32 columnIndex ) override; virtual sal_Int8 SAL_CALL - getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getByte( sal_Int32 columnIndex ) override; virtual sal_Int16 SAL_CALL - getShort( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getShort( sal_Int32 columnIndex ) override; virtual sal_Int32 SAL_CALL - getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getInt( sal_Int32 columnIndex ) override; virtual sal_Int64 SAL_CALL - getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getLong( sal_Int32 columnIndex ) override; virtual float SAL_CALL - getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getFloat( sal_Int32 columnIndex ) override; virtual double SAL_CALL - getDouble( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getDouble( sal_Int32 columnIndex ) override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getBytes( sal_Int32 columnIndex ) override; virtual css::util::Date SAL_CALL - getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getDate( sal_Int32 columnIndex ) override; virtual css::util::Time SAL_CALL - getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getTime( sal_Int32 columnIndex ) override; virtual css::util::DateTime SAL_CALL - getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getTimestamp( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getBinaryStream( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getCharacterStream( sal_Int32 columnIndex ) override; virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL - getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getRef( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL - getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getBlob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL - getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getClob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL - getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getArray( sal_Int32 columnIndex ) override; }; @@ -466,8 +351,7 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() @@ -476,23 +360,19 @@ public: //XEventListener virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) override; + disposing( const css::lang::EventObject& Source ) override; //XPropertyChangeListener virtual void SAL_CALL - propertyChange( const css::beans::PropertyChangeEvent& evt ) - throw( css::uno::RuntimeException, std::exception ) override; + propertyChange( const css::beans::PropertyChangeEvent& evt ) override; //XVetoableChangeListener virtual void SAL_CALL - vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) - throw( css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception ) override; + vetoableChange( const css::beans::PropertyChangeEvent& aEvent ) override; // own methods: diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 78aa7f39cd65..36bd508e1ea0 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -87,7 +87,6 @@ void SAL_CALL DynamicResultSetWrapper::impl_deinit() } void SAL_CALL DynamicResultSetWrapper::impl_EnsureNotDisposed() - throw( DisposedException, RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if( m_bDisposed ) @@ -114,7 +113,6 @@ void SAL_CALL DynamicResultSetWrapper::impl_InitResultSetTwo( const Reference< X // XInterface methods. css::uno::Any SAL_CALL DynamicResultSetWrapper::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { //list all interfaces inclusive baseclasses of interfaces css::uno::Any aRet = cppu::queryInterface( rType, @@ -129,7 +127,6 @@ css::uno::Any SAL_CALL DynamicResultSetWrapper::queryInterface( const css::uno:: // virtual void SAL_CALL DynamicResultSetWrapper::dispose() - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -165,7 +162,6 @@ void SAL_CALL DynamicResultSetWrapper::dispose() // virtual void SAL_CALL DynamicResultSetWrapper::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -180,7 +176,6 @@ void SAL_CALL DynamicResultSetWrapper::addEventListener( const Reference< XEvent // virtual void SAL_CALL DynamicResultSetWrapper::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -195,7 +190,6 @@ void SAL_CALL DynamicResultSetWrapper::removeEventListener( const Reference< XEv //virtual void SAL_CALL DynamicResultSetWrapper::impl_disposing( const EventObject& ) - throw( RuntimeException ) { impl_EnsureNotDisposed(); @@ -214,7 +208,6 @@ void SAL_CALL DynamicResultSetWrapper::impl_disposing( const EventObject& ) //virtual void SAL_CALL DynamicResultSetWrapper::impl_notify( const ListEvent& Changes ) - throw( RuntimeException ) { impl_EnsureNotDisposed(); //@todo @@ -281,7 +274,6 @@ void SAL_CALL DynamicResultSetWrapper::impl_notify( const ListEvent& Changes ) //virtual void SAL_CALL DynamicResultSetWrapper::setSource( const Reference< XInterface > & Source ) - throw( AlreadyInitializedException, RuntimeException, std::exception ) { impl_EnsureNotDisposed(); { @@ -322,7 +314,6 @@ void SAL_CALL DynamicResultSetWrapper::setSource( const Reference< XInterface > //virtual Reference< XResultSet > SAL_CALL DynamicResultSetWrapper::getStaticResultSet() - throw( ListenerAlreadySetException, RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -353,7 +344,6 @@ Reference< XResultSet > SAL_CALL DynamicResultSetWrapper::getStaticResultSet() //virtual void SAL_CALL DynamicResultSetWrapper::setListener( const Reference< XDynamicResultSetListener > & Listener ) - throw( ListenerAlreadySetException, RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -380,7 +370,6 @@ void SAL_CALL DynamicResultSetWrapper::setListener( const Reference< XDynamicRes //virtual void SAL_CALL DynamicResultSetWrapper::connectToCache( const Reference< XDynamicResultSet > & xCache ) - throw( ListenerAlreadySetException, AlreadyInitializedException, ServiceNotFoundException, RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -417,7 +406,6 @@ void SAL_CALL DynamicResultSetWrapper::connectToCache( const Reference< XDynamic //virtual sal_Int16 SAL_CALL DynamicResultSetWrapper::getCapabilities() - throw( RuntimeException, std::exception ) { impl_EnsureNotDisposed(); @@ -462,7 +450,6 @@ void SAL_CALL DynamicResultSetWrapperListener::release() } css::uno::Any SAL_CALL DynamicResultSetWrapperListener::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XDynamicResultSetListener* >(this)), @@ -475,7 +462,6 @@ css::uno::Any SAL_CALL DynamicResultSetWrapperListener::queryInterface( const cs //virtual void SAL_CALL DynamicResultSetWrapperListener::disposing( const EventObject& rEventObject ) - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -485,7 +471,6 @@ void SAL_CALL DynamicResultSetWrapperListener::disposing( const EventObject& rEv //virtual void SAL_CALL DynamicResultSetWrapperListener::notify( const ListEvent& Changes ) - 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 733cc5f29d3b..b588b9db0aa6 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -86,9 +86,7 @@ protected: /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException void SAL_CALL - impl_EnsureNotDisposed() - throw( css::lang::DisposedException, - css::uno::RuntimeException ); + impl_EnsureNotDisposed(); virtual void SAL_CALL impl_InitResultSetOne( const css::uno::Reference< @@ -108,63 +106,48 @@ public: // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + queryInterface( const css::uno::Type & rType ) override; // XDynamicResultSet virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - getStaticResultSet() - throw( css::ucb::ListenerAlreadySetException - , css::uno::RuntimeException, std::exception ) override; + getStaticResultSet() override; virtual void SAL_CALL - setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener > & Listener ) - throw( css::ucb::ListenerAlreadySetException - , css::uno::RuntimeException, std::exception ) override; + setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener > & Listener ) override; 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, std::exception ) override; + connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) override; virtual sal_Int16 SAL_CALL - getCapabilities() throw( css::uno::RuntimeException, std::exception ) override; + getCapabilities() override; // XComponent ( base of XDynamicResultSet ) virtual void SAL_CALL - dispose() throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; // XSourceInitialization virtual void SAL_CALL - setSource( const css::uno::Reference< css::uno::XInterface > & Source ) - throw( css::ucb::AlreadyInitializedException - , css::uno::RuntimeException, std::exception ) override; + setSource( const css::uno::Reference< css::uno::XInterface > & Source ) override; // own methods: /// @throws css::uno::RuntimeException virtual void SAL_CALL - impl_disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException ); + impl_disposing( const css::lang::EventObject& Source ); /// @throws css::uno::RuntimeException void SAL_CALL - impl_notify( const css::ucb::ListEvent& Changes ) - throw( css::uno::RuntimeException ); + impl_notify( const css::ucb::ListEvent& Changes ); }; @@ -183,8 +166,7 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() @@ -193,13 +175,11 @@ public: // XEventListener ( base of XDynamicResultSetListener ) virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) override; + disposing( const css::lang::EventObject& Source ) override; // XDynamicResultSetListener virtual void SAL_CALL - notify( const css::ucb::ListEvent& Changes ) - throw( css::uno::RuntimeException, std::exception ) override; + notify( const css::ucb::ListEvent& Changes ) override; // own methods: diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index 7762bf3c2bb2..450bafcb5e65 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -88,48 +88,43 @@ class OFileAccess : public FileAccessHelper /// @throws CommandAbortedException /// @throws Exception /// @throws RuntimeException - void transferImpl( const OUString& rSource, const OUString& rDest, bool bMoveData ) - throw(CommandAbortedException, Exception, RuntimeException); + void transferImpl( const OUString& rSource, const OUString& rDest, bool bMoveData ); /// @throws Exception bool createNewFile( const OUString & rParentURL, const OUString & rTitle, - const Reference< XInputStream >& data ) - throw ( Exception ); + const Reference< XInputStream >& data ); public: explicit OFileAccess( const Reference< XComponentContext > & xContext ) : m_xContext( xContext) {} // Methods - virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL kill( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getContentType( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL writeFile( const OUString& FileURL, const css::uno::Reference< css::io::XInputStream >& data ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) throw(css::ucb::CommandAbortedException, css::uno::Exception, css::uno::RuntimeException, std::exception) override; - - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL copy( const OUString& SourceURL, const OUString& DestURL ) override; + virtual void SAL_CALL move( const OUString& SourceURL, const OUString& DestURL ) override; + virtual void SAL_CALL kill( const OUString& FileURL ) override; + virtual sal_Bool SAL_CALL isFolder( const OUString& FileURL ) override; + virtual sal_Bool SAL_CALL isReadOnly( const OUString& FileURL ) override; + virtual void SAL_CALL setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) override; + virtual void SAL_CALL createFolder( const OUString& NewFolderURL ) override; + virtual sal_Int32 SAL_CALL getSize( const OUString& FileURL ) override; + virtual OUString SAL_CALL getContentType( const OUString& FileURL ) override; + virtual css::util::DateTime SAL_CALL getDateTimeModified( const OUString& FileURL ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getFolderContents( const OUString& FolderURL, sal_Bool bIncludeFolders ) override; + virtual sal_Bool SAL_CALL exists( const OUString& FileURL ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL openFileRead( const OUString& FileURL ) override; + virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL openFileWrite( const OUString& FileURL ) override; + virtual css::uno::Reference< css::io::XStream > SAL_CALL openFileReadWrite( const OUString& FileURL ) override; + virtual void SAL_CALL setInteractionHandler( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override; + virtual void SAL_CALL writeFile( const OUString& FileURL, const css::uno::Reference< css::io::XInputStream >& data ) override; + virtual sal_Bool SAL_CALL isHidden( const OUString& FileURL ) override; + virtual void SAL_CALL setHidden( const OUString& FileURL, sal_Bool bHidden ) override; + + OUString SAL_CALL getImplementationName() override { return OUString(IMPLEMENTATION_NAME); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return FileAccess_getSupportedServiceNames(); } }; @@ -142,10 +137,8 @@ class OActiveDataSink : public cppu::WeakImplHelper< XActiveDataSink > public: // Methods - virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) - throw(RuntimeException, std::exception) override; - virtual Reference< XInputStream > SAL_CALL getInputStream( ) - throw(RuntimeException, std::exception) override; + virtual void SAL_CALL setInputStream( const Reference< XInputStream >& aStream ) override; + virtual Reference< XInputStream > SAL_CALL getInputStream( ) override; }; // Implementation XActiveDataStreamer @@ -157,10 +150,8 @@ class OActiveDataStreamer : public cppu::WeakImplHelper< XActiveDataStreamer > public: // Methods - virtual void SAL_CALL setStream( const Reference< XStream >& aStream ) - throw(RuntimeException, std::exception) override; - virtual Reference< XStream > SAL_CALL getStream() - throw(RuntimeException, std::exception) override; + virtual void SAL_CALL setStream( const Reference< XStream >& aStream ) override; + virtual Reference< XStream > SAL_CALL getStream() override; }; // Implementation XCommandEnvironment @@ -176,44 +167,36 @@ public: } // Methods - virtual Reference< XInteractionHandler > SAL_CALL getInteractionHandler() - throw(RuntimeException, std::exception) override; - virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() - throw(RuntimeException, std::exception) override; + virtual Reference< XInteractionHandler > SAL_CALL getInteractionHandler() override; + virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override; }; void OActiveDataSink::setInputStream( const Reference< XInputStream >& aStream ) - throw(RuntimeException, std::exception) { mxStream = aStream; } Reference< XInputStream > OActiveDataSink::getInputStream() - throw(RuntimeException, std::exception) { return mxStream; } void OActiveDataStreamer::setStream( const Reference< XStream >& aStream ) - throw(RuntimeException, std::exception) { mxStream = aStream; } Reference< XStream > OActiveDataStreamer::getStream() - throw(RuntimeException, std::exception) { return mxStream; } Reference< XInteractionHandler > OCommandEnvironment::getInteractionHandler() - throw(RuntimeException, std::exception) { return mxInteraction; } Reference< XProgressHandler > OCommandEnvironment::getProgressHandler() - throw(RuntimeException, std::exception) { Reference< XProgressHandler > xRet; return xRet; @@ -222,7 +205,6 @@ Reference< XProgressHandler > OCommandEnvironment::getProgressHandler() void OFileAccess::transferImpl( const OUString& rSource, const OUString& rDest, bool bMoveData ) - throw(CommandAbortedException, Exception, RuntimeException) { // SfxContentHelper::Transfer_Impl INetURLObject aSourceObj( rSource, INetProtocol::File ); @@ -293,19 +275,16 @@ void OFileAccess::transferImpl( const OUString& rSource, } void OFileAccess::copy( const OUString& SourceURL, const OUString& DestURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { transferImpl( SourceURL, DestURL, false ); } void OFileAccess::move( const OUString& SourceURL, const OUString& DestURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { transferImpl( SourceURL, DestURL, true ); } void OFileAccess::kill( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { // SfxContentHelper::Kill INetURLObject aDeleteObj( FileURL, INetProtocol::File ); @@ -321,7 +300,6 @@ void OFileAccess::kill( const OUString& FileURL ) } sal_Bool OFileAccess::isFolder( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { bool bRet = false; try @@ -335,7 +313,6 @@ sal_Bool OFileAccess::isFolder( const OUString& FileURL ) } sal_Bool OFileAccess::isReadOnly( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aURLObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() ); @@ -346,7 +323,6 @@ sal_Bool OFileAccess::isReadOnly( const OUString& FileURL ) } void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aURLObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() ); @@ -354,7 +330,6 @@ void OFileAccess::setReadOnly( const OUString& FileURL, sal_Bool bReadOnly ) } void OFileAccess::createFolder( const OUString& NewFolderURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { // Does the folder already exist? if( NewFolderURL.isEmpty() || isFolder( NewFolderURL ) ) @@ -420,7 +395,6 @@ void OFileAccess::createFolder( const OUString& NewFolderURL ) } sal_Int32 OFileAccess::getSize( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { // SfxContentHelper::GetSize sal_Int32 nSize = 0; @@ -433,7 +407,6 @@ sal_Int32 OFileAccess::getSize( const OUString& FileURL ) } OUString OFileAccess::getContentType( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() ); @@ -444,7 +417,6 @@ OUString OFileAccess::getContentType( const OUString& FileURL ) } css::util::DateTime OFileAccess::getDateTimeModified( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aFileObj( FileURL, INetProtocol::File ); css::util::DateTime aDateTime; @@ -458,7 +430,6 @@ css::util::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, std::exception) { // SfxContentHelper::GetFolderContents @@ -514,7 +485,6 @@ Sequence< OUString > OFileAccess::getFolderContents( const OUString& FolderURL, } sal_Bool OFileAccess::exists( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { bool bRet = false; try @@ -533,7 +503,6 @@ sal_Bool OFileAccess::exists( const OUString& FileURL ) } Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { Reference< XInputStream > xRet; INetURLObject aObj( FileURL, INetProtocol::File ); @@ -556,7 +525,6 @@ Reference< XInputStream > OFileAccess::openFileRead( const OUString& FileURL ) } Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { Reference< XOutputStream > xRet; Reference< XStream > xStream = OFileAccess::openFileReadWrite( FileURL ); @@ -566,7 +534,6 @@ Reference< XOutputStream > OFileAccess::openFileWrite( const OUString& FileURL ) } Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { Reference< XActiveDataStreamer > xSink = static_cast<XActiveDataStreamer*>(new OActiveDataStreamer()); Reference< XInterface > xSinkIface( xSink, UNO_QUERY ); @@ -628,7 +595,6 @@ Reference< XStream > OFileAccess::openFileReadWrite( const OUString& FileURL ) } void OFileAccess::setInteractionHandler( const Reference< XInteractionHandler >& Handler ) - throw(RuntimeException, std::exception) { if( !mxEnvironment.is() ) { @@ -640,7 +606,6 @@ void OFileAccess::setInteractionHandler( const Reference< XInteractionHandler >& bool OFileAccess::createNewFile( const OUString & rParentURL, const OUString & rTitle, const Reference< XInputStream >& data ) - throw ( Exception ) { ucbhelper::Content aParentCnt( rParentURL, mxEnvironment.get(), comphelper::getProcessComponentContext() ); @@ -694,7 +659,6 @@ bool OFileAccess::createNewFile( const OUString & rParentURL, void SAL_CALL OFileAccess::writeFile( const OUString& FileURL, const Reference< XInputStream >& data ) - throw ( Exception, RuntimeException, std::exception ) { INetURLObject aURL( FileURL, INetProtocol::File ); try @@ -744,7 +708,6 @@ void SAL_CALL OFileAccess::writeFile( const OUString& FileURL, } sal_Bool OFileAccess::isHidden( const OUString& FileURL ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aURLObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() ); @@ -755,7 +718,6 @@ sal_Bool OFileAccess::isHidden( const OUString& FileURL ) } void OFileAccess::setHidden( const OUString& FileURL, sal_Bool bHidden ) - throw(CommandAbortedException, Exception, RuntimeException, std::exception) { INetURLObject aURLObj( FileURL, INetProtocol::File ); ucbhelper::Content aCnt( aURLObj.GetMainURL( INetURLObject::DecodeMechanism::NONE ), mxEnvironment.get(), comphelper::getProcessComponentContext() ); diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index 012aa6e197d2..a8c1b862fd6d 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -55,8 +55,6 @@ UcbCommandEnvironment::~UcbCommandEnvironment() // virtual void SAL_CALL UcbCommandEnvironment::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw( uno::Exception, - uno::RuntimeException, std::exception ) { if ( ( aArguments.getLength() < 2 ) || !( aArguments[ 0 ] >>= m_xIH ) || @@ -70,7 +68,6 @@ void SAL_CALL UcbCommandEnvironment::initialize( // virtual OUString SAL_CALL UcbCommandEnvironment::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -79,7 +76,6 @@ OUString SAL_CALL UcbCommandEnvironment::getImplementationName() // virtual sal_Bool SAL_CALL UcbCommandEnvironment::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -88,7 +84,6 @@ UcbCommandEnvironment::supportsService( const OUString& ServiceName ) // virtual uno::Sequence< OUString > SAL_CALL UcbCommandEnvironment::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } @@ -116,7 +111,6 @@ UcbCommandEnvironment::getSupportedServiceNames_Static() // virtual uno::Reference< task::XInteractionHandler > SAL_CALL UcbCommandEnvironment::getInteractionHandler() - throw ( uno::RuntimeException, std::exception ) { return m_xIH; } @@ -125,7 +119,6 @@ UcbCommandEnvironment::getInteractionHandler() // virtual uno::Reference< ucb::XProgressHandler > SAL_CALL UcbCommandEnvironment::getProgressHandler() - throw ( uno::RuntimeException, std::exception ) { return m_xPH; } @@ -137,7 +130,6 @@ UcbCommandEnvironment::getProgressHandler() static uno::Reference< uno::XInterface > SAL_CALL UcbCommandEnvironment_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) - throw( uno::Exception ) { lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >( new UcbCommandEnvironment( rSMgr ) ); diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx index a731fa2a7348..68dd3e4708a8 100644 --- a/ucb/source/core/cmdenv.hxx +++ b/ucb/source/core/cmdenv.hxx @@ -43,29 +43,22 @@ public: // XInitialization virtual void SAL_CALL - initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw( css::uno::Exception, - css::uno::RuntimeException, std::exception ) override; + initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw ( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XCommandEnvironment virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL - getInteractionHandler() - throw ( css::uno::RuntimeException, std::exception ) override; + getInteractionHandler() override; virtual css::uno::Reference< css::ucb::XProgressHandler > SAL_CALL - getProgressHandler() - throw ( css::uno::RuntimeException, std::exception ) override; + getProgressHandler() override; // Non-UNO interfaces static OUString getImplementationName_Static(); diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx index f03cbb252adc..912163080154 100644 --- a/ucb/source/core/identify.cxx +++ b/ucb/source/core/identify.cxx @@ -47,7 +47,6 @@ ContentIdentifier::~ContentIdentifier() // XContentIdentifier methods. // virtual OUString SAL_CALL ContentIdentifier::getContentIdentifier() - throw( RuntimeException, std::exception ) { return m_aContentId; } @@ -55,7 +54,6 @@ OUString SAL_CALL ContentIdentifier::getContentIdentifier() // virtual OUString SAL_CALL ContentIdentifier::getContentProviderScheme() - 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 cb7313e27332..3dbf3ed380c1 100644 --- a/ucb/source/core/identify.hxx +++ b/ucb/source/core/identify.hxx @@ -33,10 +33,8 @@ public: virtual ~ContentIdentifier() override; // XContentIdentifier - virtual OUString SAL_CALL getContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getContentProviderScheme() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getContentIdentifier() override; + virtual OUString SAL_CALL getContentProviderScheme() override; private: OUString m_aContentId; diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 00770507dc7a..92819a585e00 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -50,7 +50,6 @@ XSERVICEINFO_COMMOM_IMPL( UcbContentProviderProxyFactory, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL UcbContentProviderProxyFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new UcbContentProviderProxyFactory( rSMgr )); @@ -75,7 +74,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbContentProviderProxyFactory ); Reference< XContentProvider > SAL_CALL UcbContentProviderProxyFactory::createContentProvider( const OUString& Service ) - throw( RuntimeException, std::exception ) { return Reference< XContentProvider >( new UcbContentProviderProxy( m_xSMgr, Service ) ); @@ -118,7 +116,6 @@ void SAL_CALL UcbContentProviderProxy::release() // virtual Any SAL_CALL UcbContentProviderProxy::queryInterface( const Type & rType ) - throw ( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, static_cast< XTypeProvider * >( this ), @@ -150,7 +147,6 @@ XTYPEPROVIDER_COMMON_IMPL( UcbContentProviderProxy ); Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() - throw( RuntimeException, std::exception ) { // Get original provider an forward the call... osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -175,19 +171,16 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() // XServiceInfo methods. OUString SAL_CALL UcbContentProviderProxy::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" ); } sal_Bool SAL_CALL UcbContentProviderProxy::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL UcbContentProviderProxy::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.ucb.ContentProviderProxy" }; } @@ -199,8 +192,6 @@ css::uno::Sequence< OUString > SAL_CALL UcbContentProviderProxy::getSupportedSer // virtual Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent( const Reference< XContentIdentifier >& Identifier ) - throw( IllegalIdentifierException, - RuntimeException, std::exception ) { // Get original provider an forward the call... @@ -218,7 +209,6 @@ Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent( sal_Int32 SAL_CALL UcbContentProviderProxy::compareContentIds( const Reference< XContentIdentifier >& Id1, const Reference< XContentIdentifier >& Id2 ) - throw( RuntimeException, std::exception ) { // Get original provider an forward the call... @@ -242,8 +232,6 @@ Reference< XContentProvider > SAL_CALL UcbContentProviderProxy::registerInstance( const OUString& Template, const OUString& Arguments, sal_Bool ReplaceExisting ) - throw( IllegalArgumentException, - RuntimeException, std::exception ) { // Just remember that this method was called ( and the params ). @@ -266,8 +254,6 @@ UcbContentProviderProxy::registerInstance( const OUString& Template, Reference< XContentProvider > SAL_CALL UcbContentProviderProxy::deregisterInstance( const OUString& Template, const OUString& Arguments ) - throw( IllegalArgumentException, - RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -303,7 +289,6 @@ UcbContentProviderProxy::deregisterInstance( const OUString& Template, // virtual Reference< XContentProvider > SAL_CALL UcbContentProviderProxy::getContentProvider() - 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 2e1a4fc6590b..d6abd529d8dd 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -49,12 +49,9 @@ public: virtual ~UcbContentProviderProxyFactory() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -65,8 +62,7 @@ public: // XContentProviderFactory virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL - createContentProvider( const OUString& Service ) - throw( css::uno::RuntimeException, std::exception ) override; + createContentProvider( const OUString& Service ) override; }; @@ -102,56 +98,42 @@ public: virtual ~UcbContentProviderProxy() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XContentProviderSupplier virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL - getContentProvider() - throw( css::uno::RuntimeException, std::exception ) override; + getContentProvider() override; // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; virtual sal_Int32 SAL_CALL compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1, - const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override; // XParameterizedContentProvider virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL registerInstance( const OUString& Template, const OUString& Arguments, - sal_Bool ReplaceExisting ) - throw( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + sal_Bool ReplaceExisting ) override; virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL deregisterInstance( const OUString& Template, - const OUString& Arguments ) - throw( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + const OUString& Arguments ) override; }; #endif // INCLUDED_UCB_SOURCE_CORE_PROVPROX_HXX diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index c452136ee086..025d5537bb84 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -255,7 +255,6 @@ void SAL_CALL UniversalContentBroker::release() } css::uno::Any SAL_CALL UniversalContentBroker::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XUniversalContentBroker* >(this)), @@ -291,7 +290,6 @@ XTYPEPROVIDER_IMPL_9( UniversalContentBroker, // virtual void SAL_CALL UniversalContentBroker::dispose() - throw( css::uno::RuntimeException, std::exception ) { if ( m_pDisposeEventListeners && m_pDisposeEventListeners->getLength() ) { @@ -308,7 +306,6 @@ void SAL_CALL UniversalContentBroker::dispose() // virtual void SAL_CALL UniversalContentBroker::addEventListener( const Reference< XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) { if ( !m_pDisposeEventListeners ) m_pDisposeEventListeners.reset( new OInterfaceContainerHelper2( m_aMutex ) ); @@ -320,7 +317,6 @@ void SAL_CALL UniversalContentBroker::addEventListener( // virtual void SAL_CALL UniversalContentBroker::removeEventListener( const Reference< XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) { if ( m_pDisposeEventListeners ) m_pDisposeEventListeners->removeInterface( Listener ); @@ -336,7 +332,6 @@ XSERVICEINFO_COMMOM_IMPL( UniversalContentBroker, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL UniversalContentBroker_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new UniversalContentBroker( ucbhelper::getComponentContext(rSMgr) )); @@ -361,8 +356,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UniversalContentBroker ); // virtual void SAL_CALL UniversalContentBroker::initialize( const css::uno::Sequence< Any >& aArguments ) - throw( css::uno::Exception, - css::uno::RuntimeException, std::exception ) { { osl::MutexGuard aGuard(m_aMutex); @@ -404,7 +397,6 @@ UniversalContentBroker::registerContentProvider( const Reference< XContentProvider >& Provider, const OUString& Scheme, sal_Bool ReplaceExisting ) - throw( DuplicateProviderException, css::uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); @@ -450,7 +442,6 @@ UniversalContentBroker::registerContentProvider( void SAL_CALL UniversalContentBroker::deregisterContentProvider( const Reference< XContentProvider >& Provider, const OUString& Scheme ) - throw( css::uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); @@ -488,7 +479,6 @@ void SAL_CALL UniversalContentBroker::deregisterContentProvider( // virtual css::uno::Sequence< ContentProviderInfo > SAL_CALL UniversalContentBroker::queryContentProviders() - throw( css::uno::RuntimeException, std::exception ) { // Return a list with information about active(!) content providers. @@ -515,7 +505,6 @@ css::uno::Sequence< ContentProviderInfo > SAL_CALL Reference< XContentProvider > SAL_CALL UniversalContentBroker::queryContentProvider( const OUString& Identifier ) - throw( css::uno::RuntimeException, std::exception ) { return queryContentProvider( Identifier, false ); } @@ -527,7 +516,6 @@ Reference< XContentProvider > SAL_CALL // virtual Reference< XContent > SAL_CALL UniversalContentBroker::queryContent( const Reference< XContentIdentifier >& Identifier ) - throw( IllegalIdentifierException, css::uno::RuntimeException, std::exception ) { // Let the content provider for the scheme given with the content @@ -550,7 +538,6 @@ Reference< XContent > SAL_CALL UniversalContentBroker::queryContent( sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds( const Reference< XContentIdentifier >& Id1, const Reference< XContentIdentifier >& Id2 ) - throw( css::uno::RuntimeException, std::exception ) { OUString aURI1( Id1->getContentIdentifier() ); OUString aURI2( Id2->getContentIdentifier() ); @@ -577,7 +564,6 @@ sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds( Reference< XContentIdentifier > SAL_CALL UniversalContentBroker::createContentIdentifier( const OUString& ContentId ) - throw( css::uno::RuntimeException, std::exception ) { // Let the content provider for the scheme given with content @@ -609,7 +595,6 @@ Reference< XContentIdentifier > SAL_CALL // virtual sal_Int32 SAL_CALL UniversalContentBroker::createCommandIdentifier() - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -623,7 +608,6 @@ Any SAL_CALL UniversalContentBroker::execute( const Command& aCommand, sal_Int32, const Reference< XCommandEnvironment >& Environment ) - throw( Exception, CommandAbortedException, RuntimeException, std::exception ) { Any aRet; @@ -709,7 +693,6 @@ Any SAL_CALL UniversalContentBroker::execute( // virtual void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aCommandId*/) - throw( RuntimeException, std::exception ) { // @@@ Not implemeted ( yet). } @@ -717,7 +700,6 @@ void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aComm // virtual void SAL_CALL UniversalContentBroker::abort( sal_Int32 ) - throw( RuntimeException, std::exception ) { // @@@ Not implemeted ( yet). } @@ -728,7 +710,6 @@ void SAL_CALL UniversalContentBroker::abort( sal_Int32 ) // virtual void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& Event ) - throw( uno::RuntimeException, std::exception ) { sal_Int32 nCount = Event.Changes.getLength(); if ( nCount ) @@ -774,7 +755,6 @@ void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& // virtual void SAL_CALL UniversalContentBroker::disposing(const lang::EventObject&) - throw( uno::RuntimeException, std::exception ) { if ( m_xNotifier.is() ) { @@ -802,7 +782,6 @@ Reference< XContentProvider > UniversalContentBroker::queryContentProvider( } void UniversalContentBroker::configureUcb() - throw (uno::RuntimeException) { OUString aKey1; OUString aKey2; diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx index c09252829346..1cd5ef1a364b 100644 --- a/ucb/source/core/ucb.hxx +++ b/ucb/source/core/ucb.hxx @@ -66,26 +66,20 @@ public: virtual ~UniversalContentBroker() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -96,81 +90,59 @@ public: // XComponent virtual void SAL_CALL - dispose() - throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + css::lang::XEventListener >& Listener ) override; // XInitialization virtual void SAL_CALL - initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw( css::uno::Exception, - css::uno::RuntimeException, std::exception ) override; + initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XContentProviderManager virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL registerContentProvider( const css::uno::Reference< css::ucb::XContentProvider >& Provider, const OUString& Scheme, - sal_Bool ReplaceExisting ) - throw( css::ucb::DuplicateProviderException, - css::uno::RuntimeException, std::exception ) override; + sal_Bool ReplaceExisting ) override; virtual void SAL_CALL deregisterContentProvider( const css::uno::Reference< css::ucb::XContentProvider >& Provider, - const OUString& Scheme ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& Scheme ) override; virtual css::uno::Sequence< css::ucb::ContentProviderInfo > SAL_CALL - queryContentProviders() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentProviders() override; virtual css::uno::Reference< css::ucb::XContentProvider > SAL_CALL - queryContentProvider( const OUString& Identifier ) - throw( css::uno::RuntimeException, std::exception ) override; + queryContentProvider( const OUString& Identifier ) override; // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; virtual sal_Int32 SAL_CALL compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1, - const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override; // XContentIdentifierFactory virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - createContentIdentifier( const OUString& ContentId ) - throw( css::uno::RuntimeException, std::exception ) override; + createContentIdentifier( const OUString& ContentId ) override; // XCommandProcessor virtual sal_Int32 SAL_CALL - createCommandIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + createCommandIdentifier() override; virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; virtual void SAL_CALL - abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + abort( sal_Int32 CommandId ) override; // XCommandProcessor2 - virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL releaseCommandIdentifier(sal_Int32 aCommandId) override; // XChangesListener - virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL changesOccurred( const css::util::ChangesEvent& Event ) override; // XEventListener ( base of XChangesLisetenr ) - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: css::uno::Reference< css::ucb::XContentProvider > @@ -184,17 +156,15 @@ private: void globalTransfer( const css::ucb::GlobalTransferCommandArgument2 & rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception css::uno::Any checkIn( const css::ucb::CheckinArgument& rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::RuntimeException - void configureUcb() - throw ( css::uno::RuntimeException); + void configureUcb(); bool getContentProviderData( const OUString & rKey1, diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 70f03c91fe24..e93f056c8e37 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -101,15 +101,13 @@ public: // XInteractionHandler methods. virtual void SAL_CALL handle( - const uno::Reference< task::XInteractionRequest >& Request ) - throw ( uno::RuntimeException, std::exception ) override; + const uno::Reference< task::XInteractionRequest >& Request ) override; }; // virtual void SAL_CALL InteractionHandlerProxy::handle( const uno::Reference< task::XInteractionRequest >& Request ) - throw ( uno::RuntimeException, std::exception ) { if ( !m_xOrig.is() ) return; @@ -168,17 +166,14 @@ class ActiveDataSink : public cppu::WeakImplHelper< io::XActiveDataSink > public: // XActiveDataSink methods. virtual void SAL_CALL setInputStream( - const uno::Reference< io::XInputStream >& aStream ) - throw( uno::RuntimeException, std::exception ) override; - virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() - throw( uno::RuntimeException, std::exception ) override; + const uno::Reference< io::XInputStream >& aStream ) override; + virtual uno::Reference< io::XInputStream > SAL_CALL getInputStream() override; }; // virtual void SAL_CALL ActiveDataSink::setInputStream( const uno::Reference< io::XInputStream >& aStream ) - throw( uno::RuntimeException, std::exception ) { m_xStream = aStream; } @@ -186,7 +181,6 @@ void SAL_CALL ActiveDataSink::setInputStream( // virtual uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream() - throw( uno::RuntimeException, std::exception ) { return m_xStream; } @@ -204,18 +198,13 @@ public: CommandProcessorInfo(); // XCommandInfo methods - virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands() - throw( uno::RuntimeException, std::exception ) override; + virtual uno::Sequence< ucb::CommandInfo > SAL_CALL getCommands() override; virtual ucb::CommandInfo SAL_CALL - getCommandInfoByName( const OUString& Name ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) override; + getCommandInfoByName( const OUString& Name ) override; virtual ucb::CommandInfo SAL_CALL - getCommandInfoByHandle( sal_Int32 Handle ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) - throw( uno::RuntimeException, std::exception ) override; + getCommandInfoByHandle( sal_Int32 Handle ) override; + virtual sal_Bool SAL_CALL hasCommandByName( const OUString& Name ) override; + virtual sal_Bool SAL_CALL hasCommandByHandle( sal_Int32 Handle ) override; }; @@ -244,7 +233,6 @@ CommandProcessorInfo::CommandProcessorInfo() // virtual uno::Sequence< ucb::CommandInfo > SAL_CALL CommandProcessorInfo::getCommands() - throw( uno::RuntimeException, std::exception ) { return uno::Sequence< ucb::CommandInfo >( *m_pInfo ); } @@ -253,7 +241,6 @@ CommandProcessorInfo::getCommands() // virtual ucb::CommandInfo SAL_CALL CommandProcessorInfo::getCommandInfoByName( const OUString& Name ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) { @@ -268,7 +255,6 @@ CommandProcessorInfo::getCommandInfoByName( const OUString& Name ) // virtual ucb::CommandInfo SAL_CALL CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) - throw( ucb::UnsupportedCommandException, uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) { @@ -283,7 +269,6 @@ CommandProcessorInfo::getCommandInfoByHandle( sal_Int32 Handle ) // virtual sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) { @@ -297,7 +282,6 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByName( // virtual sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle ) - throw( uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_pInfo->getLength(); ++n ) { @@ -450,7 +434,6 @@ bool setTitle( const uno::Reference< ucb::XCommandProcessor > & xCommandProcessor, const uno::Reference< ucb::XCommandEnvironment > & xEnv, const OUString & rNewTitle ) - throw( uno::RuntimeException ) { try { @@ -499,7 +482,6 @@ uno::Reference< ucb::XContent > createNew( bool bSourceIsFolder, bool bSourceIsDocument, bool bSourceIsLink ) - throw( uno::Exception ) { @@ -722,7 +704,6 @@ void transferProperties( const TransferCommandContext & rContext, const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS, const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorN ) - throw( uno::Exception ) { ucb::Command aGetPropertySetInfoCommand( OUString("getPropertySetInfo"), @@ -880,7 +861,6 @@ void transferProperties( uno::Reference< io::XInputStream > getInputStream( const TransferCommandContext & rContext, const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS ) - throw( uno::Exception ) { uno::Reference< io::XInputStream > xInputStream; @@ -958,7 +938,6 @@ uno::Reference< io::XInputStream > getInputStream( uno::Reference< sdbc::XResultSet > getResultSet( const TransferCommandContext & rContext, const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS ) - throw( uno::Exception ) { uno::Reference< sdbc::XResultSet > xResultSet; @@ -1009,7 +988,6 @@ void handleNameClashRename( const uno::Reference< ucb::XCommandProcessor > & xCommandProcessorS, /* [inout] */ uno::Reference< io::XInputStream > & xInputStream ) - throw( uno::Exception, std::exception ) { sal_Int32 nTry = 0; @@ -1179,7 +1157,6 @@ void globalTransfer_( const uno::Reference< ucb::XContent > & xSource, const uno::Reference< ucb::XContent > & xTarget, const uno::Reference< sdbc::XRow > & xSourceProps ) - throw( uno::Exception, std::exception ) { // IsFolder: property is required. bool bSourceIsFolder = xSourceProps->getBoolean( 1 ); @@ -1642,7 +1619,6 @@ UniversalContentBroker::getCommandInfo() void UniversalContentBroker::globalTransfer( const ucb::GlobalTransferCommandArgument2 & rArg, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { // Use own command environment with own interaction handler intercepting // some interaction requests that shall not be handled by the user-supplied @@ -1973,7 +1949,7 @@ void UniversalContentBroker::globalTransfer( } uno::Any UniversalContentBroker::checkIn( const ucb::CheckinArgument& rArg, - const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw ( uno::Exception ) + const uno::Reference< ucb::XCommandEnvironment >& xEnv ) { uno::Any aRet; // Use own command environment with own interaction handler intercepting diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index b79d6a3f8078..b6cb1d1224c8 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -200,7 +200,6 @@ XSERVICEINFO_COMMOM_IMPL( UcbPropertiesManager, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL UcbPropertiesManager_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) -throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new UcbPropertiesManager( rSMgr )); @@ -223,7 +222,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbPropertiesManager ); // virtual Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties() - throw( RuntimeException, std::exception ) { return m_pProps; } @@ -231,7 +229,6 @@ Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties() // virtual Property SAL_CALL UcbPropertiesManager::getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException, std::exception ) { Property aProp; if ( queryProperty( aName, aProp ) ) @@ -243,7 +240,6 @@ Property SAL_CALL UcbPropertiesManager::getPropertyByName( const OUString& aName // virtual sal_Bool SAL_CALL UcbPropertiesManager::hasPropertyByName( const OUString& Name ) - 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 536b2c4f78db..4f789f999476 100644 --- a/ucb/source/core/ucbprops.hxx +++ b/ucb/source/core/ucbprops.hxx @@ -50,12 +50,9 @@ public: virtual ~UcbPropertiesManager() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -66,15 +63,11 @@ public: // XPropertySetInfo virtual css::uno::Sequence< css::beans::Property > SAL_CALL - getProperties() - throw( css::uno::RuntimeException, std::exception ) override; + getProperties() override; virtual css::beans::Property SAL_CALL - getPropertyByName( const OUString& aName ) - throw( css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception ) override; + getPropertyByName( const OUString& aName ) override; virtual sal_Bool SAL_CALL - hasPropertyByName( const OUString& Name ) - throw( css::uno::RuntimeException, std::exception ) override; + hasPropertyByName( const OUString& Name ) override; }; #endif // INCLUDED_UCB_SOURCE_CORE_UCBPROPS_HXX diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index d51090765a59..8c1f9c4c5c64 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -121,12 +121,9 @@ public: explicit PropertySetInfo_Impl(PersistentPropertySet* pOwner); // XPropertySetInfo - virtual Sequence< Property > SAL_CALL getProperties() - throw( RuntimeException, std::exception ) override; - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) override; + virtual Sequence< Property > SAL_CALL getProperties() override; + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override; // Non-interface methods. void reset() { m_pProps.reset(); } @@ -164,7 +161,6 @@ XSERVICEINFO_COMMOM_IMPL( UcbStore, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL UcbStore_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new UcbStore( ucbhelper::getComponentContext(rSMgr) )); @@ -190,7 +186,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbStore ); // virtual Reference< XPropertySetRegistry > SAL_CALL UcbStore::createPropertySetRegistry( const OUString& ) - throw( RuntimeException, std::exception ) { // The URL parameter is ignored by this interface implementation. It always // uses the configuration server as storage medium. @@ -211,7 +206,6 @@ UcbStore::createPropertySetRegistry( const OUString& ) // virtual void SAL_CALL UcbStore::initialize( const Sequence< Any >& aArguments ) - throw( Exception, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); m_pImpl->m_aInitArgs = aArguments; @@ -263,19 +257,16 @@ PropertySetRegistry::~PropertySetRegistry() OUString SAL_CALL PropertySetRegistry::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.PropertySetRegistry" ); } sal_Bool SAL_CALL PropertySetRegistry::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL PropertySetRegistry::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { PROPSET_REG_SERVICE_NAME }; } @@ -287,7 +278,6 @@ css::uno::Sequence< OUString > SAL_CALL PropertySetRegistry::getSupportedService // virtual Reference< XPersistentPropertySet > SAL_CALL PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) - throw( RuntimeException, std::exception ) { if ( !key.isEmpty() ) { @@ -412,7 +402,6 @@ PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) // virtual void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) - throw( RuntimeException, std::exception ) { if ( key.isEmpty() ) return; @@ -472,7 +461,6 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) // virtual css::uno::Type SAL_CALL PropertySetRegistry::getElementType() - throw( RuntimeException, std::exception ) { return cppu::UnoType<XPersistentPropertySet>::get(); } @@ -480,7 +468,6 @@ css::uno::Type SAL_CALL PropertySetRegistry::getElementType() // virtual sal_Bool SAL_CALL PropertySetRegistry::hasElements() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -498,7 +485,6 @@ sal_Bool SAL_CALL PropertySetRegistry::hasElements() // virtual Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName ) - throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -527,7 +513,6 @@ Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName ) // virtual Sequence< OUString > SAL_CALL PropertySetRegistry::getElementNames() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -543,7 +528,6 @@ Sequence< OUString > SAL_CALL PropertySetRegistry::getElementNames() // virtual sal_Bool SAL_CALL PropertySetRegistry::hasByName( const OUString& aName ) - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -1134,20 +1118,17 @@ PersistentPropertySet::~PersistentPropertySet() // XServiceInfo methods. OUString SAL_CALL PersistentPropertySet::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.PersistentPropertySet" ); } sal_Bool SAL_CALL PersistentPropertySet::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL PersistentPropertySet::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { PERS_PROPSET_SERVICE_NAME }; } @@ -1158,7 +1139,6 @@ PersistentPropertySet::getSupportedServiceNames() // virtual void SAL_CALL PersistentPropertySet::dispose() - throw( RuntimeException, std::exception ) { if ( m_pImpl->m_pDisposeEventListeners && m_pImpl->m_pDisposeEventListeners->getLength() ) @@ -1188,7 +1168,6 @@ void SAL_CALL PersistentPropertySet::dispose() // virtual void SAL_CALL PersistentPropertySet::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { if ( !m_pImpl->m_pDisposeEventListeners ) m_pImpl->m_pDisposeEventListeners = @@ -1201,7 +1180,6 @@ void SAL_CALL PersistentPropertySet::addEventListener( // virtual void SAL_CALL PersistentPropertySet::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { if ( m_pImpl->m_pDisposeEventListeners ) m_pImpl->m_pDisposeEventListeners->removeInterface( Listener ); @@ -1215,7 +1193,6 @@ void SAL_CALL PersistentPropertySet::removeEventListener( // virtual Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -1230,12 +1207,6 @@ Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo // virtual void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw( UnknownPropertyException, - PropertyVetoException, - IllegalArgumentException, - WrappedTargetException, - RuntimeException, - std::exception ) { if ( aPropertyName.isEmpty() ) throw UnknownPropertyException(); @@ -1337,9 +1308,6 @@ void SAL_CALL PersistentPropertySet::setPropertyValue( const OUString& aProperty // virtual Any SAL_CALL PersistentPropertySet::getPropertyValue( const OUString& PropertyName ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { if ( PropertyName.isEmpty() ) throw UnknownPropertyException(); @@ -1372,9 +1340,6 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue( void SAL_CALL PersistentPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { // load(); @@ -1391,9 +1356,6 @@ void SAL_CALL PersistentPropertySet::addPropertyChangeListener( void SAL_CALL PersistentPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& aListener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { // load(); @@ -1409,9 +1371,6 @@ void SAL_CALL PersistentPropertySet::removePropertyChangeListener( void SAL_CALL PersistentPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { // load(); // OSL_FAIL( // "PersistentPropertySet::addVetoableChangeListener - N.Y.I." ); @@ -1422,9 +1381,6 @@ void SAL_CALL PersistentPropertySet::addVetoableChangeListener( void SAL_CALL PersistentPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { // load(); // OSL_FAIL( // "PersistentPropertySet::removeVetoableChangeListener - N.Y.I." ); @@ -1436,7 +1392,6 @@ void SAL_CALL PersistentPropertySet::removeVetoableChangeListener( // virtual Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry() - throw( RuntimeException, std::exception ) { return Reference< XPropertySetRegistry >( m_pImpl->m_pCreator.get() ); } @@ -1444,7 +1399,6 @@ Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry() // virtual OUString SAL_CALL PersistentPropertySet::getKey() - throw( RuntimeException, std::exception ) { return m_pImpl->m_aKey; } @@ -1455,7 +1409,6 @@ OUString SAL_CALL PersistentPropertySet::getKey() // virtual OUString SAL_CALL PersistentPropertySet::getName() - throw( RuntimeException, std::exception ) { // same as getKey() return m_pImpl->m_aKey; @@ -1464,7 +1417,6 @@ OUString SAL_CALL PersistentPropertySet::getName() // virtual void SAL_CALL PersistentPropertySet::setName( const OUString& aName ) - throw( RuntimeException, std::exception ) { if ( aName != m_pImpl->m_aKey ) m_pImpl->m_pCreator->renamePropertySet( m_pImpl->m_aKey, aName ); @@ -1477,10 +1429,6 @@ void SAL_CALL PersistentPropertySet::setName( const OUString& aName ) // virtual void SAL_CALL PersistentPropertySet::addProperty( const OUString& Name, sal_Int16 Attributes, const Any& DefaultValue ) - throw( PropertyExistException, - IllegalTypeException, - IllegalArgumentException, - RuntimeException, std::exception ) { if ( Name.isEmpty() ) throw IllegalArgumentException(); @@ -1640,9 +1588,6 @@ void SAL_CALL PersistentPropertySet::addProperty( // virtual void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) - throw( UnknownPropertyException, - NotRemoveableException, - RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -1792,7 +1737,6 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) // virtual void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener( const Reference< XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { if ( !m_pImpl->m_pPropSetChangeListeners ) m_pImpl->m_pPropSetChangeListeners = @@ -1805,7 +1749,6 @@ void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener( // virtual void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener( const Reference< XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { if ( m_pImpl->m_pPropSetChangeListeners ) m_pImpl->m_pPropSetChangeListeners->removeInterface( Listener ); @@ -1817,7 +1760,6 @@ void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener( // virtual Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -1950,11 +1892,6 @@ Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues() // virtual void SAL_CALL PersistentPropertySet::setPropertyValues( const Sequence< PropertyValue >& aProps ) - throw( UnknownPropertyException, - PropertyVetoException, - IllegalArgumentException, - WrappedTargetException, - RuntimeException, std::exception ) { sal_Int32 nCount = aProps.getLength(); if ( !nCount ) @@ -2175,7 +2112,6 @@ PropertySetInfo_Impl::PropertySetInfo_Impl( // virtual Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() - throw( RuntimeException, std::exception ) { if ( !m_pProps ) { @@ -2323,7 +2259,6 @@ Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() // virtual Property SAL_CALL PropertySetInfo_Impl::getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException, std::exception ) { Reference< XHierarchicalNameAccess > xRootHierNameAccess( m_pOwner->getPropertySetRegistry().getRootConfigReadAccess(), @@ -2407,7 +2342,6 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName( // virtual sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName( const OUString& Name ) - 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 912256fcad47..ebc8fa419d5c 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -59,12 +59,9 @@ public: virtual ~UcbStore() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -75,14 +72,11 @@ public: // XPropertySetRegistryFactory virtual css::uno::Reference< css::ucb::XPropertySetRegistry > SAL_CALL - createPropertySetRegistry( const OUString& URL ) - throw( css::uno::RuntimeException, std::exception ) override; + createPropertySetRegistry( const OUString& URL ) override; // XInitialization virtual void SAL_CALL - initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw( css::uno::Exception, - css::uno::RuntimeException, std::exception ) override; + initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; }; @@ -117,41 +111,29 @@ public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XPropertySetRegistry virtual css::uno::Reference< css::ucb::XPersistentPropertySet > SAL_CALL - openPropertySet( const OUString& key, sal_Bool create ) - throw( css::uno::RuntimeException, std::exception ) override; + openPropertySet( const OUString& key, sal_Bool create ) override; virtual void SAL_CALL - removePropertySet( const OUString& key ) - throw( css::uno::RuntimeException, std::exception ) override; + removePropertySet( const OUString& key ) override; // XElementAccess ( XNameAccess is derived from it ) virtual css::uno::Type SAL_CALL - getElementType() - throw( css::uno::RuntimeException, std::exception ) override; + getElementType() override; virtual sal_Bool SAL_CALL - hasElements() - throw( css::uno::RuntimeException, std::exception ) override; + hasElements() override; // XNameAccess virtual css::uno::Any SAL_CALL - getByName( const OUString& aName ) - throw( css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + getByName( const OUString& aName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getElementNames() - throw( css::uno::RuntimeException, std::exception ) override; + getElementNames() override; virtual sal_Bool SAL_CALL - hasByName( const OUString& aName ) - throw( css::uno::RuntimeException, std::exception ) override; + hasByName( const OUString& aName ) override; // Non-interface methods css::uno::Reference< css::uno::XInterface > @@ -187,116 +169,70 @@ public: virtual ~PersistentPropertySet() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent virtual void SAL_CALL - dispose() - throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception ) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL - getPropertyValue( const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + getPropertyValue( const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XPersistentPropertySet virtual css::uno::Reference< css::ucb::XPropertySetRegistry > SAL_CALL - getRegistry() - throw( css::uno::RuntimeException, std::exception ) override; + getRegistry() override; virtual OUString SAL_CALL - getKey() - throw( css::uno::RuntimeException, std::exception ) override; + getKey() override; // XNamed virtual OUString SAL_CALL - getName() - throw( css::uno::RuntimeException, std::exception ) override; + getName() override; virtual void SAL_CALL - setName( const OUString& aName ) - throw( css::uno::RuntimeException, std::exception ) override; + setName( const OUString& aName ) override; // XPropertyContainer virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, - const css::uno::Any& DefaultValue ) - throw( css::beans::PropertyExistException, - css::beans::IllegalTypeException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& DefaultValue ) override; virtual void SAL_CALL - removeProperty( const OUString& Name ) - throw( css::beans::UnknownPropertyException, - css::beans::NotRemoveableException, - css::uno::RuntimeException, std::exception ) override; + removeProperty( const OUString& Name ) override; // XPropertySetInfoChangeNotifier virtual void SAL_CALL - addPropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + addPropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override; virtual void SAL_CALL - removePropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + removePropertySetInfoChangeListener( const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override; // XPropertyAccess virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getPropertyValues() - throw( css::uno::RuntimeException, std::exception ) override; + getPropertyValues() override; virtual void SAL_CALL - setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override; // Non-interface methods. PropertySetRegistry& getPropertySetRegistry(); diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx index 4f656eb16c37..0722095256f2 100644 --- a/ucb/source/sorter/sortdynres.cxx +++ b/ucb/source/sorter/sortdynres.cxx @@ -91,19 +91,16 @@ SortedDynamicResultSet::~SortedDynamicResultSet() // XServiceInfo methods. OUString SAL_CALL SortedDynamicResultSet::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.SortedDynamicResultSet" ); } sal_Bool SAL_CALL SortedDynamicResultSet::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSet::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { DYNAMIC_RESULTSET_SERVICE_NAME }; } @@ -111,7 +108,6 @@ css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSet::getSupportedServ // XComponent methods. void SAL_CALL SortedDynamicResultSet::dispose() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -131,7 +127,6 @@ void SAL_CALL SortedDynamicResultSet::dispose() void SAL_CALL SortedDynamicResultSet::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -144,7 +139,6 @@ void SAL_CALL SortedDynamicResultSet::addEventListener( void SAL_CALL SortedDynamicResultSet::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -157,7 +151,6 @@ void SAL_CALL SortedDynamicResultSet::removeEventListener( Reference< XResultSet > SAL_CALL SortedDynamicResultSet::getStaticResultSet() - throw( ListenerAlreadySetException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -178,7 +171,6 @@ SortedDynamicResultSet::getStaticResultSet() void SAL_CALL SortedDynamicResultSet::setListener( const Reference< XDynamicResultSetListener >& Listener ) - throw( ListenerAlreadySetException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -196,10 +188,6 @@ SortedDynamicResultSet::setListener( const Reference< XDynamicResultSetListener void SAL_CALL SortedDynamicResultSet::connectToCache( const Reference< XDynamicResultSet > & xCache ) - throw( ListenerAlreadySetException, - AlreadyInitializedException, - ServiceNotFoundException, - RuntimeException, std::exception ) { if( mxListener.is() ) throw ListenerAlreadySetException(); @@ -231,7 +219,6 @@ SortedDynamicResultSet::connectToCache( const Reference< XDynamicResultSet > & x sal_Int16 SAL_CALL SortedDynamicResultSet::getCapabilities() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -265,7 +252,6 @@ sal_Int16 SAL_CALL SortedDynamicResultSet::getCapabilities() removing himself as listener (otherwise you deadlock)!!! */ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes ) - throw( RuntimeException ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -393,7 +379,6 @@ void SortedDynamicResultSet::impl_notify( const ListEvent& Changes ) // XEventListener void SortedDynamicResultSet::impl_disposing( const EventObject& ) - throw( RuntimeException ) { mxListener.clear(); mxOriginal.clear(); @@ -442,7 +427,6 @@ SortedDynamicResultSetFactory::~SortedDynamicResultSetFactory() // XServiceInfo methods. OUString SAL_CALL SortedDynamicResultSetFactory::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -453,13 +437,11 @@ OUString SortedDynamicResultSetFactory::getImplementationName_Static() } sal_Bool SAL_CALL SortedDynamicResultSetFactory::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSetFactory::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } @@ -468,7 +450,6 @@ css::uno::Sequence< OUString > SAL_CALL SortedDynamicResultSetFactory::getSuppor static css::uno::Reference< css::uno::XInterface > SAL_CALL SortedDynamicResultSetFactory_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>( new SortedDynamicResultSetFactory( ucbhelper::getComponentContext(rSMgr) )); @@ -501,7 +482,6 @@ SortedDynamicResultSetFactory::createSortedDynamicResultSet( const Reference< XDynamicResultSet > & Source, const Sequence< NumberedSortingInfo > & Info, const Reference< XAnyCompareFactory > & CompareFactory ) - throw( RuntimeException, std::exception ) { Reference< XDynamicResultSet > xRet; xRet = new SortedDynamicResultSet( Source, Info, CompareFactory, m_xContext ); @@ -547,7 +527,6 @@ SortedDynamicResultSetListener::~SortedDynamicResultSetListener() void SAL_CALL SortedDynamicResultSetListener::disposing( const EventObject& Source ) - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -560,7 +539,6 @@ SortedDynamicResultSetListener::disposing( const EventObject& Source ) void SAL_CALL SortedDynamicResultSetListener::notify( const ListEvent& Changes ) - 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 b931774f2c2f..8e24cb70635c 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -77,56 +77,42 @@ public: // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; // XDynamicResultSet - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet() - throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getStaticResultSet() override; virtual void SAL_CALL - setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) - throw( css::ucb::ListenerAlreadySetException, css::uno::RuntimeException, std::exception ) override; + setListener( const css::uno::Reference< css::ucb::XDynamicResultSetListener >& Listener ) override; 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, std::exception ) override; + connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) override; virtual sal_Int16 SAL_CALL - getCapabilities() - throw( css::uno::RuntimeException, std::exception ) override; + getCapabilities() override; // own methods: /// @throws css::uno::RuntimeException - void impl_disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException ); + void impl_disposing( const css::lang::EventObject& Source ); /// @throws css::uno::RuntimeException - void impl_notify( const css::ucb::ListEvent& Changes ) - throw( css::uno::RuntimeException ); + void impl_notify( const css::ucb::ListEvent& Changes ); }; class SortedDynamicResultSetListener: public cppu::WeakImplHelper < @@ -142,13 +128,11 @@ public: // XEventListener ( base of XDynamicResultSetListener ) virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) override; + disposing( const css::lang::EventObject& Source ) override; // XDynamicResultSetListener - virtual void SAL_CALL notify( const css::ucb::ListEvent& Changes ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL notify( const css::ucb::ListEvent& Changes ) override; // own methods: @@ -177,12 +161,9 @@ public: // XSortedDynamicResultSetFactory - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -190,8 +171,7 @@ public: createSortedDynamicResultSet( 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, std::exception ) override; + const css::uno::Reference< css::ucb::XAnyCompareFactory > & CompareFactory ) override; }; #endif diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index 24a507a066a7..aa5580b06eb4 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -99,12 +99,9 @@ public: SRSPropertySetInfo(); // XPropertySetInfo - virtual Sequence< Property > SAL_CALL getProperties() - throw( RuntimeException, std::exception ) override; - virtual Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) override; + virtual Sequence< Property > SAL_CALL getProperties() override; + virtual Property SAL_CALL getPropertyByName( const OUString& aName ) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override; }; typedef OMultiTypeInterfaceContainerHelperVar<OUString> @@ -161,19 +158,16 @@ SortedResultSet::~SortedResultSet() // XServiceInfo methods. OUString SAL_CALL SortedResultSet::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.SortedResultSet" ); } sal_Bool SAL_CALL SortedResultSet::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL SortedResultSet::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { RESULTSET_SERVICE_NAME }; } @@ -182,7 +176,6 @@ css::uno::Sequence< OUString > SAL_CALL SortedResultSet::getSupportedServiceName // XComponent methods. void SAL_CALL SortedResultSet::dispose() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -214,7 +207,6 @@ void SAL_CALL SortedResultSet::dispose() void SAL_CALL SortedResultSet::addEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -228,7 +220,6 @@ void SAL_CALL SortedResultSet::addEventListener( void SAL_CALL SortedResultSet::removeEventListener( const Reference< XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -242,7 +233,6 @@ void SAL_CALL SortedResultSet::removeEventListener( OUString SAL_CALL SortedResultSet::queryContentIdentifierString() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifierString(); @@ -251,7 +241,6 @@ SortedResultSet::queryContentIdentifierString() Reference< XContentIdentifier > SAL_CALL SortedResultSet::queryContentIdentifier() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XContentAccess >::query(mxOriginal)->queryContentIdentifier(); @@ -260,7 +249,6 @@ SortedResultSet::queryContentIdentifier() Reference< XContent > SAL_CALL SortedResultSet::queryContent() - throw( RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XContentAccess >::query(mxOriginal)->queryContent(); @@ -270,7 +258,6 @@ SortedResultSet::queryContent() // XResultSet methods. sal_Bool SAL_CALL SortedResultSet::next() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -293,7 +280,6 @@ sal_Bool SAL_CALL SortedResultSet::next() sal_Bool SAL_CALL SortedResultSet::isBeforeFirst() - throw ( SQLException, RuntimeException, std::exception ) { if ( mnCurEntry ) return false; @@ -303,7 +289,6 @@ sal_Bool SAL_CALL SortedResultSet::isBeforeFirst() sal_Bool SAL_CALL SortedResultSet::isAfterLast() - throw ( SQLException, RuntimeException, std::exception ) { if ( mnCurEntry > mnCount ) return true; @@ -313,7 +298,6 @@ sal_Bool SAL_CALL SortedResultSet::isAfterLast() sal_Bool SAL_CALL SortedResultSet::isFirst() - throw ( SQLException, RuntimeException, std::exception ) { if ( mnCurEntry == 1 ) return true; @@ -323,7 +307,6 @@ sal_Bool SAL_CALL SortedResultSet::isFirst() sal_Bool SAL_CALL SortedResultSet::isLast() - throw ( SQLException, RuntimeException, std::exception ) { if ( mnCurEntry == mnCount ) return true; @@ -333,7 +316,6 @@ sal_Bool SAL_CALL SortedResultSet::isLast() void SAL_CALL SortedResultSet::beforeFirst() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); mnCurEntry = 0; @@ -342,7 +324,6 @@ void SAL_CALL SortedResultSet::beforeFirst() void SAL_CALL SortedResultSet::afterLast() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); mnCurEntry = mnCount+1; @@ -351,7 +332,6 @@ void SAL_CALL SortedResultSet::afterLast() sal_Bool SAL_CALL SortedResultSet::first() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -370,7 +350,6 @@ sal_Bool SAL_CALL SortedResultSet::first() sal_Bool SAL_CALL SortedResultSet::last() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -389,7 +368,6 @@ sal_Bool SAL_CALL SortedResultSet::last() sal_Int32 SAL_CALL SortedResultSet::getRow() - throw ( SQLException, RuntimeException, std::exception ) { return mnCurEntry; } @@ -421,7 +399,6 @@ sal_Int32 SAL_CALL SortedResultSet::getRow() type is FORWARD_ONLY. */ sal_Bool SAL_CALL SortedResultSet::absolute( sal_Int32 row ) - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -484,7 +461,6 @@ 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, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -529,7 +505,6 @@ sal_Bool SAL_CALL SortedResultSet::relative( sal_Int32 rows ) is FORWARD_ONLY. */ sal_Bool SAL_CALL SortedResultSet::previous() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -551,7 +526,6 @@ sal_Bool SAL_CALL SortedResultSet::previous() void SAL_CALL SortedResultSet::refreshRow() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -565,7 +539,6 @@ void SAL_CALL SortedResultSet::refreshRow() sal_Bool SAL_CALL SortedResultSet::rowUpdated() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -579,7 +552,6 @@ sal_Bool SAL_CALL SortedResultSet::rowUpdated() sal_Bool SAL_CALL SortedResultSet::rowInserted() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -593,7 +565,6 @@ sal_Bool SAL_CALL SortedResultSet::rowInserted() sal_Bool SAL_CALL SortedResultSet::rowDeleted() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -607,7 +578,6 @@ sal_Bool SAL_CALL SortedResultSet::rowDeleted() Reference< XInterface > SAL_CALL SortedResultSet::getStatement() - throw ( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -624,7 +594,6 @@ Reference< XInterface > SAL_CALL SortedResultSet::getStatement() sal_Bool SAL_CALL SortedResultSet::wasNull() - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->wasNull(); @@ -632,7 +601,6 @@ sal_Bool SAL_CALL SortedResultSet::wasNull() OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getString( columnIndex ); @@ -640,7 +608,6 @@ OUString SAL_CALL SortedResultSet::getString( sal_Int32 columnIndex ) sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getBoolean( columnIndex ); @@ -648,7 +615,6 @@ sal_Bool SAL_CALL SortedResultSet::getBoolean( sal_Int32 columnIndex ) sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getByte( columnIndex ); @@ -656,7 +622,6 @@ sal_Int8 SAL_CALL SortedResultSet::getByte( sal_Int32 columnIndex ) sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getShort( columnIndex ); @@ -664,14 +629,12 @@ sal_Int16 SAL_CALL SortedResultSet::getShort( sal_Int32 columnIndex ) sal_Int32 SAL_CALL SortedResultSet::getInt( sal_Int32 columnIndex ) - 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, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getLong( columnIndex ); @@ -679,7 +642,6 @@ sal_Int64 SAL_CALL SortedResultSet::getLong( sal_Int32 columnIndex ) float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getFloat( columnIndex ); @@ -687,7 +649,6 @@ float SAL_CALL SortedResultSet::getFloat( sal_Int32 columnIndex ) double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getDouble( columnIndex ); @@ -695,7 +656,6 @@ double SAL_CALL SortedResultSet::getDouble( sal_Int32 columnIndex ) Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getBytes( columnIndex ); @@ -703,7 +663,6 @@ Sequence< sal_Int8 > SAL_CALL SortedResultSet::getBytes( sal_Int32 columnIndex ) Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getDate( columnIndex ); @@ -711,7 +670,6 @@ Date SAL_CALL SortedResultSet::getDate( sal_Int32 columnIndex ) Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getTime( columnIndex ); @@ -719,7 +677,6 @@ Time SAL_CALL SortedResultSet::getTime( sal_Int32 columnIndex ) DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getTimestamp( columnIndex ); @@ -728,7 +685,6 @@ DateTime SAL_CALL SortedResultSet::getTimestamp( sal_Int32 columnIndex ) Reference< XInputStream > SAL_CALL SortedResultSet::getBinaryStream( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getBinaryStream( columnIndex ); @@ -737,7 +693,6 @@ SortedResultSet::getBinaryStream( sal_Int32 columnIndex ) Reference< XInputStream > SAL_CALL SortedResultSet::getCharacterStream( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getCharacterStream( columnIndex ); @@ -746,7 +701,6 @@ SortedResultSet::getCharacterStream( sal_Int32 columnIndex ) Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& typeMap ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getObject( columnIndex, @@ -755,7 +709,6 @@ Any SAL_CALL SortedResultSet::getObject( sal_Int32 columnIndex, Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getRef( columnIndex ); @@ -763,7 +716,6 @@ Reference< XRef > SAL_CALL SortedResultSet::getRef( sal_Int32 columnIndex ) Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getBlob( columnIndex ); @@ -771,7 +723,6 @@ Reference< XBlob > SAL_CALL SortedResultSet::getBlob( sal_Int32 columnIndex ) Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getClob( columnIndex ); @@ -779,7 +730,6 @@ Reference< XClob > SAL_CALL SortedResultSet::getClob( sal_Int32 columnIndex ) Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex ) - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XRow >::query(mxOriginal)->getArray( columnIndex ); @@ -790,7 +740,6 @@ Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex ) void SAL_CALL SortedResultSet::close() - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); Reference< XCloseable >::query(mxOriginal)->close(); @@ -801,7 +750,6 @@ void SAL_CALL SortedResultSet::close() Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData() - throw( SQLException, RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); return Reference< XResultSetMetaDataSupplier >::query(mxOriginal)->getMetaData(); @@ -812,7 +760,7 @@ Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData() Reference< XPropertySetInfo > SAL_CALL -SortedResultSet::getPropertySetInfo() throw( RuntimeException, std::exception ) +SortedResultSet::getPropertySetInfo() { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -828,11 +776,6 @@ SortedResultSet::getPropertySetInfo() throw( RuntimeException, std::exception ) void SAL_CALL SortedResultSet::setPropertyValue( const OUString& PropertyName, const Any& ) - throw( UnknownPropertyException, - PropertyVetoException, - IllegalArgumentException, - WrappedTargetException, - RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -844,9 +787,6 @@ void SAL_CALL SortedResultSet::setPropertyValue( Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -887,9 +827,6 @@ Any SAL_CALL SortedResultSet::getPropertyValue( const OUString& PropertyName ) void SAL_CALL SortedResultSet::addPropertyChangeListener( const OUString& PropertyName, const Reference< XPropertyChangeListener >& Listener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -904,9 +841,6 @@ void SAL_CALL SortedResultSet::addPropertyChangeListener( void SAL_CALL SortedResultSet::removePropertyChangeListener( const OUString& PropertyName, const Reference< XPropertyChangeListener >& Listener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -918,9 +852,6 @@ void SAL_CALL SortedResultSet::removePropertyChangeListener( void SAL_CALL SortedResultSet::addVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& Listener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -935,9 +866,6 @@ void SAL_CALL SortedResultSet::addVetoableChangeListener( void SAL_CALL SortedResultSet::removeVetoableChangeListener( const OUString& PropertyName, const Reference< XVetoableChangeListener >& Listener ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( maMutex ); @@ -952,8 +880,6 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResult const Reference < XResultSet >& xResultTwo, sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo, SortInfo* pSortInfo ) - - throw( SQLException, RuntimeException ) { Reference < XRow > xRowOne( xResultOne, UNO_QUERY ); Reference < XRow > xRowTwo( xResultTwo, UNO_QUERY ); @@ -1166,7 +1092,6 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResult sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResultOne, const Reference < XResultSet >& xResultTwo, sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo ) - throw( SQLException, RuntimeException ) { sal_IntPtr nCompare = 0; SortInfo* pInfo = mpSortInfo; @@ -1207,7 +1132,6 @@ sal_IntPtr SortedResultSet::CompareImpl( const Reference < XResultSet >& xResult sal_IntPtr SortedResultSet::Compare( SortListData *pOne, SortListData *pTwo ) - throw( SQLException, RuntimeException ) { sal_IntPtr nIndexOne; sal_IntPtr nIndexTwo; @@ -1246,7 +1170,6 @@ sal_IntPtr SortedResultSet::Compare( SortListData *pOne, sal_IntPtr SortedResultSet::FindPos( SortListData *pEntry, sal_IntPtr _nStart, sal_IntPtr _nEnd ) - throw( SQLException, RuntimeException ) { if ( _nStart > _nEnd ) return _nStart + 1; @@ -1872,7 +1795,7 @@ SRSPropertySetInfo::SRSPropertySetInfo() // XPropertySetInfo methods. Sequence< Property > SAL_CALL -SRSPropertySetInfo::getProperties() throw( RuntimeException, std::exception ) +SRSPropertySetInfo::getProperties() { return Sequence < Property > ( maProps, 2 ); } @@ -1880,7 +1803,6 @@ SRSPropertySetInfo::getProperties() throw( RuntimeException, std::exception ) Property SAL_CALL SRSPropertySetInfo::getPropertyByName( const OUString& Name ) - throw( UnknownPropertyException, RuntimeException, std::exception ) { if ( Name == "RowCount" ) return maProps[0]; @@ -1893,7 +1815,6 @@ SRSPropertySetInfo::getPropertyByName( const OUString& Name ) sal_Bool SAL_CALL SRSPropertySetInfo::hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) { if ( Name == "RowCount" ) return true; diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index f68d3ed69f89..9547bb827e1a 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/ucb/source/sorter/sortresult.hxx @@ -120,13 +120,11 @@ class SortedResultSet: public cppu::WeakImplHelper < private: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - sal_IntPtr FindPos( SortListData *pEntry, sal_IntPtr nStart, sal_IntPtr nEnd ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + sal_IntPtr FindPos( SortListData *pEntry, sal_IntPtr nStart, sal_IntPtr nEnd ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException sal_IntPtr Compare( SortListData *pOne, - SortListData *pTwo ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + SortListData *pTwo ); void BuildSortInfo( const css::uno::Reference< css::sdbc::XResultSet >& aResult, const css::uno::Sequence < css::ucb::NumberedSortingInfo > &xSortInfo, const css::uno::Reference< css::ucb::XAnyCompareFactory > &xCompFac ); @@ -135,14 +133,12 @@ private: static sal_IntPtr CompareImpl( const css::uno::Reference < css::sdbc::XResultSet >& xResultOne, const css::uno::Reference < css::sdbc::XResultSet >& xResultTwo, sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo, - SortInfo* pSortInfo ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + SortInfo* pSortInfo ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException sal_IntPtr CompareImpl( const css::uno::Reference < css::sdbc::XResultSet >& xResultOne, const css::uno::Reference < css::sdbc::XResultSet >& xResultTwo, - sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo ) - throw( css::sdbc::SQLException, css::uno::RuntimeException ); + sal_IntPtr nIndexOne, sal_IntPtr nIndexTwo ); void PropertyChanged( const css::beans::PropertyChangeEvent& rEvt ); public: @@ -165,245 +161,174 @@ public: void ResortNew( EventList* pList ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, - std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, - std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, - std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent virtual void SAL_CALL - dispose() throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& Listener ) override; // XContentAccess virtual OUString SAL_CALL - queryContentIdentifierString() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifierString() override; virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - queryContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifier() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent() - throw( css::uno::RuntimeException, std::exception ) override; + queryContent() override; // XResultSet virtual sal_Bool SAL_CALL - next() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + next() override; virtual sal_Bool SAL_CALL - isBeforeFirst() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + isBeforeFirst() override; virtual sal_Bool SAL_CALL - isAfterLast() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + isAfterLast() override; virtual sal_Bool SAL_CALL - isFirst() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + isFirst() override; virtual sal_Bool SAL_CALL - isLast() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + isLast() override; virtual void SAL_CALL - beforeFirst() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + beforeFirst() override; virtual void SAL_CALL - afterLast() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + afterLast() override; virtual sal_Bool SAL_CALL - first() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + first() override; virtual sal_Bool SAL_CALL - last() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + last() override; virtual sal_Int32 SAL_CALL - getRow() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getRow() override; virtual sal_Bool SAL_CALL - absolute( sal_Int32 row ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + absolute( sal_Int32 row ) override; virtual sal_Bool SAL_CALL - relative( sal_Int32 rows ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + relative( sal_Int32 rows ) override; virtual sal_Bool SAL_CALL - previous() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + previous() override; virtual void SAL_CALL - refreshRow() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + refreshRow() override; virtual sal_Bool SAL_CALL - rowUpdated() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + rowUpdated() override; virtual sal_Bool SAL_CALL - rowInserted() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + rowInserted() override; virtual sal_Bool SAL_CALL - rowDeleted() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + rowDeleted() override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getStatement() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getStatement() override; // XRow virtual sal_Bool SAL_CALL - wasNull() throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + wasNull() override; virtual OUString SAL_CALL - getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getString( sal_Int32 columnIndex ) override; virtual sal_Bool SAL_CALL - getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getBoolean( sal_Int32 columnIndex ) override; virtual sal_Int8 SAL_CALL - getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getByte( sal_Int32 columnIndex ) override; virtual sal_Int16 SAL_CALL - getShort( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getShort( sal_Int32 columnIndex ) override; virtual sal_Int32 SAL_CALL - getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getInt( sal_Int32 columnIndex ) override; virtual sal_Int64 SAL_CALL - getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getLong( sal_Int32 columnIndex ) override; virtual float SAL_CALL - getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getFloat( sal_Int32 columnIndex ) override; virtual double SAL_CALL - getDouble( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getDouble( sal_Int32 columnIndex ) override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getBytes( sal_Int32 columnIndex ) override; virtual css::util::Date SAL_CALL - getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getDate( sal_Int32 columnIndex ) override; virtual css::util::Time SAL_CALL - getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getTime( sal_Int32 columnIndex ) override; virtual css::util::DateTime SAL_CALL - getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getTimestamp( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getBinaryStream( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getCharacterStream( sal_Int32 columnIndex ) override; virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< - css::container::XNameAccess >& typeMap ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + css::container::XNameAccess >& typeMap ) override; virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL - getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getRef( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL - getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getBlob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL - getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getClob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL - getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getArray( sal_Int32 columnIndex ) override; // XCloseable virtual void SAL_CALL - close() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + close() override; // XResultSetMetaDataSupplier virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL - getMetaData() - throw( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + getMetaData() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception ) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& PropertyName, - const css::uno::Any& Value ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& Value ) override; virtual css::uno::Any SAL_CALL - getPropertyValue( const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + getPropertyValue( const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& PropertyName, const css::uno::Reference< - css::beans::XPropertyChangeListener >& Listener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + css::beans::XPropertyChangeListener >& Listener ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& PropertyName, const css::uno::Reference< - css::beans::XPropertyChangeListener >& Listener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + css::beans::XPropertyChangeListener >& Listener ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< - css::beans::XVetoableChangeListener >& Listener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + css::beans::XVetoableChangeListener >& Listener ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< - css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + css::beans::XVetoableChangeListener >& aListener ) override; }; #endif diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 65ba37d484fd..7d0ab609edce 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -287,7 +287,6 @@ namespace cmis Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, libcmis::ObjectPtr const & pObject ) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), m_pSession( nullptr ), @@ -306,7 +305,6 @@ namespace cmis Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, bool bIsFolder ) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), m_pSession( nullptr ), @@ -497,7 +495,7 @@ namespace cmis } - libcmis::ObjectPtr const & Content::getObject( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception) + libcmis::ObjectPtr const & Content::getObject( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) { // can't get the session for some reason // the recent file opening at start up is an example. @@ -974,7 +972,6 @@ namespace cmis uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, libcmis::Exception ) { bool bIsFolder = isFolder( xEnv ); @@ -1042,7 +1039,6 @@ namespace cmis OUString Content::checkIn( const ucb::CheckinArgument& rArg, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { ucbhelper::Content aSourceContent( rArg.SourceURL, xEnv, comphelper::getProcessComponentContext( ) ); uno::Reference< io::XInputStream > xIn = aSourceContent.openStream( ); @@ -1113,7 +1109,6 @@ namespace cmis } OUString Content::checkOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { OUString aRet; try @@ -1160,7 +1155,6 @@ namespace cmis } OUString Content::cancelCheckOut( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { OUString aRet; try @@ -1226,7 +1220,6 @@ namespace cmis } uno::Sequence< document::CmisVersion> Content::getAllVersions( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { try { @@ -1268,7 +1261,6 @@ namespace cmis void Content::transfer( const ucb::TransferInfo& rTransferInfo, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { // If the source isn't on the same CMIS repository, then simply copy INetURLObject aSourceUrl( rTransferInfo.SourceURL ); @@ -1292,7 +1284,6 @@ namespace cmis void Content::insert( const uno::Reference< io::XInputStream > & xInputStream, bool bReplaceExisting, const OUString& rMimeType, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw (uno::Exception, std::exception) { if ( !xInputStream.is() ) { @@ -1736,25 +1727,24 @@ namespace cmis ContentImplHelper::release(); } - uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception ) + uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) { 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, std::exception ) + OUString SAL_CALL Content::getImplementationName() { return OUString("com.sun.star.comp.CmisContent"); } uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.ucb.CmisContent" }; return aSNS; } - OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL Content::getContentType() { OUString sRet; try @@ -1781,7 +1771,6 @@ namespace cmis const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.cmis", "Content::execute( ) - " << aCommand.Name ); uno::Any aRet; @@ -1906,20 +1895,19 @@ namespace cmis return aRet; } - void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException, std::exception ) + void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) { SAL_INFO( "ucb.ucp.cmis", "TODO - Content::abort()" ); // TODO Implement me } uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - 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, std::exception ) + const ucb::ContentInfo& Info ) { bool create_document; @@ -1949,7 +1937,7 @@ namespace cmis } } - uno::Sequence< uno::Type > SAL_CALL Content::getTypes() throw( uno::RuntimeException, std::exception ) + uno::Sequence< uno::Type > SAL_CALL Content::getTypes() { try { @@ -1999,7 +1987,6 @@ namespace cmis uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( const uno::Reference< ucb::XCommandEnvironment >& xEnv) - throw( uno::RuntimeException ) { try { diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index d7b1aec656f9..270a232ed556 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -89,32 +89,26 @@ private: /// @throws css::uno::Exception /// @throws libcmis::Exception css::uno::Any open(const css::ucb::OpenCommandArgument2 & rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, libcmis::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void transfer( const css::ucb::TransferInfo& rTransferInfo, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, bool bReplaceExisting, const OUString & rMimeType, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw (css::uno::Exception, std::exception); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception OUString checkIn( const css::ucb::CheckinArgument& rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception - OUString checkOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + OUString checkOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception - OUString cancelCheckOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + OUString cancelCheckOut( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); static void copyData( const css::uno::Reference< css::io::XInputStream >& xIn, const css::uno::Reference< css::io::XOutputStream >& xOut ); @@ -125,9 +119,7 @@ private: /// @throws css::uno::Exception css::uno::Sequence< css::document::CmisVersion > - getAllVersions( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw(css::uno::Exception, - std::exception); + getAllVersions( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); bool feedSink( const css::uno::Reference< css::uno::XInterface>& aSink, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); @@ -137,15 +129,13 @@ public: Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - libcmis::ObjectPtr const & pObject = libcmis::ObjectPtr( ) ) - throw ( css::ucb::ContentCreationException ); + libcmis::ObjectPtr const & pObject = libcmis::ObjectPtr( ) ); /// @throws css::ucb::ContentCreationException Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - bool bIsFolder) - throw ( css::ucb::ContentCreationException ); + bool bIsFolder); virtual ~Content() override; @@ -162,58 +152,47 @@ public: virtual OUString getParentURL() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; - virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL abort( sal_Int32 CommandId ) override; virtual css::uno::Sequence< css::ucb::ContentInfo > - SAL_CALL queryCreatableContentsInfo() - throw( css::uno::RuntimeException, std::exception ) override; + SAL_CALL queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > - SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException, std::exception ) override; + SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) override; /// @throws css::uno::RuntimeException css::uno::Sequence< css::ucb::ContentInfo > - queryCreatableContentsInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw( css::uno::RuntimeException ); + queryCreatableContentsInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override; /// @throws css::uno::RuntimeException /// @throws css::ucb::CommandFailedException /// @throws libcmis::Exception - libcmis::ObjectPtr const & getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception); + libcmis::ObjectPtr const & getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); }; } diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.cxx b/ucb/source/ucp/cmis/cmis_datasupplier.cxx index 14b3385ec712..9f9fbae0cb0b 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.cxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.cxx @@ -166,7 +166,7 @@ namespace cmis { } - void DataSupplier::validate() throw( ucb::ResultSetException ) + void DataSupplier::validate() { } diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx index 2e3dd1ba272b..619af90e355c 100644 --- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx +++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx @@ -65,8 +65,7 @@ namespace cmis virtual void close() override; - virtual void validate() - throw( css::ucb::ResultSetException ) override; + virtual void validate() override; }; } diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index a022c44a2d3e..a906ac609d6f 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -23,8 +23,6 @@ namespace cmis uno::Reference< css::ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -103,7 +101,6 @@ void SAL_CALL ContentProvider::release() } css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -123,7 +120,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) )); diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx index 3915c0664e81..cfca2923de13 100644 --- a/ucb/source/ucp/cmis/cmis_provider.hxx +++ b/ucb/source/ucp/cmis/cmis_provider.hxx @@ -27,26 +27,20 @@ public: virtual ~ContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -57,9 +51,7 @@ public: // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; libcmis::Session* getSession( const OUString& sBindingUrl, const OUString& sUsername ); void registerSession( const OUString& sBindingUrl, const OUString& sUsername, libcmis::Session* pSession ); diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index b0726898cae7..a1a4bd0bedcd 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -50,7 +50,6 @@ namespace cmis RepoContent::RepoContent( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider *pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, vector< libcmis::RepositoryPtr > const & aRepos ) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), m_aURL( Identifier->getContentIdentifier( ) ), @@ -320,19 +319,18 @@ namespace cmis XTYPEPROVIDER_COMMON_IMPL( RepoContent ); - OUString SAL_CALL RepoContent::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL RepoContent::getImplementationName() { return OUString("com.sun.star.comp.CmisRepoContent"); } uno::Sequence< OUString > SAL_CALL RepoContent::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.ucb.Content" }; return aSNS; } - OUString SAL_CALL RepoContent::getContentType() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL RepoContent::getContentType() { return OUString( CMIS_REPO_TYPE ); } @@ -341,7 +339,6 @@ namespace cmis const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, ucb::CommandAbortedException, uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.cmis", "RepoContent::execute( ) - " << aCommand.Name ); @@ -378,13 +375,13 @@ namespace cmis return aRet; } - void SAL_CALL RepoContent::abort( sal_Int32 /*CommandId*/ ) throw( uno::RuntimeException, std::exception ) + void SAL_CALL RepoContent::abort( sal_Int32 /*CommandId*/ ) { SAL_INFO( "ucb.ucp.cmis", "TODO - RepoContent::abort()" ); // TODO Implement me } - uno::Sequence< uno::Type > SAL_CALL RepoContent::getTypes() throw( uno::RuntimeException, std::exception ) + uno::Sequence< uno::Type > SAL_CALL RepoContent::getTypes() { 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 ba5f18154481..4be969ee1c24 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.hxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx @@ -76,8 +76,7 @@ public: RepoContent( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - std::vector< libcmis::RepositoryPtr > const & aRepos = std::vector< libcmis::RepositoryPtr > ( ) ) - throw ( css::ucb::ContentCreationException ); + std::vector< libcmis::RepositoryPtr > const & aRepos = std::vector< libcmis::RepositoryPtr > ( ) ); virtual ~RepoContent() override; @@ -91,31 +90,24 @@ public: // XInterface - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; - virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL abort( sal_Int32 CommandId ) override; virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override; }; diff --git a/ucb/source/ucp/cmis/std_inputstream.cxx b/ucb/source/ucp/cmis/std_inputstream.cxx index 4a6b1c468d34..18f850545fc5 100644 --- a/ucb/source/ucp/cmis/std_inputstream.cxx +++ b/ucb/source/ucp/cmis/std_inputstream.cxx @@ -37,7 +37,7 @@ namespace cmis { } - uno::Any SAL_CALL StdInputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception ) + uno::Any SAL_CALL StdInputStream::queryInterface( const uno::Type& rType ) { uno::Any aRet = ::cppu::queryInterface( rType, ( static_cast< XInputStream* >( this ) ), @@ -57,8 +57,6 @@ namespace cmis } sal_Int32 SAL_CALL StdInputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); @@ -85,8 +83,6 @@ namespace cmis sal_Int32 SAL_CALL StdInputStream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( m_aMutex ); @@ -110,8 +106,6 @@ namespace cmis } void SAL_CALL StdInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -130,19 +124,16 @@ namespace cmis } sal_Int32 SAL_CALL StdInputStream::available( ) - throw(io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception ) { return sal::static_int_cast< sal_Int32 >( m_nLength - getPosition() ); } void SAL_CALL StdInputStream::closeInput( ) - throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) { // No need to implement this for an istream } void SAL_CALL StdInputStream::seek( sal_Int64 location ) - throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -167,7 +158,6 @@ namespace cmis } sal_Int64 SAL_CALL StdInputStream::getPosition( ) - throw( io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -182,7 +172,6 @@ namespace cmis } sal_Int64 SAL_CALL StdInputStream::getLength( ) - throw ( io::IOException, uno::RuntimeException, std::exception ) { return m_nLength; } diff --git a/ucb/source/ucp/cmis/std_inputstream.hxx b/ucb/source/ucp/cmis/std_inputstream.hxx index ba7338c76375..40596a33787a 100644 --- a/ucb/source/ucp/cmis/std_inputstream.hxx +++ b/ucb/source/ucp/cmis/std_inputstream.hxx @@ -36,8 +36,7 @@ namespace cmis virtual ~StdInputStream() override; - virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface ( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire( ) throw ( ) override; @@ -45,59 +44,35 @@ namespace cmis virtual sal_Int32 SAL_CALL readBytes ( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nBytesToRead ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nBytesToRead ) override; virtual sal_Int32 SAL_CALL readSomeBytes ( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nMaxBytesToRead ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nMaxBytesToRead ) override; virtual void SAL_CALL - skipBytes ( sal_Int32 nBytesToSkip ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + skipBytes ( sal_Int32 nBytesToSkip ) override; virtual sal_Int32 SAL_CALL - available ( ) - throw ( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + available ( ) override; virtual void SAL_CALL - closeInput ( ) - throw ( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeInput ( ) override; /** XSeekable */ virtual void SAL_CALL - seek ( sal_Int64 location ) - throw ( css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + seek ( sal_Int64 location ) override; virtual sal_Int64 SAL_CALL - getPosition ( ) - throw ( css::io::IOException, css::uno::RuntimeException, std::exception ) override; + getPosition ( ) override; virtual sal_Int64 SAL_CALL - getLength ( ) - throw ( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + getLength ( ) override; private: diff --git a/ucb/source/ucp/cmis/std_outputstream.cxx b/ucb/source/ucp/cmis/std_outputstream.cxx index c26f0ef30885..1cd4ec13350c 100644 --- a/ucb/source/ucp/cmis/std_outputstream.cxx +++ b/ucb/source/ucp/cmis/std_outputstream.cxx @@ -29,7 +29,7 @@ namespace cmis m_pStream->setstate( ios::eofbit ); } - uno::Any SAL_CALL StdOutputStream::queryInterface( const uno::Type& rType ) throw ( uno::RuntimeException, std::exception ) + uno::Any SAL_CALL StdOutputStream::queryInterface( const uno::Type& rType ) { uno::Any aRet = ::cppu::queryInterface( rType, ( static_cast< XOutputStream* >( this ) ) ); @@ -47,8 +47,6 @@ namespace cmis } void SAL_CALL StdOutputStream::writeBytes ( const uno::Sequence< sal_Int8 >& aData ) - throw ( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -67,8 +65,6 @@ namespace cmis } void SAL_CALL StdOutputStream::flush ( ) - throw ( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -87,8 +83,6 @@ namespace cmis } void SAL_CALL StdOutputStream::closeOutput ( ) - throw ( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/cmis/std_outputstream.hxx b/ucb/source/ucp/cmis/std_outputstream.hxx index 1521bbd211db..574948c7a546 100644 --- a/ucb/source/ucp/cmis/std_outputstream.hxx +++ b/ucb/source/ucp/cmis/std_outputstream.hxx @@ -33,30 +33,17 @@ namespace cmis virtual ~StdOutputStream( ) override; - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire ( ) throw ( ) override; virtual void SAL_CALL release ( ) throw ( ) override; - virtual void SAL_CALL writeBytes ( const css::uno::Sequence< sal_Int8 >& aData ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL flush ( ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL closeOutput ( ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL writeBytes ( const css::uno::Sequence< sal_Int8 >& aData ) override; + + virtual void SAL_CALL flush ( ) override; + + virtual void SAL_CALL closeOutput ( ) override; private: diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx index 71ed084d30fa..9c6b4c2e4b0a 100644 --- a/ucb/source/ucp/expand/ucpexpand.cxx +++ b/ucb/source/ucp/expand/ucpexpand.cxx @@ -71,21 +71,16 @@ public: {} // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XContentProvider virtual uno::Reference< ucb::XContent > SAL_CALL queryContent( - uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) - throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception) override; + uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) override; virtual sal_Int32 SAL_CALL compareContentIds( uno::Reference< ucb::XContentIdentifier > const & xId1, - uno::Reference< ucb::XContentIdentifier > const & xId2 ) - throw (uno::RuntimeException, std::exception) override; + uno::Reference< ucb::XContentIdentifier > const & xId2 ) override; }; @@ -134,7 +129,6 @@ uno::Sequence< OUString > SAL_CALL supportedServices() // XServiceInfo OUString ExpandContentProviderImpl::getImplementationName() - throw (uno::RuntimeException, std::exception) { check(); return implName(); @@ -142,14 +136,12 @@ OUString ExpandContentProviderImpl::getImplementationName() uno::Sequence< OUString > ExpandContentProviderImpl::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { check(); return supportedServices(); } sal_Bool ExpandContentProviderImpl::supportsService(OUString const & serviceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } @@ -178,7 +170,6 @@ OUString ExpandContentProviderImpl::expandUri( uno::Reference< ucb::XContent > ExpandContentProviderImpl::queryContent( uno::Reference< ucb::XContentIdentifier > const & xIdentifier ) - throw (ucb::IllegalIdentifierException, uno::RuntimeException, std::exception) { check(); OUString uri( expandUri( xIdentifier ) ); @@ -200,7 +191,6 @@ 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, std::exception) { check(); try diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index e7f52419935b..85a008dee62b 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -160,13 +160,13 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL Content::getImplementationName() throw( RuntimeException, std::exception ) + OUString SAL_CALL Content::getImplementationName() { return OUString( "org.openoffice.comp.ucp.ext.Content" ); } - Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException, std::exception ) + Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() { Sequence< OUString > aServiceNames(2); aServiceNames[0] = "com.sun.star.ucb.Content"; @@ -175,7 +175,7 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL Content::getContentType() throw( RuntimeException, std::exception ) + OUString SAL_CALL Content::getContentType() { impl_determineContentType(); return *m_aContentType; @@ -183,7 +183,6 @@ 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, std::exception ) { Any aRet; @@ -274,7 +273,7 @@ namespace ucb { namespace ucp { namespace ext } - void SAL_CALL Content::abort( sal_Int32 ) throw( RuntimeException, std::exception ) + void SAL_CALL Content::abort( sal_Int32 ) { } diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index c01a330e1f1b..89c8498d36d8 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -89,11 +89,11 @@ namespace ucb { namespace ucp { namespace ext virtual ~Content() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XContent - virtual OUString SAL_CALL getContentType() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getContentType() override; // XCommandProcessor virtual css::uno::Any SAL_CALL @@ -101,18 +101,12 @@ namespace ucb { namespace ucp { namespace ext const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment - ) - throw ( css::uno::Exception - , css::ucb::CommandAbortedException - , css::uno::RuntimeException, std::exception - ) override; + ) override; virtual void SAL_CALL abort( sal_Int32 CommandId - ) - throw ( css::uno::RuntimeException, std::exception - ) override; + ) override; private: virtual css::uno::Sequence< css::beans::Property > getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment >& i_rEnv ) override; diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index ca437c51b2b5..1f8f0eb4af5d 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -337,7 +337,7 @@ namespace ucb { namespace ucp { namespace ext } - void DataSupplier::validate() throw( ResultSetException ) + void DataSupplier::validate() { } diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index b9a7fccb2d11..fe7effa5640f 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -65,7 +65,7 @@ namespace ucb { namespace ucp { namespace ext virtual void close() override; - virtual void validate() throw( css::ucb::ResultSetException ) override; + virtual void validate() override; private: std::unique_ptr< DataSupplier_Impl > m_pImpl; diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 6da0f7fb8f5b..0d955baebda7 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -54,19 +54,19 @@ namespace ucb { namespace ucp { namespace ext } - OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) + OUString SAL_CALL ContentProvider::getImplementationName_static() { return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); } - OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException, std::exception) + OUString SAL_CALL ContentProvider::getImplementationName() { return getImplementationName_static(); } - Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) { Sequence< OUString > aServiceNames(2); aServiceNames[0] = "com.sun.star.ucb.ContentProvider"; @@ -75,7 +75,7 @@ namespace ucb { namespace ucp { namespace ext } - Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } @@ -112,7 +112,6 @@ namespace ucb { namespace ucp { namespace ext Reference< XContent > SAL_CALL ContentProvider::queryContent( const Reference< XContentIdentifier >& i_rIdentifier ) - 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 af8d00c4f5fc..e69f827b33aa 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -37,18 +37,18 @@ namespace ucb { namespace ucp { namespace ext virtual ~ContentProvider() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_static( ) throw (css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL Create( const css::uno::Reference< css::uno::XComponentContext >& i_rContext ); // XContentProvider - virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) throw (css::ucb::IllegalIdentifierException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; public: static OUString getRootURL(); diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index bafc57cab2d9..6f45334bc53f 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -153,7 +153,6 @@ BaseContent::release() Any SAL_CALL BaseContent::queryInterface( const Type& rType ) - throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< lang::XComponent* >(this)), @@ -175,7 +174,6 @@ BaseContent::queryInterface( const Type& rType ) void SAL_CALL BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -189,7 +187,6 @@ BaseContent::addEventListener( const Reference< lang::XEventListener >& Listener void SAL_CALL BaseContent::removeEventListener( const Reference< lang::XEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -200,7 +197,6 @@ BaseContent::removeEventListener( const Reference< lang::XEventListener >& Liste void SAL_CALL BaseContent::dispose() - throw( RuntimeException, std::exception ) { lang::EventObject aEvt; comphelper::OInterfaceContainerHelper2* pDisposeEventListeners; @@ -247,21 +243,18 @@ BaseContent::dispose() // XServiceInfo OUString SAL_CALL BaseContent::getImplementationName() - throw( RuntimeException, std::exception) { return OUString("com.sun.star.comp.ucb.FileContent"); } sal_Bool SAL_CALL BaseContent::supportsService( const OUString& ServiceName ) - throw( RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } Sequence< OUString > SAL_CALL BaseContent::getSupportedServiceNames() - throw( RuntimeException, std::exception ) { Sequence<OUString> ret { "com.sun.star.ucb.FileContent" }; return ret; @@ -286,7 +279,6 @@ XTYPEPROVIDER_IMPL_10( BaseContent, sal_Int32 SAL_CALL BaseContent::createCommandIdentifier() - throw( RuntimeException, std::exception ) { return m_pMyShell->getCommandId(); } @@ -294,7 +286,6 @@ BaseContent::createCommandIdentifier() void SAL_CALL BaseContent::abort( sal_Int32 CommandId ) - throw( RuntimeException, std::exception ) { m_pMyShell->abort( CommandId ); } @@ -304,9 +295,6 @@ Any SAL_CALL BaseContent::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) - throw( Exception, - CommandAbortedException, - RuntimeException, std::exception ) { if( ! CommandId ) // A Command with commandid zero cannot be aborted @@ -423,7 +411,6 @@ void SAL_CALL BaseContent::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { if( ! Listener.is() ) return; @@ -449,7 +436,6 @@ BaseContent::addPropertiesChangeListener( void SAL_CALL BaseContent::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< beans::XPropertiesChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { if( ! Listener.is() ) return; @@ -471,7 +457,6 @@ BaseContent::removePropertiesChangeListener( const Sequence< OUString >& Propert Reference< ucb::XContentIdentifier > SAL_CALL BaseContent::getIdentifier() - throw( RuntimeException, std::exception ) { return m_xContentIdentifier; } @@ -479,7 +464,6 @@ BaseContent::getIdentifier() OUString SAL_CALL BaseContent::getContentType() - throw( RuntimeException, std::exception ) { if( !( m_nState & Deleted ) ) { @@ -529,7 +513,6 @@ BaseContent::getContentType() void SAL_CALL BaseContent::addContentEventListener( const Reference< XContentEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -545,7 +528,6 @@ BaseContent::addContentEventListener( void SAL_CALL BaseContent::removeContentEventListener( const Reference< XContentEventListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -562,10 +544,6 @@ BaseContent::addProperty( const OUString& Name, sal_Int16 Attributes, const Any& DefaultValue ) - throw( beans::PropertyExistException, - beans::IllegalTypeException, - lang::IllegalArgumentException, - RuntimeException, std::exception) { if( ( m_nState & JustInserted ) || ( m_nState & Deleted ) || Name.isEmpty() ) { @@ -578,9 +556,6 @@ BaseContent::addProperty( void SAL_CALL BaseContent::removeProperty( const OUString& Name ) - throw( beans::UnknownPropertyException, - beans::NotRemoveableException, - RuntimeException, std::exception) { if( m_nState & Deleted ) @@ -595,7 +570,6 @@ BaseContent::removeProperty( const OUString& Name ) Sequence< ContentInfo > SAL_CALL BaseContent::queryCreatableContentsInfo() - throw( RuntimeException, std::exception ) { return m_pMyShell->queryCreatableContentsInfo(); } @@ -603,7 +577,6 @@ BaseContent::queryCreatableContentsInfo() Reference< XContent > SAL_CALL BaseContent::createNewContent( const ContentInfo& Info ) - throw( RuntimeException, std::exception ) { // Check type. if ( Info.Type.isEmpty() ) @@ -666,7 +639,6 @@ BaseContent::createNewContent( const ContentInfo& Info ) void SAL_CALL BaseContent::addPropertySetInfoChangeListener( const Reference< beans::XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); if( ! m_pPropertySetInfoChangeListeners ) @@ -679,7 +651,6 @@ BaseContent::addPropertySetInfoChangeListener( void SAL_CALL BaseContent::removePropertySetInfoChangeListener( const Reference< beans::XPropertySetInfoChangeListener >& Listener ) - throw( RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -693,7 +664,6 @@ BaseContent::removePropertySetInfoChangeListener( Reference< XInterface > SAL_CALL BaseContent::getParent() - throw( RuntimeException, std::exception ) { OUString ParentUnq = getParentName( m_aUncPath ); OUString ParentUrl; @@ -720,8 +690,6 @@ BaseContent::getParent() void SAL_CALL BaseContent::setParent( const Reference< XInterface >& ) - throw( lang::NoSupportException, - RuntimeException, std::exception) { throw lang::NoSupportException( THROW_WHERE ); } @@ -732,7 +700,6 @@ BaseContent::setParent( Reference< XCommandInfo > SAL_CALL BaseContent::getCommandInfo() - throw( RuntimeException ) { if( m_nState & Deleted ) return Reference< XCommandInfo >(); @@ -744,7 +711,6 @@ BaseContent::getCommandInfo() Reference< beans::XPropertySetInfo > SAL_CALL BaseContent::getPropertySetInfo( sal_Int32 ) - throw( RuntimeException ) { if( m_nState & Deleted ) return Reference< beans::XPropertySetInfo >(); @@ -756,7 +722,6 @@ Reference< sdbc::XRow > SAL_CALL BaseContent::getPropertyValues( sal_Int32 nMyCommandIdentifier, const Sequence< beans::Property >& PropertySet ) - throw( RuntimeException, std::exception ) { sal_Int32 nProps = PropertySet.getLength(); if ( !nProps ) diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx index 75ebdbd0cd9b..e6d82ad6f393 100644 --- a/ucb/source/ucp/file/bc.hxx +++ b/ucb/source/ucp/file/bc.hxx @@ -88,8 +88,7 @@ namespace fileaccess { // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception) override; + queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() @@ -102,91 +101,72 @@ namespace fileaccess { // XComponent virtual void SAL_CALL - dispose() - throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL addEventListener( - const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XCommandProcessor virtual sal_Int32 SAL_CALL - createCommandIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + createCommandIdentifier() override; virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; virtual void SAL_CALL - abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + abort( sal_Int32 CommandId ) override; // XContent virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - getIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + getIdentifier() override; virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; virtual void SAL_CALL addContentEventListener( - const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override; virtual void SAL_CALL removeContentEventListener( - const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentEventListener >& Listener ) override; // XPropertiesChangeNotifier virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override; virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Sequence< OUString >& PropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& Listener ) override; // XPropertyContainer @@ -194,51 +174,38 @@ namespace fileaccess { addProperty( const OUString& Name, sal_Int16 Attributes, - const css::uno::Any& DefaultValue ) - throw( css::beans::PropertyExistException, - css::beans::IllegalTypeException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& DefaultValue ) override; virtual void SAL_CALL - removeProperty( const OUString& Name ) - throw( css::beans::UnknownPropertyException, - css::beans::NotRemoveableException, - css::uno::RuntimeException, std::exception ) override; + removeProperty( const OUString& Name ) override; // XPropertySetInfoChangeNotifier virtual void SAL_CALL addPropertySetInfoChangeListener( - const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override; virtual void SAL_CALL removePropertySetInfoChangeListener( - const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertySetInfoChangeListener >& Listener ) override; // XContentCreator virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL - queryCreatableContentsInfo() - throw( css::uno::RuntimeException, std::exception ) override; + queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException, std::exception ) override; + createNewContent( const css::ucb::ContentInfo& Info ) override; // XChild virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getParent() throw( css::uno::RuntimeException, std::exception ) override; + getParent() override; // Not supported virtual void SAL_CALL - setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) - throw( css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; // Notifier @@ -274,21 +241,18 @@ namespace fileaccess { // Private Methods /// @throws css::uno::RuntimeException css::uno::Reference< css::ucb::XCommandInfo > SAL_CALL - getCommandInfo() - throw( css::uno::RuntimeException ); + getCommandInfo(); /// @throws css::uno::RuntimeException css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( - sal_Int32 nMyCommandIdentifier ) - throw( css::uno::RuntimeException ); + sal_Int32 nMyCommandIdentifier ); /// @throws css::uno::RuntimeException css::uno::Reference< css::sdbc::XRow > SAL_CALL getPropertyValues( sal_Int32 nMyCommandIdentifier, - const css::uno::Sequence< css::beans::Property >& PropertySet ) - throw( css::uno::RuntimeException, std::exception ); + const css::uno::Sequence< css::beans::Property >& PropertySet ); css::uno::Sequence< css::uno::Any > SAL_CALL setPropertyValues( diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index daa4e7415918..72c67f1557c7 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -59,7 +59,6 @@ XCommandInfo_impl::release() uno::Any SAL_CALL XCommandInfo_impl::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< XCommandInfo* >(this)) ); @@ -69,7 +68,6 @@ XCommandInfo_impl::queryInterface( const uno::Type& rType ) uno::Sequence< CommandInfo > SAL_CALL XCommandInfo_impl::getCommands() - throw( uno::RuntimeException, std::exception ) { return m_pMyShell->m_sCommandInfo; } @@ -78,8 +76,6 @@ XCommandInfo_impl::getCommands() CommandInfo SAL_CALL XCommandInfo_impl::getCommandInfoByName( const OUString& aName ) - throw( UnsupportedCommandException, - uno::RuntimeException, std::exception) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); i++ ) if( m_pMyShell->m_sCommandInfo[i].Name == aName ) @@ -92,8 +88,6 @@ XCommandInfo_impl::getCommandInfoByName( CommandInfo SAL_CALL XCommandInfo_impl::getCommandInfoByHandle( sal_Int32 Handle ) - throw( UnsupportedCommandException, - uno::RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_pMyShell->m_sCommandInfo.getLength(); ++i ) if( m_pMyShell->m_sCommandInfo[i].Handle == Handle ) @@ -106,7 +100,6 @@ XCommandInfo_impl::getCommandInfoByHandle( sal_Bool SAL_CALL XCommandInfo_impl::hasCommandByName( const OUString& aName ) - 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 ) @@ -119,7 +112,6 @@ XCommandInfo_impl::hasCommandByName( sal_Bool SAL_CALL XCommandInfo_impl::hasCommandByHandle( sal_Int32 Handle ) - 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 c9b686c49408..a42bc2422730 100644 --- a/ucb/source/ucp/file/filcmd.hxx +++ b/ucb/source/ucp/file/filcmd.hxx @@ -45,8 +45,7 @@ namespace fileaccess { // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception) override; + queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() @@ -59,26 +58,19 @@ namespace fileaccess { // XCommandInfo virtual css::uno::Sequence< css::ucb::CommandInfo > SAL_CALL - getCommands() - throw( css::uno::RuntimeException, std::exception) override; + getCommands() override; virtual css::ucb::CommandInfo SAL_CALL - getCommandInfoByName( const OUString& Name ) - throw( css::ucb::UnsupportedCommandException, - css::uno::RuntimeException, std::exception) override; + getCommandInfoByName( const OUString& Name ) override; virtual css::ucb::CommandInfo SAL_CALL - getCommandInfoByHandle( sal_Int32 Handle ) - throw( css::ucb::UnsupportedCommandException, - css::uno::RuntimeException, std::exception ) override; + getCommandInfoByHandle( sal_Int32 Handle ) override; virtual sal_Bool SAL_CALL - hasCommandByName( const OUString& Name ) - throw( css::uno::RuntimeException, std::exception ) override; + hasCommandByName( const OUString& Name ) override; virtual sal_Bool SAL_CALL - hasCommandByHandle( sal_Int32 Handle ) - throw( css::uno::RuntimeException, std::exception ) override; + hasCommandByHandle( sal_Int32 Handle ) override; private: diff --git a/ucb/source/ucp/file/filid.cxx b/ucb/source/ucp/file/filid.cxx index 5ef3565c8988..220d19fbd1f2 100644 --- a/ucb/source/ucp/file/filid.cxx +++ b/ucb/source/ucp/file/filid.cxx @@ -68,7 +68,6 @@ FileContentIdentifier::release() uno::Any SAL_CALL FileContentIdentifier::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -79,7 +78,6 @@ FileContentIdentifier::queryInterface( const uno::Type& rType ) uno::Sequence< sal_Int8 > SAL_CALL FileContentIdentifier::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -87,7 +85,6 @@ FileContentIdentifier::getImplementationId() uno::Sequence< uno::Type > SAL_CALL FileContentIdentifier::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { @@ -107,7 +104,6 @@ FileContentIdentifier::getTypes() OUString SAL_CALL FileContentIdentifier::getContentIdentifier() - throw( uno::RuntimeException, std::exception ) { return m_aContentId; } @@ -115,7 +111,6 @@ FileContentIdentifier::getContentIdentifier() OUString SAL_CALL FileContentIdentifier::getContentProviderScheme() - throw( uno::RuntimeException, std::exception ) { return m_aProviderScheme; } diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx index be04b008670c..428d4b4d91cc 100644 --- a/ucb/source/ucp/file/filid.hxx +++ b/ucb/source/ucp/file/filid.hxx @@ -43,8 +43,7 @@ namespace fileaccess { // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() @@ -56,21 +55,17 @@ namespace fileaccess { // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationId() override; // XContentIdentifier virtual OUString SAL_CALL - getContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + getContentIdentifier() override; virtual OUString SAL_CALL - getContentProviderScheme() - throw( css::uno::RuntimeException, std::exception ) override; + getContentProviderScheme() override; private: OUString m_aContentId; // The URL string diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 9b6d560e8c01..afbc02c950eb 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -83,7 +83,6 @@ XTYPEPROVIDER_IMPL_3( XInputStream_impl, uno::Any SAL_CALL XInputStream_impl::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception) { uno::Any aRet = cppu::queryInterface( rType, (static_cast< io::XInputStream* >(this)), @@ -113,10 +112,6 @@ sal_Int32 SAL_CALL XInputStream_impl::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { if( ! m_nIsOpen ) throw io::IOException( THROW_WHERE ); @@ -141,10 +136,6 @@ sal_Int32 SAL_CALL XInputStream_impl::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { return readBytes( aData,nMaxBytesToRead ); } @@ -152,10 +143,6 @@ XInputStream_impl::readSomeBytes( void SAL_CALL XInputStream_impl::skipBytes( sal_Int32 nBytesToSkip ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) ); } @@ -163,9 +150,6 @@ XInputStream_impl::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL XInputStream_impl::available() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception) { return 0; } @@ -173,9 +157,6 @@ XInputStream_impl::available() void SAL_CALL XInputStream_impl::closeInput() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { if( m_nIsOpen ) { @@ -189,9 +170,6 @@ XInputStream_impl::closeInput() void SAL_CALL XInputStream_impl::seek( sal_Int64 location ) - throw( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { if( location < 0 ) throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 ); @@ -202,8 +180,6 @@ XInputStream_impl::seek( sal_Int64 location ) sal_Int64 SAL_CALL XInputStream_impl::getPosition() - throw( io::IOException, - uno::RuntimeException, std::exception ) { sal_uInt64 uPos; if( osl::FileBase::E_None != m_aFile.getPos( uPos ) ) @@ -213,8 +189,6 @@ XInputStream_impl::getPosition() sal_Int64 SAL_CALL XInputStream_impl::getLength() - throw( io::IOException, - 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 8dc6c28db4e6..4e2c622e82b9 100644 --- a/ucb/source/ucp/file/filinpstr.hxx +++ b/ucb/source/ucp/file/filinpstr.hxx @@ -56,14 +56,11 @@ namespace fileaccess { // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& rType ) - throw( css::uno::RuntimeException, std::exception) override; + queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() @@ -76,55 +73,30 @@ namespace fileaccess { virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nBytesToRead ) override; virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nMaxBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nMaxBytesToRead ) override; virtual void SAL_CALL - skipBytes( sal_Int32 nBytesToSkip ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + skipBytes( sal_Int32 nBytesToSkip ) override; virtual sal_Int32 SAL_CALL - available() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + available() override; virtual void SAL_CALL - closeInput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeInput() override; virtual void SAL_CALL - seek( sal_Int64 location ) - throw( css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + seek( sal_Int64 location ) override; virtual sal_Int64 SAL_CALL - getPosition() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + getPosition() override; virtual sal_Int64 SAL_CALL - getLength() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + getLength() override; private: diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index 549f008daaa0..93c526f3571d 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -45,14 +45,12 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< { } - virtual void SAL_CALL select() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL select() override { m_bSelected = true; } - void SAL_CALL setName(const OUString& Name) - throw(css::uno::RuntimeException, std::exception) override + void SAL_CALL setName(const OUString& Name) override { m_aNewName = Name; } @@ -84,8 +82,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< { } - virtual void SAL_CALL select() - throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL select() override { m_bSelected = true; } diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index be7fbecfeb64..179eb487098a 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -76,8 +76,6 @@ XPropertySetInfo_impl::~XPropertySetInfo_impl() beans::Property SAL_CALL XPropertySetInfo_impl::getPropertyByName( const OUString& aName ) - throw( beans::UnknownPropertyException, - RuntimeException, std::exception) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) return m_seq[i]; @@ -88,7 +86,6 @@ XPropertySetInfo_impl::getPropertyByName( const OUString& aName ) Sequence< beans::Property > SAL_CALL XPropertySetInfo_impl::getProperties() - throw( RuntimeException, std::exception ) { return m_seq; } @@ -96,7 +93,6 @@ XPropertySetInfo_impl::getProperties() sal_Bool SAL_CALL XPropertySetInfo_impl::hasPropertyByName( const OUString& aName ) - 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 0a9208d4ab3a..1be9af995c7d 100644 --- a/ucb/source/ucp/file/filprp.hxx +++ b/ucb/source/ucp/file/filprp.hxx @@ -38,17 +38,13 @@ class XPropertySetInfo_impl : public cppu::WeakImplHelper< virtual ~XPropertySetInfo_impl() override; virtual css::uno::Sequence< css::beans::Property > SAL_CALL - getProperties() - throw( css::uno::RuntimeException, std::exception ) override; + getProperties() override; virtual css::beans::Property SAL_CALL - getPropertyByName( const OUString& aName ) - throw( css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyByName( const OUString& aName ) override; virtual sal_Bool SAL_CALL - hasPropertyByName( const OUString& Name ) - throw( css::uno::RuntimeException, std::exception ) override; + hasPropertyByName( const OUString& Name ) override; private: TaskManager* m_pMyShell; diff --git a/ucb/source/ucp/file/filrow.cxx b/ucb/source/ucp/file/filrow.cxx index e79555f1043c..47fa98e8f278 100644 --- a/ucb/source/ucp/file/filrow.cxx +++ b/ucb/source/ucp/file/filrow.cxx @@ -90,8 +90,6 @@ XRow_impl::~XRow_impl() sal_Bool SAL_CALL XRow_impl::wasNull() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { return m_nWasNull; } @@ -100,8 +98,6 @@ XRow_impl::wasNull() OUString SAL_CALL XRow_impl::getString( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -114,8 +110,6 @@ XRow_impl::getString( sal_Bool SAL_CALL XRow_impl::getBoolean( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -129,8 +123,6 @@ XRow_impl::getBoolean( sal_Int8 SAL_CALL XRow_impl::getByte( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -143,8 +135,6 @@ XRow_impl::getByte( sal_Int16 SAL_CALL XRow_impl::getShort( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -158,8 +148,6 @@ XRow_impl::getShort( sal_Int32 SAL_CALL XRow_impl::getInt( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -172,8 +160,6 @@ XRow_impl::getInt( sal_Int64 SAL_CALL XRow_impl::getLong( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -186,8 +172,6 @@ XRow_impl::getLong( float SAL_CALL XRow_impl::getFloat( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -200,8 +184,6 @@ XRow_impl::getFloat( double SAL_CALL XRow_impl::getDouble( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -214,8 +196,6 @@ XRow_impl::getDouble( uno::Sequence< sal_Int8 > SAL_CALL XRow_impl::getBytes( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -228,8 +208,6 @@ XRow_impl::getBytes( util::Date SAL_CALL XRow_impl::getDate( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -242,8 +220,6 @@ XRow_impl::getDate( util::Time SAL_CALL XRow_impl::getTime( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -256,8 +232,6 @@ XRow_impl::getTime( util::DateTime SAL_CALL XRow_impl::getTimestamp( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -271,8 +245,6 @@ XRow_impl::getTimestamp( uno::Reference< io::XInputStream > SAL_CALL XRow_impl::getBinaryStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -286,8 +258,6 @@ XRow_impl::getBinaryStream( uno::Reference< io::XInputStream > SAL_CALL XRow_impl::getCharacterStream( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -302,8 +272,6 @@ uno::Any SAL_CALL XRow_impl::getObject( sal_Int32 columnIndex, const uno::Reference< container::XNameAccess >& ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -316,8 +284,6 @@ XRow_impl::getObject( uno::Reference< sdbc::XRef > SAL_CALL XRow_impl::getRef( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -333,8 +299,6 @@ XRow_impl::getRef( uno::Reference< sdbc::XBlob > SAL_CALL XRow_impl::getBlob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -350,8 +314,6 @@ XRow_impl::getBlob( uno::Reference< sdbc::XClob > SAL_CALL XRow_impl::getClob( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -368,8 +330,6 @@ XRow_impl::getClob( uno::Reference< sdbc::XArray > SAL_CALL XRow_impl::getArray( sal_Int32 columnIndex ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( columnIndex < 1 || columnIndex > m_aValueMap.getLength() ) throw sdbc::SQLException( 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 866627509d4b..589a5ad49f45 100644 --- a/ucb/source/ucp/file/filrow.hxx +++ b/ucb/source/ucp/file/filrow.hxx @@ -36,108 +36,67 @@ namespace fileaccess { virtual ~XRow_impl() override; virtual sal_Bool SAL_CALL - wasNull() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + wasNull() override; virtual OUString SAL_CALL - getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getString( sal_Int32 columnIndex ) override; virtual sal_Bool SAL_CALL - getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBoolean( sal_Int32 columnIndex ) override; virtual sal_Int8 SAL_CALL - getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getByte( sal_Int32 columnIndex ) override; virtual sal_Int16 SAL_CALL - getShort( sal_Int32 columnIndex ) - throw( - css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getShort( sal_Int32 columnIndex ) override; virtual sal_Int32 SAL_CALL - getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getInt( sal_Int32 columnIndex ) override; virtual sal_Int64 SAL_CALL - getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override; + getLong( sal_Int32 columnIndex ) override; virtual float SAL_CALL - getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getFloat( sal_Int32 columnIndex ) override; virtual double SAL_CALL getDouble( - sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 columnIndex ) override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBytes( sal_Int32 columnIndex ) override; virtual css::util::Date SAL_CALL - getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getDate( sal_Int32 columnIndex ) override; virtual css::util::Time SAL_CALL - getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getTime( sal_Int32 columnIndex ) override; virtual css::util::DateTime SAL_CALL - getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getTimestamp( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBinaryStream( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getCharacterStream( sal_Int32 columnIndex ) override; virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL - getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getRef( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL - getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBlob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL - getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getClob( sal_Int32 columnIndex ) override; virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL - getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getArray( sal_Int32 columnIndex ) override; private: osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index f677e8588b78..6d9f19b35f60 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -92,7 +92,6 @@ XResultSet_impl::~XResultSet_impl() void SAL_CALL XResultSet_impl::disposing( const lang::EventObject& ) - throw( uno::RuntimeException, std::exception ) { // To do, but what } @@ -101,7 +100,6 @@ XResultSet_impl::disposing( const lang::EventObject& ) void SAL_CALL XResultSet_impl::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -116,7 +114,6 @@ XResultSet_impl::addEventListener( void SAL_CALL XResultSet_impl::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -127,7 +124,6 @@ XResultSet_impl::removeEventListener( void SAL_CALL XResultSet_impl::dispose() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -205,9 +201,6 @@ void XResultSet_impl::isFinalChanged() bool SAL_CALL XResultSet_impl::OneMore() - throw( sdbc::SQLException, - uno::RuntimeException, - std::exception ) { if( ! m_nIsOpen ) return false; @@ -283,8 +276,6 @@ XResultSet_impl::OneMore() sal_Bool SAL_CALL XResultSet_impl::next() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { bool test; if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) test = true; @@ -296,8 +287,6 @@ XResultSet_impl::next() sal_Bool SAL_CALL XResultSet_impl::isBeforeFirst() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return m_nRow == -1; } @@ -305,8 +294,6 @@ XResultSet_impl::isBeforeFirst() sal_Bool SAL_CALL XResultSet_impl::isAfterLast() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()); // Cannot happen, if m_aFolder.isOpen() } @@ -314,8 +301,6 @@ XResultSet_impl::isAfterLast() sal_Bool SAL_CALL XResultSet_impl::isFirst() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return m_nRow == 0; } @@ -323,8 +308,6 @@ XResultSet_impl::isFirst() sal_Bool SAL_CALL XResultSet_impl::isLast() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( m_nRow == sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1 ) return ! OneMore(); @@ -335,8 +318,6 @@ XResultSet_impl::isLast() void SAL_CALL XResultSet_impl::beforeFirst() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { m_nRow = -1; } @@ -344,8 +325,6 @@ XResultSet_impl::beforeFirst() void SAL_CALL XResultSet_impl::afterLast() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size()); while( OneMore() ) @@ -355,8 +334,6 @@ XResultSet_impl::afterLast() sal_Bool SAL_CALL XResultSet_impl::first() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { m_nRow = -1; return next(); @@ -365,8 +342,6 @@ XResultSet_impl::first() sal_Bool SAL_CALL XResultSet_impl::last() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { m_nRow = sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1; while( OneMore() ) @@ -377,8 +352,6 @@ XResultSet_impl::last() sal_Int32 SAL_CALL XResultSet_impl::getRow() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { // Test, whether behind last row if( -1 == m_nRow || m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -389,7 +362,6 @@ XResultSet_impl::getRow() sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception) { if( row >= 0 ) { @@ -412,8 +384,6 @@ sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row ) sal_Bool SAL_CALL XResultSet_impl::relative( sal_Int32 row ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( isAfterLast() || isBeforeFirst() ) throw sdbc::SQLException( THROW_WHERE, uno::Reference< uno::XInterface >(), OUString(), 0, uno::Any() ); @@ -428,8 +398,6 @@ XResultSet_impl::relative( sal_Int32 row ) sal_Bool SAL_CALL XResultSet_impl::previous() - throw( sdbc::SQLException, - 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 @@ -441,8 +409,6 @@ XResultSet_impl::previous() void SAL_CALL XResultSet_impl::refreshRow() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { // get the row from the filesystem return; @@ -451,24 +417,18 @@ XResultSet_impl::refreshRow() sal_Bool SAL_CALL XResultSet_impl::rowUpdated() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return false; } sal_Bool SAL_CALL XResultSet_impl::rowInserted() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return false; } sal_Bool SAL_CALL XResultSet_impl::rowDeleted() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return false; } @@ -476,8 +436,6 @@ XResultSet_impl::rowDeleted() uno::Reference< uno::XInterface > SAL_CALL XResultSet_impl::getStatement() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return uno::Reference< uno::XInterface >(); } @@ -487,8 +445,6 @@ XResultSet_impl::getStatement() void SAL_CALL XResultSet_impl::close() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( m_nIsOpen ) { @@ -502,7 +458,6 @@ XResultSet_impl::close() OUString SAL_CALL XResultSet_impl::queryContentIdentifierString() - throw( uno::RuntimeException, std::exception ) { uno::Reference< ucb::XContentIdentifier > xContentId = queryContentIdentifier(); @@ -516,7 +471,6 @@ XResultSet_impl::queryContentIdentifierString() uno::Reference< ucb::XContentIdentifier > SAL_CALL XResultSet_impl::queryContentIdentifier() - throw( uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) { @@ -532,7 +486,6 @@ XResultSet_impl::queryContentIdentifier() uno::Reference< ucb::XContent > SAL_CALL XResultSet_impl::queryContent() - 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() ); @@ -547,8 +500,6 @@ XResultSet_impl::queryContent() // virtual uno::Reference< sdbc::XResultSet > SAL_CALL XResultSet_impl::getStaticResultSet() - throw( ucb::ListenerAlreadySetException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -563,8 +514,6 @@ XResultSet_impl::getStaticResultSet() void SAL_CALL XResultSet_impl::setListener( const uno::Reference< ucb::XDynamicResultSetListener >& Listener ) - throw( ucb::ListenerAlreadySetException, - uno::RuntimeException, std::exception ) { osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -603,10 +552,6 @@ XResultSet_impl::setListener( void SAL_CALL XResultSet_impl::connectToCache( const uno::Reference< ucb::XDynamicResultSet > & xCache ) - throw( ucb::ListenerAlreadySetException, - ucb::AlreadyInitializedException, - ucb::ServiceNotFoundException, - uno::RuntimeException, std::exception ) { if( m_xListener.is() ) throw ucb::ListenerAlreadySetException( THROW_WHERE ); @@ -640,7 +585,6 @@ XResultSet_impl::connectToCache( // virtual sal_Int16 SAL_CALL XResultSet_impl::getCapabilities() - throw( uno::RuntimeException, std::exception ) { // Never set ucb::ContentResultSetCapability::SORTED // - Underlying content cannot provide sorted data... @@ -650,8 +594,6 @@ XResultSet_impl::getCapabilities() // XResultSetMetaDataSupplier uno::Reference< sdbc::XResultSetMetaData > SAL_CALL XResultSet_impl::getMetaData() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { for ( sal_Int32 n = 0; n < m_sProperty.getLength(); ++n ) { @@ -682,7 +624,6 @@ XResultSet_impl::getMetaData() // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL XResultSet_impl::getPropertySetInfo() - throw( uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > seq(2); @@ -704,11 +645,6 @@ XResultSet_impl::getPropertySetInfo() void SAL_CALL XResultSet_impl::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" || aPropertyName == "RowCount" ) @@ -719,9 +655,6 @@ void SAL_CALL XResultSet_impl::setPropertyValue( uno::Any SAL_CALL XResultSet_impl::getPropertyValue( const OUString& PropertyName ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( PropertyName == "IsRowCountFinal" ) { @@ -740,9 +673,6 @@ uno::Any SAL_CALL XResultSet_impl::getPropertyValue( void SAL_CALL XResultSet_impl::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" ) { @@ -769,9 +699,6 @@ void SAL_CALL XResultSet_impl::addPropertyChangeListener( void SAL_CALL XResultSet_impl::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" && m_pIsFinalListeners ) @@ -793,9 +720,6 @@ void SAL_CALL XResultSet_impl::removePropertyChangeListener( void SAL_CALL XResultSet_impl::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } @@ -803,9 +727,6 @@ void SAL_CALL XResultSet_impl::addVetoableChangeListener( void SAL_CALL XResultSet_impl::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index e4dea03b1313..3c2769ac2ecb 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/ucb/source/ucp/file/filrset.hxx @@ -91,29 +91,23 @@ class XResultSet_impl : public Notifier, // XEventListener virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) override; + disposing( const css::lang::EventObject& Source ) override; // XComponent virtual void SAL_CALL - dispose() - throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL addEventListener( - const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XRow virtual sal_Bool SAL_CALL - wasNull() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + wasNull() override { if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -123,9 +117,7 @@ class XResultSet_impl : public Notifier, } virtual OUString SAL_CALL - getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getString( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getString( columnIndex ); @@ -134,9 +126,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Bool SAL_CALL - getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getBoolean( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -145,9 +135,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Int8 SAL_CALL - getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getByte( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -156,10 +144,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Int16 SAL_CALL - getShort( sal_Int32 columnIndex ) - throw( - css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getShort( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -168,9 +153,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Int32 SAL_CALL - getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getInt( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -179,9 +162,7 @@ class XResultSet_impl : public Notifier, } virtual sal_Int64 SAL_CALL - getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getLong( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -190,9 +171,7 @@ class XResultSet_impl : public Notifier, } virtual float SAL_CALL - getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getFloat( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -201,9 +180,7 @@ class XResultSet_impl : public Notifier, } virtual double SAL_CALL - getDouble( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getDouble( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -212,9 +189,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getBytes( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); @@ -223,9 +198,7 @@ class XResultSet_impl : public Notifier, } virtual css::util::Date SAL_CALL - getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getDate( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); @@ -234,9 +207,7 @@ class XResultSet_impl : public Notifier, } virtual css::util::Time SAL_CALL - getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getTime( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); @@ -245,9 +216,7 @@ class XResultSet_impl : public Notifier, } virtual css::util::DateTime SAL_CALL - getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getTimestamp( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); @@ -256,9 +225,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getBinaryStream( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); @@ -267,9 +234,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getCharacterStream( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); @@ -279,9 +244,7 @@ class XResultSet_impl : public Notifier, virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); @@ -290,9 +253,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL - getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getRef( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); @@ -301,9 +262,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL - getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getBlob( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); @@ -312,9 +271,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL - getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getClob( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); @@ -323,9 +280,7 @@ class XResultSet_impl : public Notifier, } virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL - getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getArray( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); @@ -337,202 +292,129 @@ class XResultSet_impl : public Notifier, // XResultSet virtual sal_Bool SAL_CALL - next() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + next() override; virtual sal_Bool SAL_CALL - isBeforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isBeforeFirst() override; virtual sal_Bool SAL_CALL - isAfterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isAfterLast() override; virtual sal_Bool SAL_CALL - isFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isFirst() override; virtual sal_Bool SAL_CALL - isLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isLast() override; virtual void SAL_CALL - beforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + beforeFirst() override; virtual void SAL_CALL - afterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + afterLast() override; virtual sal_Bool SAL_CALL - first() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + first() override; virtual sal_Bool SAL_CALL - last() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + last() override; virtual sal_Int32 SAL_CALL - getRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getRow() override; virtual sal_Bool SAL_CALL - absolute( sal_Int32 row ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + absolute( sal_Int32 row ) override; virtual sal_Bool SAL_CALL - relative( sal_Int32 rows ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + relative( sal_Int32 rows ) override; virtual sal_Bool SAL_CALL - previous() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + previous() override; virtual void SAL_CALL - refreshRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + refreshRow() override; virtual sal_Bool SAL_CALL - rowUpdated() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + rowUpdated() override; virtual sal_Bool SAL_CALL - rowInserted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + rowInserted() override; virtual sal_Bool SAL_CALL - rowDeleted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + rowDeleted() override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getStatement() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getStatement() override; // XDynamicResultSet virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - getStaticResultSet() - throw( css::ucb::ListenerAlreadySetException, - css::uno::RuntimeException, std::exception ) override; + getStaticResultSet() override; virtual void SAL_CALL setListener( const css::uno::Reference< - css::ucb::XDynamicResultSetListener >& Listener ) - throw( css::ucb::ListenerAlreadySetException, - css::uno::RuntimeException, std::exception ) override; + css::ucb::XDynamicResultSetListener >& Listener ) override; 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, std::exception ) override; + connectToCache( const css::uno::Reference< css::ucb::XDynamicResultSet > & xCache ) override; virtual sal_Int16 SAL_CALL - getCapabilities() - throw( css::uno::RuntimeException, std::exception ) override; + getCapabilities() override; // XCloseable virtual void SAL_CALL - close() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + close() override; // XContentAccess virtual OUString SAL_CALL - queryContentIdentifierString() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifierString() override; virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - queryContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifier() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent() - throw( css::uno::RuntimeException, std::exception ) override; + queryContent() override; // XResultSetMetaDataSupplier virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL - getMetaData() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getMetaData() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; private: @@ -571,10 +453,7 @@ class XResultSet_impl : public Notifier, // Methods /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - bool SAL_CALL OneMore() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, - std::exception ); + bool SAL_CALL OneMore(); void rowCountChanged(); void isFinalChanged(); diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 41891839f3d3..20e4952ab5f3 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -85,7 +85,6 @@ XStream_impl::~XStream_impl() uno::Reference< io::XInputStream > SAL_CALL XStream_impl::getInputStream( ) - throw( uno::RuntimeException, std::exception) { { osl::MutexGuard aGuard( m_aMutex ); @@ -97,7 +96,6 @@ XStream_impl::getInputStream( ) uno::Reference< io::XOutputStream > SAL_CALL XStream_impl::getOutputStream( ) - throw( uno::RuntimeException, std::exception ) { { osl::MutexGuard aGuard( m_aMutex ); @@ -108,7 +106,6 @@ XStream_impl::getOutputStream( ) void SAL_CALL XStream_impl::truncate() - throw( io::IOException, uno::RuntimeException, std::exception ) { if (osl::FileBase::E_None != m_aFile.setSize(0)) throw io::IOException( THROW_WHERE ); @@ -125,10 +122,6 @@ sal_Int32 SAL_CALL XStream_impl::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { if( ! m_nIsOpen ) throw io::IOException( THROW_WHERE ); @@ -159,10 +152,6 @@ sal_Int32 SAL_CALL XStream_impl::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { return readBytes( aData,nMaxBytesToRead ); } @@ -170,10 +159,6 @@ XStream_impl::readSomeBytes( void SAL_CALL XStream_impl::skipBytes( sal_Int32 nBytesToSkip ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { m_aFile.setPos( osl_Pos_Current, sal_uInt64( nBytesToSkip ) ); } @@ -181,9 +166,6 @@ XStream_impl::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL XStream_impl::available() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception) { return 0; } @@ -191,10 +173,6 @@ XStream_impl::available() void SAL_CALL XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception) { sal_uInt32 length = aData.getLength(); if(length) @@ -210,9 +188,6 @@ XStream_impl::writeBytes( const uno::Sequence< sal_Int8 >& aData ) void SAL_CALL XStream_impl::closeStream() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException ) { if( m_nIsOpen ) { @@ -230,9 +205,6 @@ XStream_impl::closeStream() void SAL_CALL XStream_impl::closeInput() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); m_bInputStreamCalled = false; @@ -244,9 +216,6 @@ XStream_impl::closeInput() void SAL_CALL XStream_impl::closeOutput() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); m_bOutputStreamCalled = false; @@ -258,9 +227,6 @@ XStream_impl::closeOutput() void SAL_CALL XStream_impl::seek( sal_Int64 location ) - throw( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { if( location < 0 ) throw lang::IllegalArgumentException( THROW_WHERE, uno::Reference< uno::XInterface >(), 0 ); @@ -271,8 +237,6 @@ XStream_impl::seek( sal_Int64 location ) sal_Int64 SAL_CALL XStream_impl::getPosition() - throw( io::IOException, - uno::RuntimeException, std::exception ) { sal_uInt64 uPos; if( osl::FileBase::E_None != m_aFile.getPos( uPos ) ) @@ -282,8 +246,6 @@ XStream_impl::getPosition() sal_Int64 SAL_CALL XStream_impl::getLength() - throw( io::IOException, - uno::RuntimeException, std::exception ) { sal_uInt64 uEndPos; if ( m_aFile.getSize(uEndPos) != osl::FileBase::E_None ) @@ -294,14 +256,9 @@ XStream_impl::getLength() void SAL_CALL XStream_impl::flush() - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) {} void XStream_impl::waitForCompletion() - 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 c4308afa3184..c65b7cda76cb 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -63,19 +63,15 @@ class XStream_impl : public cppu::WeakImplHelper< // XStream virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getInputStream() - throw( css::uno::RuntimeException, std::exception ) override; + getInputStream() override; virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL - getOutputStream() - throw( css::uno::RuntimeException, std::exception ) override; + getOutputStream() override; // XTruncate - virtual void SAL_CALL truncate() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL truncate() override; // XInputStream @@ -83,88 +79,49 @@ class XStream_impl : public cppu::WeakImplHelper< sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nBytesToRead ) override; sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nMaxBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nMaxBytesToRead ) override; void SAL_CALL - skipBytes( sal_Int32 nBytesToSkip ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + skipBytes( sal_Int32 nBytesToSkip ) override; sal_Int32 SAL_CALL - available() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + available() override; void SAL_CALL - closeInput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeInput() override; // XSeekable void SAL_CALL - seek( sal_Int64 location ) - throw( css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + seek( sal_Int64 location ) override; sal_Int64 SAL_CALL - getPosition() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + getPosition() override; sal_Int64 SAL_CALL - getLength() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + getLength() override; // XOutputStream void SAL_CALL - writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override; void SAL_CALL - flush() - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + flush() override; void SAL_CALL - closeOutput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeOutput() override; - virtual void SAL_CALL waitForCompletion() - throw ( - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL waitForCompletion() override; private: @@ -183,10 +140,7 @@ class XStream_impl : public cppu::WeakImplHelper< /// @throws css::io::IOException /// @throws css::uno::RuntimeException void SAL_CALL - closeStream() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException ); + closeStream(); }; diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index cc038ca61a0f..653289b13a5c 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -390,7 +390,6 @@ void SAL_CALL TaskManager::startTask( sal_Int32 CommandId, const uno::Reference< XCommandEnvironment >& xCommandEnv ) - throw( DuplicateCommandIdentifierException ) { osl::MutexGuard aGuard( m_aMutex ); TaskMap::iterator it = m_aTaskMap.find( CommandId ); @@ -571,9 +570,6 @@ TaskManager::associate( const OUString& aUnqPath, const OUString& PropertyName, const uno::Any& DefaultValue, const sal_Int16 Attributes ) - throw( beans::PropertyExistException, - beans::IllegalTypeException, - uno::RuntimeException ) { MyProperty newProperty( false, PropertyName, @@ -611,9 +607,6 @@ TaskManager::associate( const OUString& aUnqPath, void SAL_CALL TaskManager::deassociate( const OUString& aUnqPath, const OUString& PropertyName ) - throw( beans::UnknownPropertyException, - beans::NotRemoveableException, - uno::RuntimeException ) { MyProperty oldProperty( PropertyName ); diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index eb81fd594a35..e924f191dd16 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -254,8 +254,7 @@ namespace fileaccess /// @throws css::ucb::DuplicateCommandIdentifierException void SAL_CALL startTask( sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ) - throw( css::ucb::DuplicateCommandIdentifierException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xCommandEnv ); sal_Int32 SAL_CALL getCommandId(); void SAL_CALL abort( sal_Int32 CommandId ); @@ -322,19 +321,13 @@ namespace fileaccess void SAL_CALL associate( const OUString& UnqPath, const OUString& PropertyName, const css::uno::Any& DefaultValue, - const sal_Int16 Attributes ) - throw( css::beans::PropertyExistException, - css::beans::IllegalTypeException, - css::uno::RuntimeException); + const sal_Int16 Attributes ); /// @throws css::beans::UnknownPropertyException /// @throws css::beans::NotRemoveableException /// @throws css::uno::RuntimeException void SAL_CALL deassociate( const OUString& UnqPath, - const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::beans::NotRemoveableException, - css::uno::RuntimeException); + const OUString& PropertyName ); // Every method having a command id is not allowed to throw anything, diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 9659d5caaf59..5552d016a43b 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -105,7 +105,6 @@ void SAL_CALL FileProvider::init() void SAL_CALL FileProvider::initialize( const Sequence< Any >& aArguments ) - throw (Exception, RuntimeException, std::exception) { if( ! m_pMyShell ) { OUString config; @@ -121,20 +120,17 @@ FileProvider::initialize( // XServiceInfo methods. OUString SAL_CALL FileProvider::getImplementationName() - throw( RuntimeException, std::exception ) { return fileaccess::TaskManager::getImplementationName_static(); } sal_Bool SAL_CALL FileProvider::supportsService(const OUString& ServiceName ) - throw( RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL FileProvider::getSupportedServiceNames() - throw( RuntimeException, std::exception ) { return fileaccess::TaskManager::getSupportedServiceNames_static(); } @@ -165,8 +161,6 @@ FileProvider::CreateInstance( Reference< XContent > SAL_CALL FileProvider::queryContent( const Reference< XContentIdentifier >& xIdentifier ) - throw( IllegalIdentifierException, - RuntimeException, std::exception) { init(); OUString aUnc; @@ -184,7 +178,6 @@ sal_Int32 SAL_CALL FileProvider::compareContentIds( const Reference< XContentIdentifier >& Id1, const Reference< XContentIdentifier >& Id2 ) - throw( RuntimeException, std::exception ) { init(); OUString aUrl1 = Id1->getContentIdentifier(); @@ -241,7 +234,6 @@ FileProvider::compareContentIds( Reference< XContentIdentifier > SAL_CALL FileProvider::createContentIdentifier( const OUString& ContentId ) - throw( RuntimeException, std::exception ) { init(); FileContentIdentifier* p = new FileContentIdentifier( ContentId,false ); @@ -260,8 +252,7 @@ public: // XInterface virtual Any SAL_CALL - queryInterface( const Type& aType ) - throw( RuntimeException, std::exception) override; + queryInterface( const Type& aType ) override; virtual void SAL_CALL acquire() @@ -273,17 +264,13 @@ public: virtual Sequence< Property > SAL_CALL - getProperties() - throw( RuntimeException, std::exception ) override; + getProperties() override; virtual Property SAL_CALL - getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, - RuntimeException, std::exception) override; + getPropertyByName( const OUString& aName ) override; virtual sal_Bool SAL_CALL - hasPropertyByName( const OUString& Name ) - throw( RuntimeException, std::exception ) override; + hasPropertyByName( const OUString& Name ) override; private: @@ -328,7 +315,6 @@ XPropertySetInfoImpl2::release() Any SAL_CALL XPropertySetInfoImpl2::queryInterface( const Type& rType ) - throw( RuntimeException, std::exception ) { Any aRet = cppu::queryInterface( rType, (static_cast< XPropertySetInfo* >(this)) ); @@ -338,8 +324,6 @@ XPropertySetInfoImpl2::queryInterface( const Type& rType ) Property SAL_CALL XPropertySetInfoImpl2::getPropertyByName( const OUString& aName ) - throw( UnknownPropertyException, - RuntimeException, std::exception) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) @@ -351,7 +335,6 @@ XPropertySetInfoImpl2::getPropertyByName( const OUString& aName ) Sequence< Property > SAL_CALL XPropertySetInfoImpl2::getProperties() - throw( RuntimeException, std::exception ) { return m_seq; } @@ -360,7 +343,6 @@ XPropertySetInfoImpl2::getProperties() sal_Bool SAL_CALL XPropertySetInfoImpl2::hasPropertyByName( const OUString& aName ) - throw( RuntimeException, std::exception ) { for( sal_Int32 i = 0; i < m_seq.getLength(); ++i ) if( m_seq[i].Name == aName ) @@ -401,7 +383,6 @@ void SAL_CALL FileProvider::initProperties() Reference< XPropertySetInfo > SAL_CALL FileProvider::getPropertySetInfo( ) - throw( RuntimeException, std::exception ) { initProperties(); return m_xPropertySetInfo; @@ -411,11 +392,6 @@ FileProvider::getPropertySetInfo( ) void SAL_CALL FileProvider::setPropertyValue( const OUString& aPropertyName, const Any& ) - throw( UnknownPropertyException, - PropertyVetoException, - IllegalArgumentException, - WrappedTargetException, - RuntimeException, std::exception ) { if( aPropertyName == "FileSystemNotation" || aPropertyName == "HomeDirectory" || @@ -429,9 +405,6 @@ FileProvider::setPropertyValue( const OUString& aPropertyName, Any SAL_CALL FileProvider::getPropertyValue( const OUString& aPropertyName ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { initProperties(); if( aPropertyName == "FileSystemNotation" ) @@ -455,9 +428,6 @@ void SAL_CALL FileProvider::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception) { return; } @@ -467,9 +437,6 @@ void SAL_CALL FileProvider::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { return; } @@ -478,9 +445,6 @@ void SAL_CALL FileProvider::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception ) { return; } @@ -490,9 +454,6 @@ void SAL_CALL FileProvider::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw( UnknownPropertyException, - WrappedTargetException, - RuntimeException, std::exception) { return; } @@ -502,7 +463,6 @@ FileProvider::removeVetoableChangeListener( sal_Int32 SAL_CALL FileProvider::getFileProviderLocality( const OUString& BaseURL ) - 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, @@ -518,7 +478,6 @@ FileProvider::getFileProviderLocality( const OUString& BaseURL ) OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&, const OUString& SystemPath ) - throw( RuntimeException, std::exception ) { OUString aNormalizedPath; if ( osl::FileBase::getFileURLFromSystemPath( SystemPath,aNormalizedPath ) != osl::FileBase::E_None ) @@ -528,7 +487,6 @@ OUString SAL_CALL FileProvider::getFileURLFromSystemPath( const OUString&, } OUString SAL_CALL FileProvider::getSystemPathFromFileURL( const OUString& URL ) - 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 28c8238ea329..78e44db96323 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -64,16 +64,13 @@ namespace fileaccess { // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL @@ -87,99 +84,70 @@ namespace fileaccess { // XInitialization virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( - const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; // XContentIdentifierFactory virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL createContentIdentifier( - const OUString& ContentId ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& ContentId ) override; virtual sal_Int32 SAL_CALL compareContentIds( const css::uno::Reference< css::ucb::XContentIdentifier >& Id1, - const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XContentIdentifier >& Id2 ) override; // XProperySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo( ) - throw( css::uno::RuntimeException, std::exception ) override; + getPropertySetInfo( ) override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XFileIdentifierConverter virtual sal_Int32 SAL_CALL - getFileProviderLocality( const OUString& BaseURL ) - throw( css::uno::RuntimeException, std::exception ) override; + getFileProviderLocality( const OUString& BaseURL ) override; virtual OUString SAL_CALL getFileURLFromSystemPath( const OUString& BaseURL, - const OUString& SystemPath ) - throw( css::uno::RuntimeException, std::exception ) override; + const OUString& SystemPath ) override; - virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getSystemPathFromFileURL( const OUString& URL ) override; private: diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index ca606c994b9c..2933e73820bb 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -125,7 +125,6 @@ void SAL_CALL FTPContent::release() } css::uno::Any SAL_CALL FTPContent::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -141,15 +140,11 @@ css::uno::Any SAL_CALL FTPContent::queryInterface( const css::uno::Type & rType // XTypeProvider methods. css::uno::Sequence< sal_Int8 > SAL_CALL FTPContent::getImplementationId() - throw( css::uno::RuntimeException, - std::exception ) { return css::uno::Sequence<sal_Int8>(); } css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes() - throw( css::uno::RuntimeException, - std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -175,19 +170,16 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes() // XServiceInfo methods. OUString SAL_CALL FTPContent::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.FTPContent"); } sal_Bool SAL_CALL FTPContent::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.ucb.FTPContent" }; } @@ -197,7 +189,6 @@ css::uno::Sequence< OUString > SAL_CALL FTPContent::getSupportedServiceNames() // virtual OUString SAL_CALL FTPContent::getContentType() - throw( RuntimeException, std::exception ) { return OUString(FTP_CONTENT_TYPE); } @@ -206,7 +197,6 @@ OUString SAL_CALL FTPContent::getContentType() //virtual void SAL_CALL FTPContent::abort( sal_Int32 /*CommandId*/ ) - throw( RuntimeException, std::exception ) { } @@ -248,10 +238,6 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, sal_Int32 /*CommandId*/, const Reference< XCommandEnvironment >& Environment) - throw( Exception, - CommandAbortedException, - RuntimeException, - std::exception) { ACTION action(NOACTION); Any aRet; @@ -598,7 +584,6 @@ Any SAL_CALL FTPContent::execute( const Command& aCommand, Sequence<ContentInfo > SAL_CALL FTPContent::queryCreatableContentsInfo( ) - throw (RuntimeException, std::exception) { return queryCreatableContentsInfo_Static(); } @@ -606,7 +591,6 @@ FTPContent::queryCreatableContentsInfo( ) // static Sequence<ContentInfo > FTPContent::queryCreatableContentsInfo_Static( ) - throw (RuntimeException) { Sequence< ContentInfo > seq(2); @@ -632,7 +616,6 @@ FTPContent::queryCreatableContentsInfo_Static( ) Reference<XContent > SAL_CALL FTPContent::createNewContent( const ContentInfo& Info ) - 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, @@ -645,7 +628,6 @@ FTPContent::createNewContent( const ContentInfo& Info ) Reference<XInterface > SAL_CALL FTPContent::getParent( ) - throw (RuntimeException, std::exception) { Reference<XContentIdentifier> xIdent(new FTPContentIdentifier(m_aFTPURL.parent())); @@ -655,8 +637,6 @@ FTPContent::getParent( ) void SAL_CALL FTPContent::setParent(const Reference<XInterface >& /*Parent*/ ) - throw (NoSupportException, - RuntimeException, std::exception) { throw NoSupportException(); } diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx index bf9b53b3d4fe..74666dee9a0e 100644 --- a/ucb/source/ucp/ftp/ftpcontent.hxx +++ b/ucb/source/ucp/ftp/ftpcontent.hxx @@ -63,68 +63,49 @@ public: virtual ~FTPContent() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, - std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, - std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XContent - virtual OUString SAL_CALL getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getContentType() override; // XCommandProcessor virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, const css::uno::Reference< - css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception ) override; + css::ucb::XCommandEnvironment >& Environment ) override; - virtual void SAL_CALL abort(sal_Int32 CommandId) - throw( css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL abort(sal_Int32 CommandId) override; // XContentCreator virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL - queryCreatableContentsInfo( ) - throw (css::uno::RuntimeException, std::exception) override; + queryCreatableContentsInfo( ) override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - createNewContent( const css::ucb::ContentInfo& Info ) - throw (css::uno::RuntimeException, std::exception) override; + createNewContent( const css::ucb::ContentInfo& Info ) override; // XChild - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; /// @throws css::uno::RuntimeException - static css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo_Static() - throw (css::uno::RuntimeException); + static css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo_Static(); private: diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index bbc3e0b800d9..683422366703 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -49,9 +49,6 @@ Any SAL_CALL FTPContentIdentifier::queryInterface( const Type& rType ) - throw( - RuntimeException, std::exception - ) { Any aRet = ::cppu::queryInterface(rType, @@ -74,7 +71,6 @@ void SAL_CALL FTPContentIdentifier::release() throw() { Sequence<sal_Int8> SAL_CALL FTPContentIdentifier::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -82,7 +78,6 @@ FTPContentIdentifier::getImplementationId() Sequence<Type> SAL_CALL FTPContentIdentifier::getTypes() - throw(RuntimeException, std::exception) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) { @@ -102,9 +97,6 @@ FTPContentIdentifier::getTypes() OUString SAL_CALL FTPContentIdentifier::getContentIdentifier( ) - throw ( - css::uno::RuntimeException, std::exception - ) { return m_ident; } @@ -113,9 +105,6 @@ FTPContentIdentifier::getContentIdentifier( OUString SAL_CALL FTPContentIdentifier::getContentProviderScheme( ) - throw ( - css::uno::RuntimeException, std::exception - ) { return OUString("ftp"); } diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx index 99f13b31ef79..670f9fde74dc 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx @@ -53,8 +53,7 @@ namespace ftp { // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& rType ) - throw( css::uno::RuntimeException, std::exception ) override; + queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() throw() override; @@ -64,31 +63,19 @@ namespace ftp { virtual css::uno::Sequence<css::uno::Type> SAL_CALL - getTypes() - throw( - css::uno::RuntimeException, std::exception - ) override; + getTypes() override; virtual css::uno::Sequence<sal_Int8> SAL_CALL - getImplementationId() - throw( - css::uno::RuntimeException, std::exception - ) override; + getImplementationId() override; // XContentIdentifier virtual OUString SAL_CALL - getContentIdentifier() - throw ( - css::uno::RuntimeException, std::exception - ) override; + getContentIdentifier() override; virtual OUString SAL_CALL - getContentProviderScheme() - throw ( - css::uno::RuntimeException, std::exception - ) override; + getContentProviderScheme() override; private: diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 1ee0fcc7c48c..d2628b9ae04a 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -69,7 +69,6 @@ void SAL_CALL FTPContentProvider::release() } css::uno::Any SAL_CALL FTPContentProvider::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< XTypeProvider* >(this)), @@ -81,15 +80,11 @@ css::uno::Any SAL_CALL FTPContentProvider::queryInterface( const css::uno::Type // XTypeProvider methods. css::uno::Sequence< sal_Int8 > SAL_CALL FTPContentProvider::getImplementationId() - throw( css::uno::RuntimeException, - std::exception ) { return css::uno::Sequence<sal_Int8>(); } css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes() - throw( css::uno::RuntimeException, - std::exception ) { static cppu::OTypeCollection* pCollection = nullptr; if ( !pCollection ) @@ -112,7 +107,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes() // XServiceInfo methods. OUString SAL_CALL FTPContentProvider::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -123,13 +117,11 @@ OUString FTPContentProvider::getImplementationName_Static() } sal_Bool SAL_CALL FTPContentProvider::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL FTPContentProvider::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } @@ -138,7 +130,6 @@ css::uno::Sequence< OUString > SAL_CALL FTPContentProvider::getSupportedServiceN static css::uno::Reference< css::uno::XInterface > SAL_CALL FTPContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>( new FTPContentProvider( ucbhelper::getComponentContext(rSMgr) )); @@ -171,9 +162,6 @@ FTPContentProvider::createServiceFactory( const css::uno::Reference< // virtual Reference<XContent> SAL_CALL FTPContentProvider::queryContent( const Reference< XContentIdentifier >& xCanonicId) - throw( IllegalIdentifierException, - RuntimeException, - std::exception) { // Check, if a content with given id already exists... Reference<XContent> xContent = queryExistingContent(xCanonicId).get(); diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx index 1c93e7f58539..46db49efd062 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx @@ -50,32 +50,20 @@ namespace ftp virtual ~FTPContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, - std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, - std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, - std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, - std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, - std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, - std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -86,10 +74,7 @@ namespace ftp // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, - std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; CURL* handle(); diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index 380b7df711b1..e660153807c4 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -40,8 +40,6 @@ XInteractionApproveImpl::XInteractionApproveImpl() } void SAL_CALL XInteractionApproveImpl::select() - throw (RuntimeException, - std::exception) { m_bSelected = true; } @@ -55,8 +53,6 @@ XInteractionDisapproveImpl::XInteractionDisapproveImpl() } void SAL_CALL XInteractionDisapproveImpl::select() - throw (RuntimeException, - std::exception) { m_bSelected = true; } diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 1816662558bb..50356454f05f 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -40,9 +40,7 @@ namespace ftp { XInteractionApproveImpl(); - virtual void SAL_CALL select() - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL select() override; bool isSelected() const { return m_bSelected;} @@ -59,8 +57,7 @@ namespace ftp { XInteractionDisapproveImpl(); - virtual void SAL_CALL select() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL select() override; private: diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index 062ef471e0b8..00f0dc4c8238 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -73,7 +73,6 @@ ResultSetBase::release() uno::Any SAL_CALL ResultSetBase::queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, @@ -93,7 +92,6 @@ ResultSetBase::queryInterface( const uno::Type& rType ) void SAL_CALL ResultSetBase::addEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -108,7 +106,6 @@ ResultSetBase::addEventListener( void SAL_CALL ResultSetBase::removeEventListener( const uno::Reference< lang::XEventListener >& Listener ) - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -119,7 +116,6 @@ ResultSetBase::removeEventListener( void SAL_CALL ResultSetBase::dispose() - throw( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -145,8 +141,6 @@ ResultSetBase::dispose() sal_Bool SAL_CALL ResultSetBase::next() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { bool test; if( ++m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -159,8 +153,6 @@ ResultSetBase::next() sal_Bool SAL_CALL ResultSetBase::isBeforeFirst() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return m_nRow == -1; } @@ -168,8 +160,6 @@ ResultSetBase::isBeforeFirst() sal_Bool SAL_CALL ResultSetBase::isAfterLast() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()); // Cannot happen, if m_aFolder.isOpen() } @@ -177,8 +167,6 @@ ResultSetBase::isAfterLast() sal_Bool SAL_CALL ResultSetBase::isFirst() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return m_nRow == 0; } @@ -186,8 +174,6 @@ ResultSetBase::isFirst() sal_Bool SAL_CALL ResultSetBase::isLast() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( m_nRow == sal::static_int_cast<sal_Int32>(m_aItems.size()) - 1 ) return true; @@ -198,8 +184,6 @@ ResultSetBase::isLast() void SAL_CALL ResultSetBase::beforeFirst() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { m_nRow = -1; } @@ -207,8 +191,6 @@ ResultSetBase::beforeFirst() void SAL_CALL ResultSetBase::afterLast() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { m_nRow = m_aItems.size(); } @@ -216,8 +198,6 @@ ResultSetBase::afterLast() sal_Bool SAL_CALL ResultSetBase::first() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { m_nRow = -1; return next(); @@ -226,8 +206,6 @@ ResultSetBase::first() sal_Bool SAL_CALL ResultSetBase::last() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { m_nRow = m_aItems.size() - 1; return true; @@ -236,8 +214,6 @@ ResultSetBase::last() sal_Int32 SAL_CALL ResultSetBase::getRow() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { // Test, whether behind last row if( -1 == m_nRow || m_nRow >= sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -248,7 +224,6 @@ ResultSetBase::getRow() sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row ) - throw( sdbc::SQLException, uno::RuntimeException, std::exception) { if( row >= 0 ) m_nRow = row - 1; @@ -266,8 +241,6 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row ) sal_Bool SAL_CALL ResultSetBase::relative( sal_Int32 row ) - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( isAfterLast() || isBeforeFirst() ) throw sdbc::SQLException(); @@ -285,8 +258,6 @@ ResultSetBase::relative( sal_Int32 row ) sal_Bool SAL_CALL ResultSetBase::previous() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { if( m_nRow > sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nRow = m_aItems.size(); // Correct Handling of afterLast @@ -298,32 +269,24 @@ ResultSetBase::previous() void SAL_CALL ResultSetBase::refreshRow() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { } sal_Bool SAL_CALL ResultSetBase::rowUpdated() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return false; } sal_Bool SAL_CALL ResultSetBase::rowInserted() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return false; } sal_Bool SAL_CALL ResultSetBase::rowDeleted() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { return false; } @@ -331,8 +294,6 @@ ResultSetBase::rowDeleted() uno::Reference< uno::XInterface > SAL_CALL ResultSetBase::getStatement() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > test( nullptr ); return test; @@ -343,15 +304,12 @@ ResultSetBase::getStatement() void SAL_CALL ResultSetBase::close() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception) { } OUString SAL_CALL ResultSetBase::queryContentIdentifierString() - throw( uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aPath[m_nRow]; @@ -362,7 +320,6 @@ ResultSetBase::queryContentIdentifierString() uno::Reference< ucb::XContentIdentifier > SAL_CALL ResultSetBase::queryContentIdentifier() - throw( uno::RuntimeException, std::exception ) { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) { @@ -382,7 +339,6 @@ ResultSetBase::queryContentIdentifier() uno::Reference< ucb::XContent > SAL_CALL ResultSetBase::queryContent() - 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()); @@ -415,8 +371,7 @@ public: OWeakObject::release(); } - uno::Any SAL_CALL queryInterface( const uno::Type& rType ) - throw( uno::RuntimeException, std::exception ) override + uno::Any SAL_CALL queryInterface( const uno::Type& rType ) override { uno::Any aRet = cppu::queryInterface( rType, @@ -424,15 +379,12 @@ public: return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); } - uno::Sequence< beans::Property > SAL_CALL getProperties() - throw( uno::RuntimeException, std::exception ) override + uno::Sequence< beans::Property > SAL_CALL getProperties() override { return m_aSeq; } - beans::Property SAL_CALL getPropertyByName( const OUString& aName ) - throw( beans::UnknownPropertyException, - uno::RuntimeException, std::exception) override + beans::Property SAL_CALL getPropertyByName( const OUString& aName ) override { for( int i = 0; i < m_aSeq.getLength(); ++i ) if( aName == m_aSeq[i].Name ) @@ -440,8 +392,7 @@ public: throw beans::UnknownPropertyException(); } - sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) - throw( uno::RuntimeException, std::exception ) override + sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) override { for( int i = 0; i < m_aSeq.getLength(); ++i ) if( Name == m_aSeq[i].Name ) @@ -458,7 +409,6 @@ private: // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSetBase::getPropertySetInfo() - throw( uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > seq(2); seq[0].Name = "RowCount"; @@ -479,11 +429,6 @@ ResultSetBase::getPropertySetInfo() void SAL_CALL ResultSetBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& /*aValue*/ ) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" || aPropertyName == "RowCount" ) @@ -495,9 +440,6 @@ void SAL_CALL ResultSetBase::setPropertyValue( uno::Any SAL_CALL ResultSetBase::getPropertyValue( const OUString& PropertyName ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( PropertyName == "IsRowCountFinal" ) { @@ -516,9 +458,6 @@ uno::Any SAL_CALL ResultSetBase::getPropertyValue( void SAL_CALL ResultSetBase::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& xListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" ) { @@ -545,9 +484,6 @@ void SAL_CALL ResultSetBase::addPropertyChangeListener( void SAL_CALL ResultSetBase::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference< beans::XPropertyChangeListener >& aListener ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if( aPropertyName == "IsRowCountFinal" && m_pIsFinalListeners ) @@ -569,9 +505,6 @@ void SAL_CALL ResultSetBase::removePropertyChangeListener( void SAL_CALL ResultSetBase::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } @@ -579,9 +512,6 @@ void SAL_CALL ResultSetBase::addVetoableChangeListener( void SAL_CALL ResultSetBase::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } @@ -589,8 +519,6 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener( // XResultSetMetaDataSupplier uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSetBase::getMetaData() - throw( sdbc::SQLException, - uno::RuntimeException, std::exception ) { ::ucbhelper::ResultSetMetaData* p = new ::ucbhelper::ResultSetMetaData( m_xContext, m_sProperty ); diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx index 1b083eea9f38..93bcc8b6a6b6 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.hxx @@ -58,8 +58,7 @@ namespace ftp { // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception) override; + queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() @@ -71,24 +70,19 @@ namespace ftp { // XComponent virtual void SAL_CALL - dispose() - throw( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL addEventListener( - const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XRow virtual sal_Bool SAL_CALL - wasNull() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + wasNull() override { if( 0<= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) m_nWasNull = m_aItems[m_nRow]->wasNull(); @@ -98,9 +92,7 @@ namespace ftp { } virtual OUString SAL_CALL - getString( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getString( sal_Int32 columnIndex ) override { OUString ret; if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) @@ -110,9 +102,7 @@ namespace ftp { } virtual sal_Bool SAL_CALL - getBoolean( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getBoolean( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBoolean( columnIndex ); @@ -121,9 +111,7 @@ namespace ftp { } virtual sal_Int8 SAL_CALL - getByte( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getByte( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getByte( columnIndex ); @@ -132,10 +120,7 @@ namespace ftp { } virtual sal_Int16 SAL_CALL - getShort( sal_Int32 columnIndex ) - throw( - css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getShort( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getShort( columnIndex ); @@ -144,9 +129,7 @@ namespace ftp { } virtual sal_Int32 SAL_CALL - getInt( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getInt( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getInt( columnIndex ); @@ -155,9 +138,7 @@ namespace ftp { } virtual sal_Int64 SAL_CALL - getLong( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getLong( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getLong( columnIndex ); @@ -166,9 +147,7 @@ namespace ftp { } virtual float SAL_CALL - getFloat( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getFloat( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getFloat( columnIndex ); @@ -177,9 +156,7 @@ namespace ftp { } virtual double SAL_CALL - getDouble( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getDouble( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDouble( columnIndex ); @@ -188,9 +165,7 @@ namespace ftp { } virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception ) override + getBytes( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBytes( columnIndex ); @@ -199,9 +174,7 @@ namespace ftp { } virtual css::util::Date SAL_CALL - getDate( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getDate( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getDate( columnIndex ); @@ -210,9 +183,7 @@ namespace ftp { } virtual css::util::Time SAL_CALL - getTime( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getTime( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTime( columnIndex ); @@ -221,9 +192,7 @@ namespace ftp { } virtual css::util::DateTime SAL_CALL - getTimestamp( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getTimestamp( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getTimestamp( columnIndex ); @@ -233,9 +202,7 @@ namespace ftp { virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getBinaryStream( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBinaryStream( columnIndex ); @@ -244,9 +211,7 @@ namespace ftp { } virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getCharacterStream( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getCharacterStream( columnIndex ); @@ -256,9 +221,7 @@ namespace ftp { virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, - const css::uno::Reference< css::container::XNameAccess >& typeMap ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::container::XNameAccess >& typeMap ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getObject( columnIndex,typeMap ); @@ -267,9 +230,7 @@ namespace ftp { } virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL - getRef( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getRef( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getRef( columnIndex ); @@ -278,9 +239,7 @@ namespace ftp { } virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL - getBlob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getBlob( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getBlob( columnIndex ); @@ -289,9 +248,7 @@ namespace ftp { } virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL - getClob( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getClob( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getClob( columnIndex ); @@ -300,9 +257,7 @@ namespace ftp { } virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL - getArray( sal_Int32 columnIndex ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override + getArray( sal_Int32 columnIndex ) override { if( 0 <= m_nRow && m_nRow < sal::static_int_cast<sal_Int32>(m_aItems.size()) ) return m_aItems[m_nRow]->getArray( columnIndex ); @@ -315,177 +270,113 @@ namespace ftp { // XResultSet virtual sal_Bool SAL_CALL - next() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + next() override; virtual sal_Bool SAL_CALL - isBeforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isBeforeFirst() override; virtual sal_Bool SAL_CALL - isAfterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isAfterLast() override; virtual sal_Bool SAL_CALL - isFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isFirst() override; virtual sal_Bool SAL_CALL - isLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + isLast() override; virtual void SAL_CALL - beforeFirst() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + beforeFirst() override; virtual void SAL_CALL - afterLast() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + afterLast() override; virtual sal_Bool SAL_CALL - first() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + first() override; virtual sal_Bool SAL_CALL - last() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + last() override; virtual sal_Int32 SAL_CALL - getRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getRow() override; virtual sal_Bool SAL_CALL absolute( - sal_Int32 row ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 row ) override; virtual sal_Bool SAL_CALL relative( - sal_Int32 rows ) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 rows ) override; virtual sal_Bool SAL_CALL - previous() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + previous() override; virtual void SAL_CALL - refreshRow() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + refreshRow() override; virtual sal_Bool SAL_CALL - rowUpdated() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + rowUpdated() override; virtual sal_Bool SAL_CALL - rowInserted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + rowInserted() override; virtual sal_Bool SAL_CALL - rowDeleted() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + rowDeleted() override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getStatement() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getStatement() override; // XCloseable virtual void SAL_CALL - close() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + close() override; // XContentAccess virtual OUString SAL_CALL - queryContentIdentifierString() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifierString() override; virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - queryContentIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + queryContentIdentifier() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent() - throw( css::uno::RuntimeException, std::exception ) override; + queryContent() override; // XResultSetMetaDataSupplier virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL - getMetaData() - throw( css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getMetaData() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue ) - throw( css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue ) override; virtual css::uno::Any SAL_CALL getPropertyValue( - const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; protected: diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index 6c33c81a9b19..40c2872d6989 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -126,9 +126,6 @@ FTPURL::FTPURL(const FTPURL& r) FTPURL::FTPURL(const OUString& url, FTPContentProvider* pFCP) - throw( - malformed_exception - ) : m_pFCP(pFCP), m_aUsername("anonymous"), m_bShowPassword(false), @@ -144,9 +141,6 @@ FTPURL::~FTPURL() void FTPURL::parse(const OUString& url) - throw( - malformed_exception - ) { OUString aPassword,aAccount; OString aIdent(url.getStr(), @@ -385,7 +379,6 @@ namespace ftp { urlParAscii.getStr()); oslFileHandle FTPURL::open() - throw(curl_exception, std::exception) { if(m_aPathSegmentVec.empty()) throw curl_exception(CURLE_FTP_COULDNT_RETR_FILE); @@ -425,9 +418,6 @@ oslFileHandle FTPURL::open() std::vector<FTPDirentry> FTPURL::list( sal_Int16 nMode ) const - throw( - curl_exception - ) { CURL *curl = m_pFCP->handle(); @@ -512,7 +502,6 @@ std::vector<FTPDirentry> FTPURL::list( OUString FTPURL::net_title() const - throw(curl_exception, std::exception) { CURL *curl = m_pFCP->handle(); @@ -592,7 +581,6 @@ OUString FTPURL::net_title() const FTPDirentry FTPURL::direntry() const - throw (curl_exception, malformed_exception, std::exception) { OUString nettitle = net_title(); FTPDirentry aDirentry; @@ -638,7 +626,6 @@ extern "C" { void FTPURL::insert(bool replaceExisting,void* stream) const - throw(curl_exception) { if(!replaceExisting) { // FTPDirentry aDirentry(direntry()); @@ -670,7 +657,6 @@ void FTPURL::insert(bool replaceExisting,void* stream) const void FTPURL::mkdir(bool ReplaceExisting) const - throw (curl_exception, malformed_exception, std::exception) { OString title; if(!m_aPathSegmentVec.empty()) { @@ -720,7 +706,6 @@ void FTPURL::mkdir(bool ReplaceExisting) const OUString FTPURL::ren(const OUString& NewTitle) - throw(curl_exception, std::exception) { CURL *curl = m_pFCP->handle(); @@ -763,7 +748,6 @@ OUString FTPURL::ren(const OUString& NewTitle) void FTPURL::del() const - throw(curl_exception, malformed_exception, std::exception) { FTPDirentry aDirentry(direntry()); diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx index cedd41211976..a0bdf0abb281 100644 --- a/ucb/source/ucp/ftp/ftpurl.hxx +++ b/ucb/source/ucp/ftp/ftpurl.hxx @@ -85,7 +85,7 @@ namespace ftp { FTPURL( const OUString& aIdent, FTPContentProvider* pFCP - ) throw (malformed_exception); + ); FTPURL(const FTPURL& r); @@ -115,36 +115,30 @@ namespace ftp { OUString child() const; /// @throws curl_exception - std::vector<FTPDirentry> list(sal_Int16 nMode) const - throw(curl_exception); + std::vector<FTPDirentry> list(sal_Int16 nMode) const; // returns a pointer to an open tempfile, // sought to the beginning of. /// @throws curl_exception - oslFileHandle open() throw(curl_exception, std::exception); + oslFileHandle open(); /// @throws curl_exception /// @throws malformed_exception - FTPDirentry direntry() const - throw(curl_exception, malformed_exception, std::exception); + FTPDirentry direntry() const; /// @throws curl_exception - void insert(bool ReplaceExisting,void* stream) const - throw(curl_exception); + void insert(bool ReplaceExisting,void* stream) const; /// @throws curl_exception /// @throws malformed_exception - void mkdir(bool ReplaceExisting) const - throw(curl_exception, malformed_exception, std::exception); + void mkdir(bool ReplaceExisting) const; /// @throws curl_exception - OUString ren(const OUString& NewTitle) - throw(curl_exception, std::exception); + OUString ren(const OUString& NewTitle); /// @throws curl_exception /// @throws malformed_exception - void del() const - throw(curl_exception, malformed_exception, std::exception); + void del() const; private: @@ -162,13 +156,10 @@ namespace ftp { std::vector<OUString> m_aPathSegmentVec; /// @throws malformed_exception - void parse(const OUString& url) - throw( - malformed_exception - ); + void parse(const OUString& url); /// @throws curl_exception - OUString net_title() const throw(curl_exception, std::exception); + OUString net_title() const; }; } diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 3a6e231939f1..6b193765dcf3 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -85,7 +85,6 @@ Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, ContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), mpFile (nullptr), mpInfo( nullptr ), mbTransient(false) { @@ -97,7 +96,6 @@ Content::Content( ContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, bool bIsFolder) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_pProvider( pProvider ), mpFile (nullptr), mpInfo( nullptr ), mbTransient(true) { @@ -126,14 +124,13 @@ OUString Content::getParentURL() } void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException, std::exception ) { //TODO //stick a map from each CommandId to a new GCancellable and propagate //it throughout the g_file_* calls } -OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL Content::getContentType() { return isFolder(uno::Reference< ucb::XCommandEnvironment >()) ? OUString( GIO_FOLDER_TYPE ) @@ -281,7 +278,6 @@ uno::Any convertToException(GError *pError, const uno::Reference< uno::XInterfac } void convertToIOException(GError *pError, const uno::Reference< uno::XInterface >& rContext) - throw( io::IOException, uno::RuntimeException, std::exception ) { try { @@ -856,7 +852,6 @@ bool Content::feedSink( const uno::Reference< uno::XInterface >& xSink, uno::Any Content::open(const ucb::OpenCommandArgument2 & rOpenCommand, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { bool bIsFolder = isFolder(xEnv); @@ -924,9 +919,6 @@ uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, - ucb::CommandAbortedException, - uno::RuntimeException, std::exception ) { SAL_INFO("ucb.ucp.gio", "Content::execute " << aCommand.Name << "\n"); uno::Any aRet; @@ -1012,7 +1004,6 @@ uno::Any SAL_CALL Content::execute( } void Content::destroy( bool bDeletePhysical ) - throw( uno::Exception, std::exception ) { uno::Reference< ucb::XContent > xThis = this; @@ -1033,7 +1024,6 @@ void Content::destroy( bool bDeletePhysical ) void Content::insert(const uno::Reference< io::XInputStream > &xInputStream, bool bReplaceExisting, const uno::Reference< ucb::XCommandEnvironment > &xEnv ) - throw( uno::Exception ) { GError *pError = nullptr; GFileInfo *pInfo = getGFileInfo(xEnv); @@ -1082,7 +1072,6 @@ const GFileCopyFlags DEFAULT_COPYDATA_FLAGS = static_cast<GFileCopyFlags>(G_FILE_COPY_OVERWRITE|G_FILE_COPY_TARGET_DEFAULT_PERMS); void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, std::exception ) { OUString sDest = m_xIdentifier->getContentIdentifier(); if (!sDest.endsWith("/")) { @@ -1110,7 +1099,6 @@ void Content::transfer( const ucb::TransferInfo& aTransferInfo, const uno::Refer uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( const uno::Reference< ucb::XCommandEnvironment >& xEnv) - throw( uno::RuntimeException ) { if ( isFolder( xEnv ) ) { @@ -1144,14 +1132,12 @@ uno::Sequence< ucb::ContentInfo > Content::queryCreatableContentsInfo( } uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - 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, std::exception ) { bool create_document; const char *name; @@ -1187,7 +1173,6 @@ uno::Reference< ucb::XContent > } uno::Sequence< uno::Type > SAL_CALL Content::getTypes() - throw( uno::RuntimeException, std::exception ) { if ( isFolder( uno::Reference< ucb::XCommandEnvironment >() ) ) { @@ -1324,19 +1309,18 @@ void SAL_CALL Content::release() throw() ContentImplHelper::release(); } -uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) throw ( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) { 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, std::exception ) +OUString SAL_CALL Content::getImplementationName() { return OUString("com.sun.star.comp.GIOContent"); } uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { "com.sun.star.ucb.GIOContent" }; return aSNS; diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx index 9f505364484b..366eb721f0c7 100644 --- a/ucb/source/ucp/gio/gio_content.hxx +++ b/ucb/source/ucp/gio/gio_content.hxx @@ -58,8 +58,7 @@ css::uno::Any convertToException(GError *pError, /// @throws css::io::IOException /// @throws css::uno::RuntimeException void convertToIOException(GError *pError, - const css::uno::Reference< css::uno::XInterface >& rContext) - throw (css::io::IOException, css::uno::RuntimeException, std::exception); + const css::uno::Reference< css::uno::XInterface >& rContext); class ContentProvider; class Content : public ::ucbhelper::ContentImplHelper, public css::ucb::XContentCreator @@ -91,21 +90,18 @@ private: /// @throws css::uno::Exception css::uno::Any open(const css::ucb::OpenCommandArgument2 & rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void transfer( const css::ucb::TransferInfo& rTransferInfo, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, - bool bReplaceExisting, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw( css::uno::Exception ); + bool bReplaceExisting, const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception - void destroy( bool bDeletePhysical ) throw( css::uno::Exception, std::exception ); + void destroy( bool bDeletePhysical ); static void copyData( const css::uno::Reference< css::io::XInputStream >& xIn, const css::uno::Reference< css::io::XOutputStream >& xOut ); @@ -125,15 +121,13 @@ public: /// @throws css::ucb::ContentCreationException Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, - const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier) - throw ( css::ucb::ContentCreationException ); + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier); /// @throws css::ucb::ContentCreationException Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider *pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - bool bIsFolder) - throw ( css::ucb::ContentCreationException ); + bool bIsFolder); virtual ~Content() override; @@ -153,51 +147,40 @@ public: virtual OUString getParentURL() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, css::ucb::CommandAbortedException, css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; - virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL abort( sal_Int32 CommandId ) override; virtual css::uno::Sequence< css::ucb::ContentInfo > - SAL_CALL queryCreatableContentsInfo() - throw( css::uno::RuntimeException, std::exception ) override; + SAL_CALL queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > - SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException, std::exception ) override; + SAL_CALL createNewContent( const css::ucb::ContentInfo& Info ) override; /// @throws css::uno::RuntimeException css::uno::Sequence< css::ucb::ContentInfo > queryCreatableContentsInfo( - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv) - throw( css::uno::RuntimeException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv); GFile* getGFile(); }; diff --git a/ucb/source/ucp/gio/gio_datasupplier.cxx b/ucb/source/ucp/gio/gio_datasupplier.cxx index 4e85e210ec7f..e2069973e38e 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.cxx +++ b/ucb/source/ucp/gio/gio_datasupplier.cxx @@ -262,7 +262,7 @@ void DataSupplier::close() { } -void DataSupplier::validate() throw( ucb::ResultSetException ) +void DataSupplier::validate() { } diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx index 9927970c1358..4ff3047ec4c8 100644 --- a/ucb/source/ucp/gio/gio_datasupplier.hxx +++ b/ucb/source/ucp/gio/gio_datasupplier.hxx @@ -80,8 +80,7 @@ public: virtual void close() override; - virtual void validate() - throw( css::ucb::ResultSetException ) override; + virtual void validate() override; }; } diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx index 8c9453122514..2275cb7a6a84 100644 --- a/ucb/source/ucp/gio/gio_inputstream.cxx +++ b/ucb/source/ucp/gio/gio_inputstream.cxx @@ -41,21 +41,17 @@ InputStream::~InputStream() } sal_Int32 SAL_CALL InputStream::available() - throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception ) { return 0; } void SAL_CALL InputStream::closeInput() - throw( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception ) { if (mpStream) g_input_stream_close(G_INPUT_STREAM(mpStream), nullptr, nullptr); } void SAL_CALL InputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { // Conservatively call readBytes and discard the read data, but given this // InputStream will always be wrapped in comphelper::OSeekableInputWrapper, @@ -65,8 +61,6 @@ 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, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -89,8 +83,6 @@ 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, std::exception ) { return readBytes(aData, nMaxBytesToRead); } diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx index 6a08aab71b15..9cee1c54653c 100644 --- a/ucb/source/ucp/gio/gio_inputstream.hxx +++ b/ucb/source/ucp/gio/gio_inputstream.hxx @@ -42,34 +42,16 @@ public: // XInputStream virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 > & aData, - sal_Int32 nBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nBytesToRead ) override; virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 > & aData, - sal_Int32 nMaxBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nMaxBytesToRead ) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; - virtual sal_Int32 SAL_CALL available() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL available() override; - virtual void SAL_CALL closeInput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL closeInput() override; }; } // namespace gio diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx index 4698ab93800c..da504b87e291 100644 --- a/ucb/source/ucp/gio/gio_outputstream.cxx +++ b/ucb/source/ucp/gio/gio_outputstream.cxx @@ -41,8 +41,6 @@ OutputStream::~OutputStream() } void SAL_CALL OutputStream::writeBytes( const css::uno::Sequence< sal_Int8 >& rData ) - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception) { if (!mpStream) throw io::NotConnectedException(); @@ -53,8 +51,6 @@ void SAL_CALL OutputStream::writeBytes( const css::uno::Sequence< sal_Int8 >& rD } void SAL_CALL OutputStream::flush() - throw( io::NotConnectedException, io::BufferSizeExceededException, - io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -65,14 +61,12 @@ void SAL_CALL OutputStream::flush() } void SAL_CALL OutputStream::closeOutput() - throw( io::NotConnectedException, io::IOException, - uno::RuntimeException, std::exception ) { if (mpStream) g_output_stream_close(G_OUTPUT_STREAM(mpStream), nullptr, nullptr); } -uno::Any OutputStream::queryInterface( const uno::Type &type ) throw( uno::RuntimeException, std::exception ) +uno::Any OutputStream::queryInterface( const uno::Type &type ) { 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 6cae73ad7555..1b6cf6ffd273 100644 --- a/ucb/source/ucp/gio/gio_outputstream.hxx +++ b/ucb/source/ucp/gio/gio_outputstream.hxx @@ -45,29 +45,17 @@ public: virtual ~OutputStream() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type ) override; virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XOutputStream - virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override; - virtual void SAL_CALL flush() - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush() override; - virtual void SAL_CALL closeOutput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL closeOutput() override; }; } // namespace gio diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 010d658ae777..9c3aa481b78e 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -30,8 +30,6 @@ namespace gio uno::Reference< css::ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - uno::RuntimeException, std::exception ) { SAL_INFO("ucb.ucp.gio", "QueryContent: " << Identifier->getContentIdentifier()); osl::MutexGuard aGuard( m_aMutex ); @@ -80,7 +78,6 @@ void SAL_CALL ContentProvider::release() } css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -100,7 +97,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) )); diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx index 338811e098c2..d6ebed7047b2 100644 --- a/ucb/source/ucp/gio/gio_provider.hxx +++ b/ucb/source/ucp/gio/gio_provider.hxx @@ -34,26 +34,20 @@ public: virtual ~ContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -64,9 +58,7 @@ public: // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; }; } diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index 6566eff801f1..56b295809656 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -40,7 +40,6 @@ Seekable::~Seekable() } void SAL_CALL Seekable::truncate() - throw( io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -55,7 +54,6 @@ void SAL_CALL Seekable::truncate() } void SAL_CALL Seekable::seek( sal_Int64 location ) - throw( lang::IllegalArgumentException, io::IOException, uno::RuntimeException, std::exception ) { if (!mpStream) throw io::NotConnectedException(); @@ -69,7 +67,7 @@ void SAL_CALL Seekable::seek( sal_Int64 location ) convertToIOException(pError, static_cast< cppu::OWeakObject * >(this)); } -sal_Int64 SAL_CALL Seekable::getPosition() throw( io::IOException, uno::RuntimeException, std::exception ) +sal_Int64 SAL_CALL Seekable::getPosition() { if (!mpStream) throw io::NotConnectedException(); @@ -77,7 +75,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, std::exception ) +sal_Int64 SAL_CALL Seekable::getLength() { if (!mpStream) throw io::NotConnectedException(); @@ -112,7 +110,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, std::exception ) +uno::Any Seekable::queryInterface( const uno::Type &type ) { 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 2781c6ba12cf..0d3a62dccde2 100644 --- a/ucb/source/ucp/gio/gio_seekable.hxx +++ b/ucb/source/ucp/gio/gio_seekable.hxx @@ -43,29 +43,19 @@ public: virtual ~Seekable() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type ) override; virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) - throw( css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL seek( sal_Int64 location ) override; - virtual sal_Int64 SAL_CALL getPosition() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getPosition() override; - virtual sal_Int64 SAL_CALL getLength() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Int64 SAL_CALL getLength() override; // XTruncate - virtual void SAL_CALL truncate() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL truncate() override; }; } // namespace gio diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 6ece6a1d308c..2d6d3dedf114 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -168,7 +168,6 @@ void SAL_CALL HierarchyContent::release() // virtual uno::Any SAL_CALL HierarchyContent::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = ContentImplHelper::queryInterface( rType ); @@ -197,7 +196,6 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyContent ); // virtual uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() - throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = nullptr; @@ -276,7 +274,6 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() // virtual OUString SAL_CALL HierarchyContent::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.HierarchyContent" ); } @@ -285,7 +282,6 @@ OUString SAL_CALL HierarchyContent::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL HierarchyContent::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSNS( 1 ); @@ -305,7 +301,6 @@ HierarchyContent::getSupportedServiceNames() // virtual OUString SAL_CALL HierarchyContent::getContentType() - throw( uno::RuntimeException, std::exception ) { return m_aProps.getContentType(); } @@ -314,7 +309,6 @@ OUString SAL_CALL HierarchyContent::getContentType() // virtual uno::Reference< ucb::XContentIdentifier > SAL_CALL HierarchyContent::getIdentifier() - throw( uno::RuntimeException, std::exception ) { // Transient? if ( m_eState == TRANSIENT ) @@ -335,9 +329,6 @@ uno::Any SAL_CALL HierarchyContent::execute( const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception, - ucb::CommandAbortedException, - uno::RuntimeException, std::exception ) { uno::Any aRet; @@ -552,7 +543,6 @@ uno::Any SAL_CALL HierarchyContent::execute( // virtual void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException, std::exception ) { // @@@ Generally, no action takes much time... } @@ -564,7 +554,6 @@ void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL HierarchyContent::queryCreatableContentsInfo() - throw( uno::RuntimeException, std::exception ) { return m_aProps.getCreatableContentsInfo(); } @@ -573,7 +562,6 @@ HierarchyContent::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL HierarchyContent::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException, std::exception ) { if ( isFolder() ) { @@ -1058,7 +1046,6 @@ uno::Reference< sdbc::XRow > HierarchyContent::getPropertyValues( uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( const uno::Sequence< beans::PropertyValue >& rValues, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1363,7 +1350,6 @@ uno::Sequence< uno::Any > HierarchyContent::setPropertyValues( void HierarchyContent::insert( sal_Int32 nNameClashResolve, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1509,7 +1495,6 @@ void HierarchyContent::insert( sal_Int32 nNameClashResolve, void HierarchyContent::destroy( bool bDeletePhysical, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { // @@@ take care about bDeletePhysical -> trashcan support @@ -1566,7 +1551,6 @@ void HierarchyContent::destroy( bool bDeletePhysical, void HierarchyContent::transfer( const ucb::TransferInfo& rInfo, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index 7bcd7a397db4..60b19b2aa71c 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -167,23 +167,19 @@ private: css::uno::Sequence< css::uno::Any > setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void insert( sal_Int32 nNameClashResolve, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void destroy( bool bDeletePhysical, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void transfer( const css::ucb::TransferInfo& rInfo, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); public: // Create existing content. Fail, if not already exists. @@ -203,46 +199,35 @@ public: virtual ~HierarchyContent() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XContent virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - getIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + getIdentifier() override; // XCommandProcessor virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; virtual void SAL_CALL - abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + abort( sal_Int32 CommandId ) override; // Additional interfaces @@ -250,11 +235,9 @@ public: // XContentCreator virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL - queryCreatableContentsInfo() - throw( css::uno::RuntimeException, std::exception ) override; + queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException, std::exception ) override; + createNewContent( const css::ucb::ContentInfo& Info ) override; // Non-interface methods. diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index 4337e17761c9..b9ba11f2eaa5 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -91,117 +91,81 @@ public: bool bReadOnly ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XComponent virtual void SAL_CALL - dispose() - throw ( uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw ( uno::RuntimeException, std::exception ) override; + addEventListener( const uno::Reference< lang::XEventListener > & xListener ) override; virtual void SAL_CALL removeEventListener( const uno::Reference< - lang::XEventListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) override; + lang::XEventListener > & aListener ) override; // XSingleServiceFactory virtual uno::Reference< uno::XInterface > SAL_CALL - createInstance() - throw ( uno::Exception, uno::RuntimeException, std::exception ) override; + createInstance() override; virtual uno::Reference< uno::XInterface > SAL_CALL - createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) override; + createInstanceWithArguments( const uno::Sequence< uno::Any > & aArguments ) override; // XHierarchicalNameAccess virtual uno::Any SAL_CALL - getByHierarchicalName( const OUString & aName ) - throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ) override; + getByHierarchicalName( const OUString & aName ) override; virtual sal_Bool SAL_CALL - hasByHierarchicalName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) override; + hasByHierarchicalName( const OUString & aName ) override; // XNameContainer virtual void SAL_CALL - insertByName( const OUString & aName, const uno::Any & aElement ) - throw ( lang::IllegalArgumentException, - container::ElementExistException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) override; + insertByName( const OUString & aName, const uno::Any & aElement ) override; virtual void SAL_CALL - removeByName( const OUString & Name ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) override; + removeByName( const OUString & Name ) override; // XNameReplace ( base of XNameContainer ) virtual void SAL_CALL - replaceByName( const OUString & aName, const uno::Any & aElement ) - throw ( lang::IllegalArgumentException, - container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) override; + replaceByName( const OUString & aName, const uno::Any & aElement ) override; // XNameAccess ( base of XNameReplace ) virtual uno::Any SAL_CALL - getByName( const OUString & aName ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) override; + getByName( const OUString & aName ) override; virtual uno::Sequence< OUString > SAL_CALL - getElementNames() - throw ( uno::RuntimeException, std::exception ) override; + getElementNames() override; virtual sal_Bool SAL_CALL - hasByName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) override; + hasByName( const OUString & aName ) override; // XElementAccess ( base of XNameAccess ) virtual uno::Type SAL_CALL - getElementType() - throw ( uno::RuntimeException, std::exception ) override; + getElementType() override; virtual sal_Bool SAL_CALL - hasElements() - throw ( uno::RuntimeException, std::exception ) override; + hasElements() override; // XChangesNotifier virtual void SAL_CALL addChangesListener( const uno::Reference< - util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) override; + util::XChangesListener > & aListener ) override; virtual void SAL_CALL removeChangesListener( const uno::Reference< - util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) override; + util::XChangesListener > & aListener ) override; // XChangesBatch virtual void SAL_CALL - commitChanges() - throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) override; + commitChanges() override; virtual sal_Bool SAL_CALL - hasPendingChanges() - throw ( uno::RuntimeException, std::exception ) override; + hasPendingChanges() override; virtual uno::Sequence< util::ElementChange > SAL_CALL - getPendingChanges() - throw ( uno::RuntimeException, std::exception ) override; + getPendingChanges() override; }; } // namespace hcp_impl @@ -240,7 +204,6 @@ void SAL_CALL HierarchyDataSource::release() } css::uno::Any SAL_CALL HierarchyDataSource::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -268,7 +231,6 @@ XSERVICEINFO_COMMOM_IMPL( HierarchyDataSource, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL HierarchyDataSource_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new HierarchyDataSource( ucbhelper::getComponentContext(rSMgr) )); @@ -292,7 +254,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource ); // virtual void SAL_CALL HierarchyDataSource::dispose() - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -308,7 +269,6 @@ void SAL_CALL HierarchyDataSource::dispose() // virtual void SAL_CALL HierarchyDataSource::addEventListener( const uno::Reference< lang::XEventListener > & Listener ) - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -323,7 +283,6 @@ void SAL_CALL HierarchyDataSource::addEventListener( // virtual void SAL_CALL HierarchyDataSource::removeEventListener( const uno::Reference< lang::XEventListener > & Listener ) - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -338,7 +297,6 @@ void SAL_CALL HierarchyDataSource::removeEventListener( // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstance( const OUString & aServiceSpecifier ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) { // Create view to root node. @@ -358,7 +316,6 @@ uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception ) { return createInstanceWithArguments( ServiceSpecifier, Arguments, true ); } @@ -367,7 +324,6 @@ HierarchyDataSource::createInstanceWithArguments( // virtual uno::Sequence< OUString > SAL_CALL HierarchyDataSource::getAvailableServiceNames() - throw ( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aNames( 2 ); aNames[ 0 ] = READ_SERVICE_NAME; @@ -384,7 +340,6 @@ HierarchyDataSource::createInstanceWithArguments( const OUString & ServiceSpecifier, const uno::Sequence< uno::Any > & Arguments, bool bCheckArgs ) - throw ( uno::Exception, uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -618,7 +573,6 @@ void SAL_CALL HierarchyDataAccess::release() // virtual uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType ) - throw ( uno::RuntimeException, std::exception ) { // Interfaces supported in read-only and read-write mode. uno::Any aRet = cppu::queryInterface( aType, @@ -652,7 +606,6 @@ XTYPEPROVIDER_COMMON_IMPL( HierarchyDataAccess ); // virtual uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() - throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = nullptr; @@ -722,19 +675,16 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() // XServiceInfo methods. OUString SAL_CALL HierarchyDataAccess::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.ucb.HierarchyDataAccess"); } sal_Bool SAL_CALL HierarchyDataAccess::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService( this, ServiceName ); } css::uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { READ_SERVICE_NAME, READWRITE_SERVICE_NAME }; } @@ -745,7 +695,6 @@ css::uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getSupportedService // virtual void SAL_CALL HierarchyDataAccess::dispose() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -759,7 +708,6 @@ void SAL_CALL HierarchyDataAccess::dispose() // virtual void SAL_CALL HierarchyDataAccess::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -773,7 +721,6 @@ void SAL_CALL HierarchyDataAccess::addEventListener( // virtual void SAL_CALL HierarchyDataAccess::removeEventListener( const uno::Reference< lang::XEventListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< lang::XComponent > xOrig = ENSURE_ORIG_INTERFACE( lang::XComponent, C ); @@ -790,7 +737,6 @@ void SAL_CALL HierarchyDataAccess::removeEventListener( // virtual uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( const OUString & aName ) - throw ( container::NoSuchElementException, uno::RuntimeException, std::exception ) { uno::Reference< container::XHierarchicalNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA ); @@ -805,7 +751,6 @@ uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XHierarchicalNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XHierarchicalNameAccess, HNA ); @@ -822,9 +767,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( // virtual uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -837,7 +779,6 @@ uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) // virtual uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -850,7 +791,6 @@ uno::Sequence< OUString > SAL_CALL HierarchyDataAccess::getElementNames() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XNameAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XNameAccess, NA ); @@ -866,7 +806,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) // virtual uno::Type SAL_CALL HierarchyDataAccess::getElementType() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XElementAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA ); @@ -879,7 +818,6 @@ uno::Type SAL_CALL HierarchyDataAccess::getElementType() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasElements() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< container::XElementAccess > xOrig = ENSURE_ORIG_INTERFACE( container::XElementAccess, EA ); @@ -896,7 +834,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasElements() // virtual void SAL_CALL HierarchyDataAccess::addChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesNotifier > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN ); @@ -910,7 +847,6 @@ void SAL_CALL HierarchyDataAccess::addChangesListener( // virtual void SAL_CALL HierarchyDataAccess::removeChangesListener( const uno::Reference< util::XChangesListener > & aListener ) - throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesNotifier > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesNotifier, CN ); @@ -926,7 +862,6 @@ void SAL_CALL HierarchyDataAccess::removeChangesListener( // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance() - throw ( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< lang::XSingleServiceFactory > xOrig = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF ); @@ -941,7 +876,6 @@ 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, std::exception ) { uno::Reference< lang::XSingleServiceFactory > xOrig = ENSURE_ORIG_INTERFACE( lang::XSingleServiceFactory, SSF ); @@ -959,10 +893,6 @@ HierarchyDataAccess::createInstanceWithArguments( void SAL_CALL HierarchyDataAccess::insertByName( const OUString & aName, const uno::Any & aElement ) - throw ( lang::IllegalArgumentException, - container::ElementExistException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< container::XNameContainer > xOrig = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC ); @@ -976,9 +906,6 @@ HierarchyDataAccess::insertByName( const OUString & aName, // virtual void SAL_CALL HierarchyDataAccess::removeByName( const OUString & Name ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< container::XNameContainer > xOrig = ENSURE_ORIG_INTERFACE( container::XNameContainer, NC ); @@ -995,10 +922,6 @@ HierarchyDataAccess::removeByName( const OUString & Name ) // virtual void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, const uno::Any & aElement ) - throw ( lang::IllegalArgumentException, - container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< container::XNameReplace > xOrig = ENSURE_ORIG_INTERFACE( container::XNameReplace, NR ); @@ -1014,7 +937,6 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, // virtual void SAL_CALL HierarchyDataAccess::commitChanges() - throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); @@ -1027,7 +949,6 @@ void SAL_CALL HierarchyDataAccess::commitChanges() // virtual sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges() - throw ( uno::RuntimeException, std::exception ) { uno::Reference< util::XChangesBatch > xOrig = ENSURE_ORIG_INTERFACE( util::XChangesBatch, CB ); @@ -1041,7 +962,6 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasPendingChanges() // virtual uno::Sequence< util::ElementChange > SAL_CALL HierarchyDataAccess::getPendingChanges() - 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 2f9b5cf79295..244063e5ee0d 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -51,20 +51,16 @@ public: virtual ~HierarchyDataSource() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -73,30 +69,20 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XComponent - virtual void SAL_CALL dispose() - throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw ( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener > & aListener ) override; // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString & aServiceSpecifier ) - throw ( css::uno::Exception, - css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString & aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier, const css::uno::Sequence< - css::uno::Any > & Arguments ) - throw ( css::uno::Exception, - css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Any > & Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // Non-Interface methods @@ -105,8 +91,7 @@ private: css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString & ServiceSpecifier, const css::uno::Sequence< css::uno::Any > & Arguments, - bool bCheckArgs ) - throw ( css::uno::Exception, css::uno::RuntimeException ); + bool bCheckArgs ); css::uno::Reference< css::lang::XMultiServiceFactory > getConfigProvider(); diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx index 3796652a9e79..8c05f4b9df8f 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx @@ -384,7 +384,6 @@ void HierarchyResultSetDataSupplier::close() // virtual void HierarchyResultSetDataSupplier::validate() - throw( ucb::ResultSetException ) { } diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx index 27e87c8f8495..8982a2905a06 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx @@ -64,8 +64,7 @@ public: virtual void close() override; - virtual void validate() - throw( css::ucb::ResultSetException ) override; + virtual void validate() override; }; } // namespace hierarchy_ucp diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index 3a7d3eb582f9..48ed7f1b588e 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -72,7 +72,6 @@ void SAL_CALL HierarchyContentProvider::release() } css::uno::Any SAL_CALL HierarchyContentProvider::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -100,7 +99,6 @@ XSERVICEINFO_COMMOM_IMPL( HierarchyContentProvider, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL HierarchyContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new HierarchyContentProvider( ucbhelper::getComponentContext(rSMgr) )); @@ -127,7 +125,6 @@ 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, std::exception ) { HierarchyUri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) @@ -161,7 +158,6 @@ HierarchyContentProvider::queryContent( // virtual void SAL_CALL HierarchyContentProvider::initialize( const uno::Sequence< uno::Any >& aArguments ) - 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 8eb74d17519a..4bde1b14600f 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -74,26 +74,20 @@ public: virtual ~HierarchyContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -104,15 +98,11 @@ public: // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; // XInitialization virtual void SAL_CALL - initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw( css::uno::Exception, - css::uno::RuntimeException, std::exception ) override; + initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // Non-Interface methods css::uno::Reference< css::lang::XMultiServiceFactory > diff --git a/ucb/source/ucp/image/ucpimage.cxx b/ucb/source/ucp/image/ucpimage.cxx index 723e7a22aaf0..f25b17636029 100644 --- a/ucb/source/ucp/image/ucpimage.cxx +++ b/ucb/source/ucp/image/ucpimage.cxx @@ -46,16 +46,13 @@ public: {} private: - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + OUString SAL_CALL getImplementationName() override { return OUString("com.sun.star.comp.ucb.ImageContentProvider"); } - sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } - css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override + css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override { return css::uno::Sequence<OUString>{ "com.sun.star.ucb.ImageContentProvider"}; @@ -63,9 +60,6 @@ private: css::uno::Reference<css::ucb::XContent> SAL_CALL queryContent( css::uno::Reference<css::ucb::XContentIdentifier> const & Identifier) - throw ( - css::ucb::IllegalIdentifierException, css::uno::RuntimeException, - std::exception) override { css::uno::Reference<css::uno::XComponentContext> context; @@ -145,8 +139,7 @@ private: sal_Int32 SAL_CALL compareContentIds( css::uno::Reference<css::ucb::XContentIdentifier> const & Id1, - css::uno::Reference<css::ucb::XContentIdentifier> const & Id2) - throw (css::uno::RuntimeException, std::exception) override + css::uno::Reference<css::ucb::XContentIdentifier> const & Id2) override { return Id1->getContentIdentifier().compareTo( Id2->getContentIdentifier()); diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 983d7b54e3f0..5a4153124bd6 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -291,7 +291,6 @@ void SAL_CALL Content::release() // virtual uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet; @@ -311,7 +310,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content ); // virtual uno::Sequence< uno::Type > SAL_CALL Content::getTypes() - throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = nullptr; @@ -390,7 +388,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.PackageContent" ); } @@ -398,7 +395,6 @@ OUString SAL_CALL Content::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aSNS( 1 ); if ( isFolder() ) @@ -415,7 +411,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() // virtual OUString SAL_CALL Content::getContentType() - throw( uno::RuntimeException, std::exception ) { return m_aProps.aContentType; } @@ -429,9 +424,6 @@ uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception, - ucb::CommandAbortedException, - uno::RuntimeException, std::exception ) { uno::Any aRet; @@ -669,7 +661,6 @@ uno::Any SAL_CALL Content::execute( // virtual void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException, std::exception ) { // @@@ Implement logic to abort running commands, if this makes // sense for your content. @@ -682,7 +673,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException, std::exception ) { return m_aProps.getCreatableContentsInfo( m_aUri ); } @@ -691,7 +681,6 @@ Content::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException, std::exception ) { if ( isFolder() ) { @@ -1016,7 +1005,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( uno::Sequence< uno::Any > Content::setPropertyValues( const uno::Sequence< beans::PropertyValue >& rValues, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1424,7 +1412,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any Content::open( const ucb::OpenCommandArgument2& rArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, std::exception ) { if ( rArg.Mode == ucb::OpenMode::ALL || rArg.Mode == ucb::OpenMode::FOLDERS || @@ -1573,7 +1560,6 @@ void Content::insert( const uno::Reference< io::XInputStream >& xStream, sal_Int32 nNameClashResolve, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, std::exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1731,7 +1717,6 @@ void Content::insert( void Content::destroy( bool bDeletePhysical, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, std::exception ) { // @@@ take care about bDeletePhysical -> trashcan support @@ -1777,7 +1762,6 @@ void Content::destroy( void Content::transfer( const ucb::TransferInfo& rInfo, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index 865fe9167b15..f6b0ad555b56 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -134,8 +134,7 @@ private: /// @throws css::uno::Exception css::uno::Sequence< css::uno::Any > setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); css::uno::Reference< css::container::XHierarchicalNameAccess > getPackage( const PackageUri& rURI ); @@ -176,25 +175,21 @@ private: /// @throws css::uno::Exception css::uno::Any open( const css::ucb::OpenCommandArgument2& rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void insert( const css::uno::Reference< css::io::XInputStream >& xStream, sal_Int32 nNameClashResolve, const css::uno::Reference< - css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void destroy( bool bDeletePhysical, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void transfer( const css::ucb::TransferInfo& rInfo, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); css::uno::Reference< css::io::XInputStream > getInputStream(); @@ -218,43 +213,33 @@ public: virtual ~Content() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XContent virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; // XCommandProcessor virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; virtual void SAL_CALL - abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + abort( sal_Int32 CommandId ) override; // Additional interfaces @@ -262,11 +247,9 @@ public: // XContentCreator virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL - queryCreatableContentsInfo() - throw( css::uno::RuntimeException, std::exception ) override; + queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException, std::exception ) override; + createNewContent( const css::ucb::ContentInfo& Info ) override; // Non-interface methods. diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index 1137516fbb6e..6ed79632272b 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -430,7 +430,6 @@ void DataSupplier::close() // virtual void DataSupplier::validate() - throw( ucb::ResultSetException ) { if ( m_pImpl->m_bThrowException ) throw ucb::ResultSetException(); diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx index 5b40c24c437a..678fd2940218 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.hxx +++ b/ucb/source/ucp/package/pkgdatasupplier.hxx @@ -56,8 +56,7 @@ public: virtual void close() override; - virtual void validate() - throw( css::ucb::ResultSetException ) override; + virtual void validate() override; OUString assembleChildURL( const OUString& aName ); }; diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 4095c2f64a8b..8178245b8fe9 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -62,8 +62,7 @@ public: // XInterface virtual uno::Any SAL_CALL - queryInterface( const uno::Type& aType ) - throw( uno::RuntimeException, std::exception ) override + queryInterface( const uno::Type& aType ) override { return m_xNA->queryInterface( aType ); } virtual void SAL_CALL acquire() throw() override @@ -74,12 +73,10 @@ public: // XHierarchicalNameAccess virtual uno::Any SAL_CALL - getByHierarchicalName( const OUString& aName ) - throw( container::NoSuchElementException, uno::RuntimeException, std::exception ) override + getByHierarchicalName( const OUString& aName ) override { return m_xNA->getByHierarchicalName( aName ); } virtual sal_Bool SAL_CALL - hasByHierarchicalName( const OUString& aName ) - throw( uno::RuntimeException, std::exception ) override + hasByHierarchicalName( const OUString& aName ) override { return m_xNA->hasByHierarchicalName( aName ); } }; @@ -128,7 +125,6 @@ void SAL_CALL ContentProvider::release() } css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -154,7 +150,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) )); @@ -180,7 +175,6 @@ 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, 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 dad04ea69091..c0c1b5b75fd6 100644 --- a/ucb/source/ucp/package/pkgprovider.hxx +++ b/ucb/source/ucp/package/pkgprovider.hxx @@ -52,26 +52,20 @@ public: virtual ~ContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -82,9 +76,7 @@ public: // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; // Non-interface methods. diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index 189d8d7365ce..5b5e5ec9f506 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -183,7 +183,6 @@ void SAL_CALL Content::release() // virtual uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = ContentImplHelper::queryInterface( rType ); @@ -210,7 +209,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content ); // virtual uno::Sequence< uno::Type > SAL_CALL Content::getTypes() - throw( uno::RuntimeException, std::exception ) { cppu::OTypeCollection * pCollection = nullptr; @@ -289,7 +287,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.TransientDocumentsContent" ); } @@ -297,7 +294,6 @@ OUString SAL_CALL Content::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -321,7 +317,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() // virtual OUString SAL_CALL Content::getContentType() - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); return m_aProps.getContentType(); @@ -331,7 +326,6 @@ OUString SAL_CALL Content::getContentType() // virtual uno::Reference< ucb::XContentIdentifier > SAL_CALL Content::getIdentifier() - throw( uno::RuntimeException, std::exception ) { { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -355,9 +349,6 @@ uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception, - ucb::CommandAbortedException, - uno::RuntimeException, std::exception ) { uno::Any aRet; @@ -649,7 +640,6 @@ uno::Any SAL_CALL Content::execute( // virtual void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException, std::exception ) { } @@ -660,7 +650,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException, std::exception ) { return m_aProps.getCreatableContentsInfo(); } @@ -669,7 +658,6 @@ Content::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException, std::exception ) { if ( m_aProps.isContentCreator() ) { @@ -1108,7 +1096,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( uno::Sequence< uno::Any > Content::setPropertyValues( const uno::Sequence< beans::PropertyValue >& rValues, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1384,7 +1371,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any Content::open( const ucb::OpenCommandArgument2& rArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception ) { if ( rArg.Mode == ucb::OpenMode::ALL || rArg.Mode == ucb::OpenMode::FOLDERS || @@ -1568,7 +1554,6 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, sal_Int32 nNameClashResolve, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1740,7 +1725,6 @@ void Content::insert( const uno::Reference< io::XInputStream >& xData, void Content::destroy( bool bDeletePhysical, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { // @@@ take care about bDeletePhysical -> trashcan support @@ -1889,7 +1873,6 @@ void Content::notifyChildInserted( const OUString & rRelativeChildUri ) void Content::transfer( const ucb::TransferInfo& rInfo, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -2329,9 +2312,6 @@ bool Content::loadData( ContentProvider* pProvider, bool Content::storeData( const uno::Reference< io::XInputStream >& xData, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw ( ucb::CommandFailedException, - task::DocumentPasswordRequest, - css::uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -2726,8 +2706,6 @@ static OUString obtainPassword( const OUString & rName, task::PasswordRequestMode eMode, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw ( ucb::CommandFailedException, - task::DocumentPasswordRequest ) { rtl::Reference< DocumentPasswordRequest > xRequest = new DocumentPasswordRequest( eMode, rName ); @@ -2781,9 +2759,6 @@ static OUString obtainPassword( uno::Reference< io::XInputStream > Content::getInputStream( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw ( ucb::CommandFailedException, - task::DocumentPasswordRequest, - uno::RuntimeException ) { OUString aUri; OUString aPassword; @@ -2827,9 +2802,6 @@ static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream( const OUString & rUri, ContentProvider * pProvider, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw ( ucb::CommandFailedException, - task::DocumentPasswordRequest, - uno::RuntimeException ) { OUString aPassword; bool bPasswordRequested = false; @@ -2858,9 +2830,6 @@ static uno::Reference< io::XOutputStream > lcl_getTruncatedOutputStream( uno::Reference< io::XOutputStream > Content::getTruncatedOutputStream( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw ( ucb::CommandFailedException, - task::DocumentPasswordRequest, - css::uno::RuntimeException ) { OSL_ENSURE( m_aProps.getType() == STREAM, "Content::getTruncatedOutputStream - content is no stream!" ); @@ -2874,9 +2843,6 @@ uno::Reference< io::XOutputStream > Content::getTruncatedOutputStream( uno::Reference< io::XStream > Content::getStream( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw ( ucb::CommandFailedException, - task::DocumentPasswordRequest, - uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index 45be23bc6bc3..25502ba5499b 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -124,10 +124,7 @@ private: /// @throws css::task::DocumentPasswordRequest /// @throws css::uno::RuntimeException bool storeData( const css::uno::Reference< css::io::XInputStream >& xData, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( css::ucb::CommandFailedException, - css::task::DocumentPasswordRequest, - css::uno::RuntimeException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); void renameData( const css::uno::Reference< css::ucb::XContentIdentifier >& xOldId, const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); bool removeData(); @@ -150,30 +147,25 @@ private: /// @throws css::uno::Exception setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception css::uno::Any open( const css::ucb::OpenCommandArgument2& rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception void insert( const css::uno::Reference< css::io::XInputStream >& xData, sal_Int32 nNameClashResolve, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void destroy( bool bDeletePhysical, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::Exception void transfer( const css::ucb::TransferInfo& rInfo, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); static css::uno::Reference< css::sdbc::XRow > getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rxContext, @@ -193,20 +185,14 @@ private: /// @throws css::task::DocumentPasswordRequest /// @throws css::uno::RuntimeException css::uno::Reference< css::io::XInputStream > - getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( css::ucb::CommandFailedException, - css::task::DocumentPasswordRequest, - css::uno::RuntimeException ); + getInputStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::ucb::CommandFailedException /// @throws css::task::DocumentPasswordRequest /// @throws css::uno::RuntimeException css::uno::Reference< css::io::XOutputStream > getTruncatedOutputStream( - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( css::ucb::CommandFailedException, - css::task::DocumentPasswordRequest, - css::uno::RuntimeException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); css::uno::Reference< css::ucb::XContent > queryChildContent( const OUString & rRelativeChildUri ); @@ -215,10 +201,7 @@ private: /// @throws css::task::DocumentPasswordRequest /// @throws css::uno::RuntimeException css::uno::Reference< css::io::XStream > - getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( css::ucb::CommandFailedException, - css::task::DocumentPasswordRequest, - css::uno::RuntimeException ); + getStream( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); public: // Create existing content. Fail, if not already exists. @@ -237,46 +220,35 @@ public: virtual ~Content() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XContent virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; virtual css::uno::Reference< css::ucb::XContentIdentifier > SAL_CALL - getIdentifier() - throw( css::uno::RuntimeException, std::exception ) override; + getIdentifier() override; // XCommandProcessor virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; virtual void SAL_CALL - abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + abort( sal_Int32 CommandId ) override; // Additional interfaces @@ -284,11 +256,9 @@ public: // XContentCreator virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL - queryCreatableContentsInfo() - throw( css::uno::RuntimeException, std::exception ) override; + queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException, std::exception ) override; + createNewContent( const css::ucb::ContentInfo& Info ) override; // Non-interface methods. diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index c8213ae8e7f5..b9e4d3dae2db 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -378,7 +378,6 @@ void ResultSetDataSupplier::close() // virtual void ResultSetDataSupplier::validate() - throw( ucb::ResultSetException ) { if ( m_pImpl->m_bThrowException ) throw ucb::ResultSetException(); diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx index a6cf5f1ba522..e83b48bd9a88 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx @@ -62,8 +62,7 @@ public: virtual void close() override; - virtual void validate() - throw( css::ucb::ResultSetException ) override; + virtual void validate() override; }; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 6994349dfdbe..cb1ffc7bfe07 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -58,15 +58,12 @@ using namespace tdoc_ucp; // virtual void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::queryClosing( const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ ) - throw ( util::CloseVetoException, - uno::RuntimeException, std::exception ) { } void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosing( const lang::EventObject& Source ) - throw ( uno::RuntimeException, std::exception ) { if (!m_pManager) return; // disposed? @@ -83,7 +80,6 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin // virtual void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing( const lang::EventObject& /*Source*/ ) - throw ( uno::RuntimeException, std::exception ) { } @@ -171,7 +167,6 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) // virtual void SAL_CALL OfficeDocumentsManager::documentEventOccured( const document::DocumentEvent & Event ) - throw ( uno::RuntimeException, std::exception ) { /* Events documentation: OOo Developer's Guide / Writing UNO Components / @@ -433,7 +428,6 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured( // virtual void SAL_CALL OfficeDocumentsManager::disposing( const lang::EventObject& /*Source*/ ) - throw ( uno::RuntimeException, std::exception ) { } diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 7dd5a07459ec..7f21e4ce8658 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -71,18 +71,14 @@ namespace tdoc_ucp { // util::XCloseListener virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, - sal_Bool GetsOwnership ) - throw (css::util::CloseVetoException, - css::uno::RuntimeException, std::exception) override; + sal_Bool GetsOwnership ) override; virtual void SAL_CALL notifyClosing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // lang::XEventListener (base of util::XCloseListener) virtual void SAL_CALL disposing( - const css::lang::EventObject & Source ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::lang::EventObject & Source ) override; void Dispose() { m_pManager = nullptr; } @@ -100,13 +96,11 @@ namespace tdoc_ucp { // document::XDocumentEventListener virtual void SAL_CALL documentEventOccured( - const css::document::DocumentEvent & Event ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::document::DocumentEvent & Event ) override; // lang::XEventListener (base of document::XDocumentEventListener) virtual void SAL_CALL disposing( - const css::lang::EventObject & Source ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::lang::EventObject & Source ) override; // Non-interface css::uno::Reference< css::embed::XStorage > diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index b4a27a8951fb..0ec5fbfe00e3 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -54,7 +54,6 @@ DocumentContentFactory::~DocumentContentFactory() // virtual OUString SAL_CALL DocumentContentFactory::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return getImplementationName_Static(); } @@ -62,7 +61,6 @@ OUString SAL_CALL DocumentContentFactory::getImplementationName() // virtual sal_Bool SAL_CALL DocumentContentFactory::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -70,7 +68,6 @@ DocumentContentFactory::supportsService( const OUString& ServiceName ) // virtual uno::Sequence< OUString > SAL_CALL DocumentContentFactory::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return getSupportedServiceNames_Static(); } @@ -100,7 +97,6 @@ DocumentContentFactory::getSupportedServiceNames_Static() uno::Reference< ucb::XContent > SAL_CALL DocumentContentFactory::createDocumentContent( const uno::Reference< frame::XModel >& Model ) - throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { uno::Reference< frame::XTransientDocumentsDocumentContentFactory > xDocFac; try @@ -129,7 +125,6 @@ DocumentContentFactory::createDocumentContent( static uno::Reference< uno::XInterface > SAL_CALL DocumentContentFactory_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) - throw( uno::Exception ) { lang::XServiceInfo * pX = static_cast< lang::XServiceInfo * >( new DocumentContentFactory( rSMgr ) ); diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx index 866c7a778c5f..61786dafb1ea 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx @@ -38,22 +38,17 @@ public: virtual ~DocumentContentFactory() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw ( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XTransientDocumentsDocumentContentFactory virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - createDocumentContent( const css::uno::Reference< css::frame::XModel >& Model ) - throw ( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + createDocumentContent( const css::uno::Reference< css::frame::XModel >& Model ) override; // Non-UNO interfaces static OUString diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index 3e497f9a243b..439f60df4b34 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -44,28 +44,22 @@ namespace tdoc_ucp : InteractionContinuation( pRequest ) {} // XInterface - virtual uno::Any SAL_CALL queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) override; + virtual uno::Any SAL_CALL queryInterface( const uno::Type & rType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XTypeProvider - virtual uno::Sequence< uno::Type > SAL_CALL getTypes() - throw ( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( uno::RuntimeException, std::exception ) override; + virtual uno::Sequence< uno::Type > SAL_CALL getTypes() override; + virtual uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XInteractionContinuation - virtual void SAL_CALL select() - throw ( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL select() override; // XInteractionPassword - virtual void SAL_CALL setPassword( const OUString & aPasswd ) - throw ( uno::RuntimeException, std::exception ) override; - virtual OUString SAL_CALL getPassword() - throw ( uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setPassword( const OUString & aPasswd ) override; + virtual OUString SAL_CALL getPassword() override; private: osl::Mutex m_aMutex; @@ -99,7 +93,6 @@ void SAL_CALL InteractionSupplyPassword::release() // virtual uno::Any SAL_CALL InteractionSupplyPassword::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = cppu::queryInterface( rType, static_cast< lang::XTypeProvider * >( this ), @@ -117,7 +110,6 @@ InteractionSupplyPassword::queryInterface( const uno::Type & rType ) // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyPassword::getImplementationId() - throw( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -125,7 +117,6 @@ InteractionSupplyPassword::getImplementationId() // virtual uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes() - throw( uno::RuntimeException, std::exception ) { static cppu::OTypeCollection * pCollection = nullptr; if ( !pCollection ) @@ -148,7 +139,6 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes() // virtual void SAL_CALL InteractionSupplyPassword::select() - throw( uno::RuntimeException, std::exception ) { recordSelection(); } @@ -160,7 +150,6 @@ void SAL_CALL InteractionSupplyPassword::select() // virtual void SAL_CALL InteractionSupplyPassword::setPassword( const OUString& aPasswd ) - throw ( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); m_aPassword = aPasswd; @@ -168,7 +157,6 @@ InteractionSupplyPassword::setPassword( const OUString& aPasswd ) // virtual OUString SAL_CALL InteractionSupplyPassword::getPassword() - throw ( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); return m_aPassword; diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 580a115e4a87..4c80a626035d 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -77,7 +77,6 @@ void SAL_CALL ContentProvider::release() } css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -105,7 +104,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) )); @@ -132,7 +130,6 @@ ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) - throw( ucb::IllegalIdentifierException, uno::RuntimeException, std::exception ) { Uri aUri( Identifier->getContentIdentifier() ); if ( !aUri.isValid() ) @@ -168,7 +165,6 @@ ContentProvider::queryContent( uno::Reference< ucb::XContent > SAL_CALL ContentProvider::createDocumentContent( const uno::Reference< frame::XModel >& Model ) - throw ( lang::IllegalArgumentException, uno::RuntimeException, std::exception ) { // model -> id -> content identifier -> queryContent if ( m_xDocsMgr.is() ) @@ -403,7 +399,6 @@ ContentProvider::queryStorageClone( const OUString & rUri ) const uno::Reference< io::XInputStream > ContentProvider::queryInputStream( const OUString & rUri, const OUString & rPassword ) const - throw ( packages::WrongPasswordException, css::uno::RuntimeException ) { if ( m_xStgElemFac.is() ) { @@ -441,8 +436,6 @@ uno::Reference< io::XOutputStream > ContentProvider::queryOutputStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) const - throw ( packages::WrongPasswordException, - uno::RuntimeException ) { if ( m_xStgElemFac.is() ) { @@ -482,7 +475,6 @@ uno::Reference< io::XStream > ContentProvider::queryStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) const - throw ( packages::WrongPasswordException, uno::RuntimeException ) { if ( m_xStgElemFac.is() ) { diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index 5e70d04e044c..e99f79301e8e 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -60,26 +60,20 @@ public: virtual ~ContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -90,16 +84,12 @@ public: // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; // XTransientDocumentsDocumentContentFactory virtual css::uno::Reference< css::ucb::XContent > SAL_CALL createDocumentContent( const css::uno::Reference< - css::frame::XModel >& Model ) - throw ( css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + css::frame::XModel >& Model ) override; // Non-UNO interfaces css::uno::Reference< css::embed::XStorage > @@ -112,27 +102,21 @@ public: /// @throws css::uno::RuntimeException css::uno::Reference< css::io::XInputStream > queryInputStream( const OUString & rUri, - const OUString & rPassword ) const - throw ( css::packages::WrongPasswordException, - css::uno::RuntimeException ); + const OUString & rPassword ) const; /// @throws css::packages::WrongPasswordException /// @throws css::uno::RuntimeException css::uno::Reference< css::io::XOutputStream > queryOutputStream( const OUString & rUri, const OUString & rPassword, - bool bTruncate ) const - throw ( css::packages::WrongPasswordException, - css::uno::RuntimeException ); + bool bTruncate ) const; /// @throws css::packages::WrongPasswordException /// @throws css::uno::RuntimeException css::uno::Reference< css::io::XStream > queryStream( const OUString & rUri, const OUString & rPassword, - bool bTruncate ) const - throw ( css::packages::WrongPasswordException, - css::uno::RuntimeException ); + bool bTruncate ) const; bool queryNamesOfChildren( const OUString & rUri, diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index 4eb418dba25c..8046f938de2a 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -146,7 +146,6 @@ Storage::~Storage() // virtual uno::Any SAL_CALL Storage::queryInterface( const uno::Type& aType ) - throw ( uno::RuntimeException, std::exception ) { // First, try to use interfaces implemented by myself and base class(es) uno::Any aRet = StorageUNOBase::queryInterface( aType ); @@ -187,7 +186,6 @@ void SAL_CALL Storage::release() // virtual uno::Sequence< uno::Type > SAL_CALL Storage::getTypes() - throw ( uno::RuntimeException, std::exception ) { return m_xWrappedTypeProv->getTypes(); } @@ -195,7 +193,6 @@ uno::Sequence< uno::Type > SAL_CALL Storage::getTypes() // virtual uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId() - throw ( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -206,7 +203,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId() // virtual void SAL_CALL Storage::dispose() - throw ( uno::RuntimeException, std::exception ) { m_xWrappedStorage->dispose(); } @@ -215,7 +211,6 @@ void SAL_CALL Storage::dispose() // virtual void SAL_CALL Storage::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { m_xWrappedStorage->addEventListener( xListener ); } @@ -223,7 +218,6 @@ void SAL_CALL Storage::addEventListener( // virtual void SAL_CALL Storage::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_xWrappedStorage->removeEventListener( aListener ); } @@ -234,7 +228,6 @@ void SAL_CALL Storage::removeEventListener( // virtual uno::Type SAL_CALL Storage::getElementType() - throw ( uno::RuntimeException, std::exception ) { return m_xWrappedStorage->getElementType(); } @@ -242,7 +235,6 @@ uno::Type SAL_CALL Storage::getElementType() // virtual sal_Bool SAL_CALL Storage::hasElements() - throw ( uno::RuntimeException, std::exception ) { return m_xWrappedStorage->hasElements(); } @@ -253,9 +245,6 @@ sal_Bool SAL_CALL Storage::hasElements() // virtual uno::Any SAL_CALL Storage::getByName( const OUString& aName ) - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { return m_xWrappedStorage->getByName( aName ); } @@ -263,7 +252,6 @@ uno::Any SAL_CALL Storage::getByName( const OUString& aName ) // virtual uno::Sequence< OUString > SAL_CALL Storage::getElementNames() - throw ( uno::RuntimeException, std::exception ) { return m_xWrappedStorage->getElementNames(); } @@ -271,7 +259,6 @@ uno::Sequence< OUString > SAL_CALL Storage::getElementNames() // virtual sal_Bool SAL_CALL Storage::hasByName( const OUString& aName ) - throw ( uno::RuntimeException, std::exception ) { return m_xWrappedStorage->hasByName( aName ); } @@ -283,11 +270,6 @@ sal_Bool SAL_CALL Storage::hasByName( const OUString& aName ) // virtual void SAL_CALL Storage::copyToStorage( const uno::Reference< embed::XStorage >& xDest ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { m_xWrappedStorage->copyToStorage( xDest ); } @@ -296,12 +278,6 @@ void SAL_CALL Storage::copyToStorage( // virtual uno::Reference< io::XStream > SAL_CALL Storage::openStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { return m_xWrappedStorage->openStreamElement( aStreamName, nOpenMode ); } @@ -312,13 +288,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, const OUString& aPassword ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoEncryptionException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { return m_xWrappedStorage->openEncryptedStreamElement( aStreamName, nOpenMode, aPassword ); @@ -328,11 +297,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::openEncryptedStreamElement( // virtual uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement( const OUString& aStorName, sal_Int32 nOpenMode ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { return m_xWrappedStorage->openStorageElement( aStorName, nOpenMode ); } @@ -341,12 +305,6 @@ uno::Reference< embed::XStorage > SAL_CALL Storage::openStorageElement( // virtual uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement( const OUString& aStreamName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { return m_xWrappedStorage->cloneStreamElement( aStreamName ); } @@ -356,13 +314,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneStreamElement( uno::Reference< io::XStream > SAL_CALL Storage::cloneEncryptedStreamElement( const OUString& aStreamName, const OUString& aPassword ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - packages::NoEncryptionException, - packages::WrongPasswordException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { return m_xWrappedStorage->cloneEncryptedStreamElement( aStreamName, aPassword ); @@ -372,11 +323,6 @@ uno::Reference< io::XStream > SAL_CALL Storage::cloneEncryptedStreamElement( // virtual void SAL_CALL Storage::copyLastCommitTo( const uno::Reference< embed::XStorage >& xTargetStorage ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception) { m_xWrappedStorage->copyLastCommitTo( xTargetStorage ); } @@ -386,11 +332,6 @@ void SAL_CALL Storage::copyLastCommitTo( void SAL_CALL Storage::copyStorageElementLastCommitTo( const OUString& aStorName, const uno::Reference< embed::XStorage >& xTargetStorage ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception) { m_xWrappedStorage->copyStorageElementLastCommitTo( aStorName, xTargetStorage ); } @@ -399,10 +340,6 @@ void SAL_CALL Storage::copyStorageElementLastCommitTo( // virtual sal_Bool SAL_CALL Storage::isStreamElement( const OUString& aElementName ) - throw ( container::NoSuchElementException, - lang::IllegalArgumentException, - embed::InvalidStorageException, - uno::RuntimeException, std::exception ) { return m_xWrappedStorage->isStreamElement( aElementName ); } @@ -411,10 +348,6 @@ sal_Bool SAL_CALL Storage::isStreamElement( // virtual sal_Bool SAL_CALL Storage::isStorageElement( const OUString& aElementName ) - throw ( container::NoSuchElementException, - lang::IllegalArgumentException, - embed::InvalidStorageException, - uno::RuntimeException, std::exception ) { return m_xWrappedStorage->isStorageElement( aElementName ); } @@ -422,12 +355,6 @@ sal_Bool SAL_CALL Storage::isStorageElement( // virtual void SAL_CALL Storage::removeElement( const OUString& aElementName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { m_xWrappedStorage->removeElement( aElementName ); } @@ -436,13 +363,6 @@ void SAL_CALL Storage::removeElement( const OUString& aElementName ) // virtual void SAL_CALL Storage::renameElement( const OUString& aEleName, const OUString& aNewName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { m_xWrappedStorage->renameElement( aEleName, aNewName ); } @@ -453,13 +373,6 @@ void SAL_CALL Storage::copyElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, const OUString& aNewName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { m_xWrappedStorage->copyElementTo( aElementName, xDest, aNewName ); } @@ -470,13 +383,6 @@ void SAL_CALL Storage::moveElementTo( const OUString& aElementName, const uno::Reference< embed::XStorage >& xDest, const OUString& rNewName ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - container::NoSuchElementException, - container::ElementExistException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException, std::exception ) { m_xWrappedStorage->moveElementTo( aElementName, xDest, rNewName ); } @@ -487,9 +393,6 @@ void SAL_CALL Storage::moveElementTo( // virtual void SAL_CALL Storage::commit() - throw ( io::IOException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { // Never commit a root storage (-> has no parent)! // Would lead in writing the whole document to disk. @@ -519,9 +422,6 @@ void SAL_CALL Storage::commit() // virtual void SAL_CALL Storage::revert() - throw ( io::IOException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { uno::Reference< embed::XStorage > xParentStorage = getParentStorage(); if ( xParentStorage.is() ) @@ -614,7 +514,6 @@ OutputStream::~OutputStream() // virtual uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = OutputStreamUNOBase::queryInterface( aType ); @@ -633,7 +532,6 @@ uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType ) // virtual uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes() - throw ( uno::RuntimeException, std::exception ) { return m_xWrappedTypeProv->getTypes(); } @@ -641,7 +539,6 @@ uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes() // virtual uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId() - throw ( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -653,10 +550,6 @@ uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId() // virtual void SAL_CALL OutputStream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { m_xWrappedStream->writeBytes( aData ); } @@ -665,10 +558,6 @@ OutputStream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) // virtual void SAL_CALL OutputStream::flush() - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { m_xWrappedStream->flush(); } @@ -677,10 +566,6 @@ OutputStream::flush() // virtual void SAL_CALL OutputStream::closeOutput( ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { m_xWrappedStream->closeOutput(); @@ -696,7 +581,6 @@ OutputStream::closeOutput( ) // virtual void SAL_CALL OutputStream::dispose() - throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->dispose(); @@ -710,7 +594,6 @@ OutputStream::dispose() void SAL_CALL OutputStream::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->addEventListener( xListener ); } @@ -720,7 +603,6 @@ OutputStream::addEventListener( void SAL_CALL OutputStream::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->removeEventListener( aListener ); } @@ -797,7 +679,6 @@ Stream::~Stream() // virtual uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType ) - throw ( uno::RuntimeException, std::exception ) { uno::Any aRet = StreamUNOBase::queryInterface( aType ); @@ -816,7 +697,6 @@ uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType ) // virtual uno::Sequence< uno::Type > SAL_CALL Stream::getTypes() - throw ( uno::RuntimeException, std::exception ) { return m_xWrappedTypeProv->getTypes(); } @@ -824,7 +704,6 @@ uno::Sequence< uno::Type > SAL_CALL Stream::getTypes() // virtual uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId() - throw ( uno::RuntimeException, std::exception ) { return css::uno::Sequence<sal_Int8>(); } @@ -835,7 +714,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId() // virtual uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream() - throw( uno::RuntimeException, std::exception ) { return uno::Reference< io::XInputStream >( this ); } @@ -843,7 +721,6 @@ uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream() // virtual uno::Reference< io::XOutputStream > SAL_CALL Stream::getOutputStream() - throw( uno::RuntimeException, std::exception ) { return uno::Reference< io::XOutputStream >( this ); } @@ -854,10 +731,6 @@ uno::Reference< io::XOutputStream > SAL_CALL Stream::getOutputStream() // virtual void SAL_CALL Stream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { if ( m_xWrappedOutputStream.is() ) { @@ -869,10 +742,6 @@ void SAL_CALL Stream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) // virtual void SAL_CALL Stream::flush() - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { if ( m_xWrappedOutputStream.is() ) { @@ -884,9 +753,6 @@ void SAL_CALL Stream::flush() // virtual void SAL_CALL Stream::closeOutput() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { if ( m_xWrappedOutputStream.is() ) { @@ -905,8 +771,6 @@ void SAL_CALL Stream::closeOutput() // virtual void SAL_CALL Stream::truncate() - throw( io::IOException, - uno::RuntimeException, std::exception ) { if ( m_xWrappedTruncate.is() ) { @@ -922,10 +786,6 @@ void SAL_CALL Stream::truncate() // virtual sal_Int32 SAL_CALL Stream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { return m_xWrappedInputStream->readBytes( aData, nBytesToRead ); } @@ -934,10 +794,6 @@ sal_Int32 SAL_CALL Stream::readBytes( uno::Sequence< sal_Int8 >& aData, // virtual sal_Int32 SAL_CALL Stream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { return m_xWrappedInputStream->readSomeBytes( aData, nMaxBytesToRead ); } @@ -945,10 +801,6 @@ sal_Int32 SAL_CALL Stream::readSomeBytes( uno::Sequence< sal_Int8 >& aData, // virtual void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip ) - throw( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { m_xWrappedInputStream->skipBytes( nBytesToSkip ); } @@ -956,9 +808,6 @@ void SAL_CALL Stream::skipBytes( sal_Int32 nBytesToSkip ) // virtual sal_Int32 SAL_CALL Stream::available() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { return m_xWrappedInputStream->available(); } @@ -966,9 +815,6 @@ sal_Int32 SAL_CALL Stream::available() // virtual void SAL_CALL Stream::closeInput() - throw( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { m_xWrappedInputStream->closeInput(); } @@ -979,7 +825,6 @@ void SAL_CALL Stream::closeInput() // virtual void SAL_CALL Stream::dispose() - throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->dispose(); @@ -992,7 +837,6 @@ void SAL_CALL Stream::dispose() // virtual void SAL_CALL Stream::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->addEventListener( xListener ); } @@ -1001,7 +845,6 @@ void SAL_CALL Stream::addEventListener( // virtual void SAL_CALL Stream::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw ( uno::RuntimeException, std::exception ) { m_xWrappedComponent->removeEventListener( aListener ); } @@ -1011,7 +854,6 @@ void SAL_CALL Stream::removeEventListener( void Stream::commitChanges() - throw( io::IOException ) { uno::Reference< embed::XTransactedObject > xParentTA( getParentStorage(), uno::UNO_QUERY ); diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index 33f8302ba8d9..28994800424b 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -83,8 +83,7 @@ public: // XInterface virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& aType ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() @@ -93,178 +92,79 @@ public: // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw ( css::uno::RuntimeException, std::exception ) override; + getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override; + getImplementationId() override; // XComponent ( one of XStorage bases ) virtual void SAL_CALL - dispose() - throw ( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XNameAccess ( one of XStorage bases ) virtual css::uno::Any SAL_CALL - getByName( const OUString& aName ) - throw ( css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + getByName( const OUString& aName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getElementNames() - throw ( css::uno::RuntimeException, std::exception ) override; + getElementNames() override; virtual sal_Bool SAL_CALL - hasByName( const OUString& aName ) - throw ( css::uno::RuntimeException, std::exception ) override; + hasByName( const OUString& aName ) override; // XElementAccess (base of XNameAccess) virtual css::uno::Type SAL_CALL - getElementType() - throw ( css::uno::RuntimeException, std::exception ) override; + getElementType() override; virtual sal_Bool SAL_CALL - hasElements() - throw ( css::uno::RuntimeException, std::exception ) override; + hasElements() override; // XStorage virtual void SAL_CALL - copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + copyToStorage( const css::uno::Reference< css::embed::XStorage >& xDest ) override; virtual css::uno::Reference< css::io::XStream > SAL_CALL openStreamElement( const OUString& aStreamName, - sal_Int32 nOpenMode ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nOpenMode ) override; virtual css::uno::Reference< css::io::XStream > SAL_CALL openEncryptedStreamElement( const OUString& aStreamName, sal_Int32 nOpenMode, - const OUString& aPassword ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoEncryptionException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aPassword ) override; virtual css::uno::Reference< css::embed::XStorage > SAL_CALL openStorageElement( const OUString& aStorName, - sal_Int32 nOpenMode ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nOpenMode ) override; virtual css::uno::Reference< css::io::XStream > SAL_CALL - cloneStreamElement( const OUString& aStreamName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + cloneStreamElement( const OUString& aStreamName ) override; virtual css::uno::Reference< css::io::XStream > SAL_CALL cloneEncryptedStreamElement( const OUString& aStreamName, - const OUString& aPassword ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::packages::NoEncryptionException, - css::packages::WrongPasswordException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aPassword ) override; virtual void SAL_CALL copyLastCommitTo( const css::uno::Reference< - css::embed::XStorage >& xTargetStorage ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + css::embed::XStorage >& xTargetStorage ) override; virtual void SAL_CALL copyStorageElementLastCommitTo( const OUString& aStorName, const css::uno::Reference< css::embed::XStorage > & - xTargetStorage ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + xTargetStorage ) override; virtual sal_Bool SAL_CALL - isStreamElement( const OUString& aElementName ) - throw ( css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::embed::InvalidStorageException, - css::uno::RuntimeException, std::exception ) override; + isStreamElement( const OUString& aElementName ) override; virtual sal_Bool SAL_CALL - isStorageElement( const OUString& aElementName ) - throw ( css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::embed::InvalidStorageException, - css::uno::RuntimeException, std::exception ) override; + isStorageElement( const OUString& aElementName ) override; virtual void SAL_CALL - removeElement( const OUString& aElementName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + removeElement( const OUString& aElementName ) override; virtual void SAL_CALL renameElement( const OUString& aEleName, - const OUString& aNewName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aNewName ) override; virtual void SAL_CALL copyElementTo( const OUString& aElementName, const css::uno::Reference< css::embed::XStorage >& xDest, - const OUString& aNewName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& aNewName ) override; virtual void SAL_CALL moveElementTo( const OUString& aElementName, const css::uno::Reference< css::embed::XStorage >& xDest, - const OUString& rNewName ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::container::ElementExistException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + const OUString& rNewName ) override; // XTransactedObject - virtual void SAL_CALL commit() - throw ( css::io::IOException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL revert() - throw ( css::io::IOException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL commit() override; + virtual void SAL_CALL revert() override; private: rtl::Reference< StorageElementFactory > m_xFactory; @@ -299,50 +199,32 @@ public: // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& aType ) - throw ( css::uno::RuntimeException, std::exception ) override; + queryInterface( const css::uno::Type& aType ) override; // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw ( css::uno::RuntimeException, std::exception ) override; + getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override; + getImplementationId() override; // XOutputStream virtual void SAL_CALL - writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override; virtual void SAL_CALL - flush( ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + flush( ) override; // Note: We need to intercept this one. virtual void SAL_CALL - closeOutput( ) - throw ( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeOutput( ) override; // XComponent // Note: We need to intercept this one. virtual void SAL_CALL - dispose() - throw ( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; private: css::uno::Reference< @@ -376,106 +258,66 @@ public: // XInterface virtual css::uno::Any SAL_CALL - queryInterface( const css::uno::Type& aType ) - throw ( css::uno::RuntimeException, std::exception ) override; + queryInterface( const css::uno::Type& aType ) override; // XTypeProvider (implemnented by base, but needs to be overridden for // delegating to aggregate) virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw ( css::uno::RuntimeException, std::exception ) override; + getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override; + getImplementationId() override; // XStream virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getInputStream() - throw( css::uno::RuntimeException, std::exception ) override; + getInputStream() override; virtual css::uno::Reference< css::io::XOutputStream > SAL_CALL - getOutputStream() - throw( css::uno::RuntimeException, std::exception ) override; + getOutputStream() override; // XOutputStream virtual void SAL_CALL - writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + writeBytes( const css::uno::Sequence< sal_Int8 >& aData ) override; virtual void SAL_CALL - flush() - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + flush() override; virtual void SAL_CALL - closeOutput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeOutput() override; // XTruncate virtual void SAL_CALL - truncate() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + truncate() override; // XInputStream virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nBytesToRead ) override; virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, - sal_Int32 nMaxBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nMaxBytesToRead ) override; virtual void SAL_CALL - skipBytes( sal_Int32 nBytesToSkip ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + skipBytes( sal_Int32 nBytesToSkip ) override; virtual sal_Int32 SAL_CALL - available() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + available() override; virtual void SAL_CALL - closeInput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + closeInput() override; // XComponent // Note: We need to intercept this one. virtual void SAL_CALL - dispose() - throw ( css::uno::RuntimeException, std::exception ) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; private: /// @throws css::io::IOException - void commitChanges() - throw( css::io::IOException ); + void commitChanges(); css::uno::Reference< css::uno::XAggregation > m_xAggProxy; diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index 8bba2180a939..a8055241522b 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -56,8 +56,6 @@ StorageElementFactory::~StorageElementFactory() uno::Reference< embed::XStorage > StorageElementFactory::createTemporaryStorage() - throw ( uno::Exception, - uno::RuntimeException ) { uno::Reference< embed::XStorage > xStorage; uno::Reference< lang::XSingleServiceFactory > xStorageFac; @@ -80,11 +78,6 @@ StorageElementFactory::createTemporaryStorage() uno::Reference< embed::XStorage > StorageElementFactory::createStorage( const OUString & rUri, StorageAccessMode eMode ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -233,12 +226,6 @@ StorageElementFactory::createStorage( const OUString & rUri, uno::Reference< io::XInputStream > StorageElementFactory::createInputStream( const OUString & rUri, const OUString & rPassword ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - packages::WrongPasswordException, - uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -263,12 +250,6 @@ uno::Reference< io::XOutputStream > StorageElementFactory::createOutputStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - packages::WrongPasswordException, - uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -308,12 +289,6 @@ uno::Reference< io::XStream > StorageElementFactory::createStream( const OUString & rUri, const OUString & rPassword, bool bTruncate ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - packages::WrongPasswordException, - uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); @@ -358,11 +333,6 @@ void StorageElementFactory::releaseElement( Storage * pElement ) uno::Reference< embed::XStorage > StorageElementFactory::queryParentStorage( const OUString & rUri, StorageAccessMode eMode ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException ) { uno::Reference< embed::XStorage > xParentStorage; @@ -384,11 +354,6 @@ uno::Reference< embed::XStorage > StorageElementFactory::queryStorage( const uno::Reference< embed::XStorage > & xParentStorage, const OUString & rUri, StorageAccessMode eMode ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - uno::RuntimeException ) { uno::Reference< embed::XStorage > xStorage; @@ -529,12 +494,6 @@ StorageElementFactory::queryStream( const OUString & rPassword, StorageAccessMode eMode, bool bTruncate ) - throw ( embed::InvalidStorageException, - lang::IllegalArgumentException, - io::IOException, - embed::StorageWrappedTargetException, - packages::WrongPasswordException, - uno::RuntimeException ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx index c47717a49623..15e315ee4d18 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.hxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx @@ -51,9 +51,7 @@ namespace tdoc_ucp { /// @throws css::uno::Exception /// @throws css::uno::RuntimeException css::uno::Reference< css::embed::XStorage > - createTemporaryStorage() - throw ( css::uno::Exception, - css::uno::RuntimeException ); + createTemporaryStorage(); /// @throws css::embed::InvalidStorageException /// @throws css::lang::IllegalArgumentException @@ -61,12 +59,7 @@ namespace tdoc_ucp { /// @throws css::embed::StorageWrappedTargetException /// @throws css::uno::RuntimeException css::uno::Reference< css::embed::XStorage > - createStorage( const OUString & rUri, StorageAccessMode eMode ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException ); + createStorage( const OUString & rUri, StorageAccessMode eMode ); /// @throws css::embed::InvalidStorageException /// @throws css::lang::IllegalArgumentException @@ -76,13 +69,7 @@ namespace tdoc_ucp { /// @throws css::uno::RuntimeException css::uno::Reference< css::io::XInputStream > createInputStream( const OUString & rUri, - const OUString & rPassword ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::packages::WrongPasswordException, - css::uno::RuntimeException ); + const OUString & rPassword ); /// @throws css::embed::InvalidStorageException /// @throws css::lang::IllegalArgumentException @@ -93,13 +80,7 @@ namespace tdoc_ucp { css::uno::Reference< css::io::XOutputStream > createOutputStream( const OUString & rUri, const OUString & rPassword, - bool bTruncate ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::packages::WrongPasswordException, - css::uno::RuntimeException ); + bool bTruncate ); /// @throws css::embed::InvalidStorageException /// @throws css::lang::IllegalArgumentException @@ -110,13 +91,7 @@ namespace tdoc_ucp { css::uno::Reference< css::io::XStream > createStream( const OUString & rUri, const OUString & rPassword, - bool bTruncate ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::packages::WrongPasswordException, - css::uno::RuntimeException ); + bool bTruncate ); private: friend class Storage; @@ -130,12 +105,7 @@ namespace tdoc_ucp { /// @throws css::uno::RuntimeException css::uno::Reference< css::embed::XStorage > queryParentStorage( const OUString & rUri, - StorageAccessMode eMode ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException ); + StorageAccessMode eMode ); /// @throws css::embed::InvalidStorageException /// @throws css::lang::IllegalArgumentException @@ -146,12 +116,7 @@ namespace tdoc_ucp { queryStorage( const css::uno::Reference< css::embed::XStorage > & xParentStorage, const OUString & rUri, - StorageAccessMode eMode ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::uno::RuntimeException ); + StorageAccessMode eMode ); /// @throws css::embed::InvalidStorageException /// @throws css::lang::IllegalArgumentException @@ -165,13 +130,7 @@ namespace tdoc_ucp { const OUString & rPassword, const OUString & rUri, StorageAccessMode eMode, - bool bTruncate /* ignored for read-only streams */ ) - throw ( css::embed::InvalidStorageException, - css::lang::IllegalArgumentException, - css::io::IOException, - css::embed::StorageWrappedTargetException, - css::packages::WrongPasswordException, - css::uno::RuntimeException ); + bool bTruncate /* ignored for read-only streams */ ); struct ltstrbool { diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index 2ce02150afbb..c20173a6bde7 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -171,7 +171,6 @@ void DAVResourceAccess::OPTIONS( DAVOptions & rOptions, const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ) { initialize(); @@ -212,7 +211,6 @@ void DAVResourceAccess::PROPFIND( const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -255,7 +253,6 @@ void DAVResourceAccess::PROPFIND( const Depth nDepth, std::vector< DAVResourceInfo > & rResInfo, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -295,7 +292,6 @@ void DAVResourceAccess::PROPFIND( void DAVResourceAccess::PROPPATCH( const std::vector< ProppatchValue >& rValues, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( DAVException ) { initialize(); @@ -335,7 +331,6 @@ void DAVResourceAccess::HEAD( const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( DAVException ) { initialize(); @@ -374,7 +369,6 @@ void DAVResourceAccess::HEAD( uno::Reference< io::XInputStream > DAVResourceAccess::GET( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -416,7 +410,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( void DAVResourceAccess::GET( uno::Reference< io::XOutputStream > & rStream, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -455,7 +448,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw (css::uno::RuntimeException, DAVException) { initialize(); @@ -501,7 +493,6 @@ void DAVResourceAccess::GET0( const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -544,7 +535,6 @@ void DAVResourceAccess::GET( const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -583,7 +573,6 @@ void DAVResourceAccess::GET( void DAVResourceAccess::abort() - throw( DAVException ) { initialize(); m_xSession->abort(); @@ -594,7 +583,6 @@ namespace { /// @throws DAVException void resetInputStream( const uno::Reference< io::XInputStream > & rStream ) - throw( DAVException ) { try { @@ -622,7 +610,6 @@ namespace { void DAVResourceAccess::PUT( const uno::Reference< io::XInputStream > & rStream, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw (css::uno::RuntimeException, DAVException) { initialize(); @@ -671,7 +658,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw (css::uno::RuntimeException, DAVException) { initialize(); @@ -735,7 +721,6 @@ void DAVResourceAccess::POST( const uno::Reference< io::XInputStream > & rInputStream, uno::Reference< io::XOutputStream > & rOutputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw (css::uno::RuntimeException, DAVException) { initialize(); @@ -793,7 +778,6 @@ void DAVResourceAccess::POST( void DAVResourceAccess::MKCOL( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -833,7 +817,6 @@ void DAVResourceAccess::COPY( const OUString & rDestinationURI, bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -875,7 +858,6 @@ void DAVResourceAccess::MOVE( const OUString & rDestinationURI, bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -914,7 +896,6 @@ void DAVResourceAccess::MOVE( void DAVResourceAccess::DESTROY( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -953,7 +934,6 @@ void DAVResourceAccess::DESTROY( void DAVResourceAccess::LOCK( ucb::Lock & inLock, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ) { initialize(); @@ -1037,7 +1017,6 @@ sal_Int64 DAVResourceAccess::LOCK( void DAVResourceAccess::UNLOCK( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ) { initialize(); @@ -1073,7 +1052,6 @@ void DAVResourceAccess::UNLOCK( void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFlags ) - throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); m_aFlags = rFlags; @@ -1081,7 +1059,6 @@ void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFla void DAVResourceAccess::setURL( const OUString & rNewURL ) - throw( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); m_aURL = rNewURL; @@ -1091,7 +1068,6 @@ void DAVResourceAccess::setURL( const OUString & rNewURL ) // init dav session and path void DAVResourceAccess::initialize() - throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if ( m_aPath.isEmpty() ) @@ -1189,7 +1165,6 @@ void DAVResourceAccess::getUserRequestHeaders( // This function member implements the control on cyclical redirections bool DAVResourceAccess::detectRedirectCycle( const OUString& rRedirectURL ) - throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -1236,7 +1211,6 @@ void DAVResourceAccess::resetUri() bool DAVResourceAccess::handleException( const DAVException & e, int errorCount ) - throw ( DAVException ) { switch ( e.getError() ) { diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx index 73e7d6d0b8ad..3667b9a15b22 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx @@ -73,12 +73,10 @@ public: DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); /// @throws DAVException - void setFlags( const css::uno::Sequence< css::beans::NamedValue >& rFlags ) - throw ( DAVException ); + void setFlags( const css::uno::Sequence< css::beans::NamedValue >& rFlags ); /// @throws DAVException - void setURL( const OUString & rNewURL ) - throw ( DAVException ); + void setURL( const OUString & rNewURL ); void resetUri(); @@ -93,8 +91,7 @@ public: void OPTIONS( DAVOptions & rOptions, const css::uno::Reference< - css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + css::ucb::XCommandEnvironment > & xEnv ); // allprop & named /// @throws DAVException @@ -102,48 +99,41 @@ public: PROPFIND( const Depth nDepth, const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); // propnames /// @throws DAVException void PROPFIND( const Depth nDepth, std::vector< DAVResourceInfo > & rResInfo, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void PROPPATCH( const std::vector< ProppatchValue > & rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws DAVException void HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws DAVException css::uno::Reference< css::io::XInputStream > - GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void GET( css::uno::Reference< css::io::XOutputStream > & rStream, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::RuntimeException /// @throws DAVException css::uno::Reference< css::io::XInputStream > GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw (css::uno::RuntimeException, DAVException); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); // used as HEAD substitute when HEAD is not implemented on server /// @throws DAVException @@ -151,23 +141,20 @@ public: GET0( DAVRequestHeaders & rRequestHeaders, const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void GET( css::uno::Reference< css::io::XOutputStream > & rStream, const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::RuntimeException /// @throws DAVException void PUT( const css::uno::Reference< css::io::XInputStream > & rStream, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw (css::uno::RuntimeException, DAVException); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws css::uno::RuntimeException /// @throws DAVException @@ -175,8 +162,7 @@ public: POST( const OUString & rContentType, const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & rInputStream, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw (css::uno::RuntimeException, DAVException); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::RuntimeException /// @throws DAVException @@ -185,41 +171,35 @@ public: const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & rInputStream, css::uno::Reference< css::io::XOutputStream > & rOutputStream, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw (css::uno::RuntimeException, DAVException); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws DAVException void - MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void COPY( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void MOVE( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void - DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); // set new lock. /// @throws DAVException void LOCK( css::ucb::Lock & inLock, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); #if 0 // currently not used, but please don't remove code // refresh existing lock. @@ -231,13 +211,11 @@ public: /// @throws DAVException void - UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void - abort() - throw ( DAVException ); + abort(); // helper static void @@ -248,17 +226,14 @@ public: DAVRequestHeaders & rRequestHeaders ); /// @throws DAVException - bool handleException( const DAVException & e, int errorCount ) - throw ( DAVException ); + bool handleException( const DAVException & e, int errorCount ); private: const OUString & getRequestURI() const; /// @throws DAVException - bool detectRedirectCycle( const OUString& rRedirectURL ) - throw ( DAVException ); + bool detectRedirectCycle( const OUString& rRedirectURL ); /// @throws DAVException - void initialize() - throw ( DAVException ); + void initialize(); }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx index 5516a26a215f..58839c80a47f 100644 --- a/ucb/source/ucp/webdav-neon/DAVSession.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx @@ -78,8 +78,7 @@ public: /// @throws std::exception virtual void OPTIONS( const OUString & inPath, DAVOptions& rOptions, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; // allprop & named /// @throws std::exception @@ -87,49 +86,42 @@ public: const Depth inDepth, const std::vector< OUString > & inPropertyNames, std::vector< DAVResource > & ioResources, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; // propnames /// @throws std::exception virtual void PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual void HEAD( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual void GET( const OUString & inPath, css::uno::Reference< css::io::XOutputStream >& o, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; // used as HEAD substitute when HEAD is not implemented on server /// @throws std::exception @@ -137,8 +129,7 @@ public: GET0( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual void @@ -146,14 +137,12 @@ public: css::uno::Reference< css::io::XOutputStream >& o, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual void PUT( const OUString & inPath, const css::uno::Reference< css::io::XInputStream >& s, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual css::uno::Reference< css::io::XInputStream > @@ -161,8 +150,7 @@ public: const OUString & rContentType, const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & inInputStream, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual void POST( const OUString & inPath, @@ -170,48 +158,40 @@ public: const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & inInputStream, css::uno::Reference< css::io::XOutputStream > & oOutputStream, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual void MKCOL( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual void COPY( const OUString & inSource, const OUString & inDestination, const DAVRequestEnvironment & rEnv, - bool inOverwrite ) - throw( std::exception ) = 0; + bool inOverwrite ) = 0; /// @throws std::exception virtual void MOVE( const OUString & inSource, const OUString & inDestination, const DAVRequestEnvironment & rEnv, - bool inOverwrite ) - throw( std::exception ) = 0; + bool inOverwrite ) = 0; /// @throws std::exception virtual void DESTROY( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; // set new lock. /// @throws std::exception virtual void LOCK( const OUString & inPath, css::ucb::Lock & inLock, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception virtual void UNLOCK( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws std::exception - virtual void abort() - throw( std::exception ) = 0; + virtual void abort() = 0; protected: rtl::Reference< DAVSessionFactory > m_xFactory; diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx index db1ee134df0f..d189a66cba7e 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx @@ -43,7 +43,6 @@ rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( const OUString & inUri, const uno::Sequence< beans::NamedValue >& rFlags, const uno::Reference< uno::XComponentContext > & rxContext ) - throw( DAVException ) { m_xContext = rxContext; diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx index 07dee1521472..7fa3b095974e 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx @@ -65,8 +65,7 @@ public: rtl::Reference< DAVSession > createDAVSession( const OUString & inUri, const ::uno::Sequence< css::beans::NamedValue >& rFlags, - const ::uno::Reference< ::uno::XComponentContext >& rxContext ) - throw( DAVException ); + const ::uno::Reference< ::uno::XComponentContext >& rxContext ); const ::uno::Reference< ::uno::XComponentContext >& getComponentContext() { return m_xContext; } private: diff --git a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx index c6c65a906656..d5e80029933d 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.cxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.cxx @@ -56,7 +56,6 @@ void NeonInputStream::AddToStream( const char * inBuf, sal_Int32 inLen ) } Any NeonInputStream::queryInterface( const Type &type ) - throw( RuntimeException, std::exception ) { Any aRet = ::cppu::queryInterface( type, static_cast< XInputStream * >( this ), @@ -67,10 +66,6 @@ Any NeonInputStream::queryInterface( const Type &type ) // "Reads" the specified number of bytes from the stream sal_Int32 SAL_CALL NeonInputStream::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) { // Work out how much we're actually going to write sal_Int32 theBytes2Read = nBytesToRead; @@ -93,10 +88,6 @@ sal_Int32 SAL_CALL NeonInputStream::readBytes( sal_Int32 SAL_CALL NeonInputStream::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) { // Warning: What should this be doing ? return readBytes( aData, nMaxBytesToRead ); @@ -104,10 +95,6 @@ sal_Int32 SAL_CALL NeonInputStream::readSomeBytes( // Moves the current stream position forward void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) { mPos += nBytesToSkip; if ( mPos >= mLen ) @@ -116,24 +103,15 @@ void SAL_CALL NeonInputStream::skipBytes( sal_Int32 nBytesToSkip ) // Returns the number of unread bytes currently remaining on the stream sal_Int32 SAL_CALL NeonInputStream::available( ) - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) { return sal::static_int_cast<sal_Int32>(mLen - mPos); } void SAL_CALL NeonInputStream::closeInput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) { } void SAL_CALL NeonInputStream::seek( sal_Int64 location ) - throw( css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) { if ( location < 0 ) throw css::lang::IllegalArgumentException(); @@ -145,15 +123,11 @@ void SAL_CALL NeonInputStream::seek( sal_Int64 location ) } sal_Int64 SAL_CALL NeonInputStream::getPosition() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) { return mPos; } sal_Int64 SAL_CALL NeonInputStream::getLength() - throw( css::io::IOException, - css::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 154f0fbe9195..42e134637ec9 100644 --- a/ucb/source/ucp/webdav-neon/NeonInputStream.hxx +++ b/ucb/source/ucp/webdav-neon/NeonInputStream.hxx @@ -58,8 +58,7 @@ class NeonInputStream : public css::io::XInputStream, void AddToStream( const char * inBuf, sal_Int32 inLen ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) override; virtual void SAL_CALL acquire() throw () override @@ -73,49 +72,24 @@ class NeonInputStream : public css::io::XInputStream, // XInputStream virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 > & aData, - sal_Int32 nBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nBytesToRead ) override; virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 > & aData, - sal_Int32 nMaxBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; - - virtual sal_Int32 SAL_CALL available() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; - - virtual void SAL_CALL closeInput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + sal_Int32 nMaxBytesToRead ) override; + + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + + virtual sal_Int32 SAL_CALL available() override; + + virtual void SAL_CALL closeInput() override; // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) - throw( css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception ) override; - - virtual sal_Int64 SAL_CALL getPosition() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; - - virtual sal_Int64 SAL_CALL getLength() - throw( css::io::IOException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL seek( sal_Int64 location ) override; + + virtual sal_Int64 SAL_CALL getPosition() override; + + virtual sal_Int64 SAL_CALL getLength() override; }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index d614a79d3930..89a0456cb4e8 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -581,7 +581,6 @@ NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFa const OUString& inUri, const uno::Sequence< beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) - throw ( std::exception ) : DAVSession( rSessionFactory ) , m_nProxyPort( 0 ) , m_aFlags( rFlags ) @@ -610,7 +609,6 @@ NeonSession::~NeonSession( ) } void NeonSession::Init( const DAVRequestEnvironment & rEnv ) - throw (css::uno::RuntimeException, std::exception) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); m_aEnv = rEnv; @@ -618,7 +616,6 @@ void NeonSession::Init( const DAVRequestEnvironment & rEnv ) } void NeonSession::Init() - throw (css::uno::RuntimeException, std::exception) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -843,7 +840,6 @@ bool NeonSession::UsesProxy() void NeonSession::OPTIONS( const OUString & inPath, DAVOptions & rOptions, // contains the name+values of every header const DAVRequestEnvironment & rEnv ) - throw( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -964,7 +960,6 @@ void NeonSession::PROPFIND( const OUString & inPath, const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -998,7 +993,6 @@ void NeonSession::PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) - throw( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "PROPFIND - relative URL: <" << inPath << "> Depth: " << inDepth ); @@ -1033,7 +1027,6 @@ void NeonSession::PROPFIND( const OUString & inPath, void NeonSession::PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) - throw( std::exception ) { SAL_INFO( "ucb.ucp.webdav", "PROPPATCH - relative URL <" << inPath << ">" ); @@ -1164,7 +1157,6 @@ void NeonSession::HEAD( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "HEAD - relative URL <" << inPath << ">" ); @@ -1184,7 +1176,6 @@ void NeonSession::HEAD( const OUString & inPath, uno::Reference< io::XInputStream > NeonSession::GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" ); @@ -1208,7 +1199,6 @@ NeonSession::GET( const OUString & inPath, void NeonSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" ); @@ -1231,7 +1221,6 @@ NeonSession::GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" ); @@ -1259,7 +1248,6 @@ void NeonSession::GET0( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" ); @@ -1285,7 +1273,6 @@ void NeonSession::GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "GET - relative URL <" << inPath << ">" ); @@ -1309,7 +1296,6 @@ void NeonSession::GET( const OUString & inPath, void NeonSession::PUT( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "PUT - relative URL <" << inPath << ">" ); @@ -1336,7 +1322,6 @@ NeonSession::POST( const OUString & inPath, const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "POST - relative URL <" << inPath << ">" ); @@ -1370,7 +1355,6 @@ void NeonSession::POST( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, uno::Reference< io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "POST - relative URL <" << inPath << ">" ); @@ -1397,7 +1381,6 @@ void NeonSession::POST( const OUString & inPath, void NeonSession::MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "MKCOL - relative URL <" << inPath << ">" ); @@ -1415,7 +1398,6 @@ void NeonSession::COPY( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, bool inOverWrite ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "COPY - inSourceURL: "<<inSourceURL<<" inDestinationURL: "<<inDestinationURL); @@ -1442,7 +1424,6 @@ void NeonSession::MOVE( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, bool inOverWrite ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "MOVE - inSourceURL: "<<inSourceURL<<" inDestinationURL: "<<inDestinationURL); @@ -1465,7 +1446,6 @@ void NeonSession::MOVE( const OUString & inSourceURL, void NeonSession::DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "DESTROY - relative URL <" << inPath << ">" ); @@ -1512,7 +1492,6 @@ namespace void NeonSession::LOCK( const OUString & inPath, ucb::Lock & rLock, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); SAL_INFO( "ucb.ucp.webdav", "LOCK (create) - relative URL: <" << inPath << ">" ); @@ -1651,7 +1630,6 @@ bool NeonSession::LOCK( NeonLock * pLock, void NeonSession::UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -1717,7 +1695,6 @@ bool NeonSession::UNLOCK( NeonLock * pLock ) } void NeonSession::abort() - throw ( std::exception ) { SAL_INFO( "ucb.ucp.webdav", "neon commands cannot be aborted" ); } @@ -1823,7 +1800,6 @@ bool NeonSession::removeExpiredLocktoken( const OUString & inURL, void NeonSession::HandleError( int nError, const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) { m_aEnv = DAVRequestEnvironment(); diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index 85e8172bed75..28b23678326c 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -75,8 +75,7 @@ public: NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, const OUString& inUri, const css::uno::Sequence< css::beans::NamedValue >& rFlags, - const ucbhelper::InternetProxyDecider & rProxyDecider ) - throw ( std::exception ); + const ucbhelper::InternetProxyDecider & rProxyDecider ); // DAVSession methods virtual bool CanUse( const OUString & inPath, @@ -90,8 +89,7 @@ public: virtual void OPTIONS( const OUString & inPath, DAVOptions& rOptions, // contains the name+values - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) SAL_OVERRIDE; + const DAVRequestEnvironment & rEnv ) SAL_OVERRIDE; // allprop & named virtual void @@ -99,76 +97,65 @@ public: const Depth inDepth, const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; // propnames virtual void PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo >& ioResInfo, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void HEAD( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void GET( const OUString & inPath, css::uno::Reference< css::io::XOutputStream > & ioOutputStream, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void GET0( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void GET( const OUString & inPath, css::uno::Reference< css::io::XOutputStream > & ioOutputStream, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void PUT( const OUString & inPath, const css::uno::Reference< css::io::XInputStream > & inInputStream, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual css::uno::Reference< css::io::XInputStream > POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & inInputStream, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void POST( const OUString & inPath, @@ -176,45 +163,37 @@ public: const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & inInputStream, css::uno::Reference< css::io::XOutputStream > & oOutputStream, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void MKCOL( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void COPY( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, - bool inOverWrite ) - throw ( std::exception ) override; + bool inOverWrite ) override; virtual void MOVE( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, - bool inOverWrite ) - throw ( std::exception ) override; + bool inOverWrite ) override; virtual void DESTROY( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; // set new lock. virtual void LOCK( const OUString & inURL, css::ucb::Lock & inLock, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void UNLOCK( const OUString & inURL, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ) override; + const DAVRequestEnvironment & rEnv ) override; // helpers - virtual void abort() - throw ( std::exception ) override; + virtual void abort() override; const OUString & getHostName() const { return m_aHostName; } @@ -229,19 +208,16 @@ private: friend class NeonLockStore; /// @throws css::uno::RuntimeException - void Init() - throw (css::uno::RuntimeException, std::exception); + void Init(); /// @throws css::uno::RuntimeException - void Init( const DAVRequestEnvironment & rEnv ) - throw (css::uno::RuntimeException, std::exception); + void Init( const DAVRequestEnvironment & rEnv ); // ret: true => retry request. /// @throws std::exception void HandleError( int nError, const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw ( std::exception ); + const DAVRequestEnvironment & rEnv ); const ucbhelper::InternetProxyServer & getProxySettings() const; diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index 40a569cb196b..cf20b9fff2aa 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -73,7 +73,6 @@ const ne_uri g_sUriDefaultsFTP = { const_cast<char *>("ftp"), } // namespace NeonUri::NeonUri( const ne_uri * inUri ) - throw ( DAVException ) { if ( inUri == nullptr ) throw DAVException( DAVException::DAV_INVALID_ARG ); @@ -90,7 +89,6 @@ NeonUri::NeonUri( const ne_uri * inUri ) } NeonUri::NeonUri( const OUString & inUri ) - throw ( DAVException ) { if ( inUri.isEmpty() ) throw DAVException( DAVException::DAV_INVALID_ARG ); diff --git a/ucb/source/ucp/webdav-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx index 66ad95bd9409..ef7b852b1f84 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.hxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx @@ -56,9 +56,9 @@ class NeonUri public: /// @throws DAVException - explicit NeonUri( const OUString & inUri ) throw ( DAVException ); + explicit NeonUri( const OUString & inUri ); /// @throws DAVException - explicit NeonUri( const ne_uri * inUri ) throw ( DAVException ); + explicit NeonUri( const ne_uri * inUri ); ~NeonUri( ); bool operator== ( const NeonUri & rOther ) const; diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 96a737130006..3b332fa36ce7 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -221,7 +221,6 @@ Content::Content( ContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory ) - throw (ucb::ContentCreationException, css::uno::RuntimeException) : ContentImplHelper( rxContext, pProvider, Identifier ), m_eResourceType( UNKNOWN ), m_eResourceTypeForLocks( UNKNOWN ), @@ -255,7 +254,6 @@ Content::Content( const uno::Reference< ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory, bool isCollection ) - throw (ucb::ContentCreationException, css::uno::RuntimeException) : ContentImplHelper( rxContext, pProvider, Identifier ), m_eResourceType( UNKNOWN ), m_eResourceTypeForLocks( UNKNOWN ), @@ -306,7 +304,6 @@ void SAL_CALL Content::release() // virtual uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { // Note: isFolder may require network activities! So call it only // if it is really necessary!!! @@ -353,7 +350,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content ); // virtual uno::Sequence< uno::Type > SAL_CALL Content::getTypes() - throw( uno::RuntimeException, std::exception ) { bool bFolder = false; try @@ -446,7 +442,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() - throw( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.ucb.WebDAVContent" ); } @@ -454,7 +449,6 @@ OUString SAL_CALL Content::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence<OUString> aSNS { WEBDAV_CONTENT_SERVICE_NAME }; return aSNS; @@ -466,7 +460,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() // virtual OUString SAL_CALL Content::getContentType() - throw( uno::RuntimeException, std::exception ) { bool bFolder = false; try @@ -497,9 +490,6 @@ uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception, - ucb::CommandAbortedException, - uno::RuntimeException, std::exception ) { SAL_INFO( "ucb.ucp.webdav", "Content::execute: start: command: " << aCommand.Name << ", env: " << @@ -843,7 +833,6 @@ uno::Any SAL_CALL Content::execute( // virtual void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException, std::exception ) { try { @@ -870,11 +859,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( beans::PropertyExistException, - beans::IllegalTypeException, - lang::IllegalArgumentException, - uno::RuntimeException, - std::exception ) { // if ( m_bTransient ) // @@@ ??? @@ -1012,10 +996,6 @@ void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg, void Content::removeProperty( const OUString& Name, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( beans::UnknownPropertyException, - beans::NotRemoveableException, - uno::RuntimeException, - std::exception ) { // Try to remove property from server. @@ -1105,10 +1085,6 @@ void Content::removeProperty( const OUString& Name, void SAL_CALL Content::addProperty( const OUString& Name, sal_Int16 Attributes, const uno::Any& DefaultValue ) - throw( beans::PropertyExistException, - beans::IllegalTypeException, - lang::IllegalArgumentException, - uno::RuntimeException, std::exception ) { beans::Property aProperty; aProperty.Name = Name; @@ -1122,9 +1098,6 @@ void SAL_CALL Content::addProperty( const OUString& Name, // virtual void SAL_CALL Content::removeProperty( const OUString& Name ) - throw( beans::UnknownPropertyException, - beans::NotRemoveableException, - uno::RuntimeException, std::exception ) { removeProperty( Name, uno::Reference< ucb::XCommandEnvironment >() ); @@ -1137,7 +1110,6 @@ void SAL_CALL Content::removeProperty( const OUString& Name ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -1172,7 +1144,6 @@ Content::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException, std::exception ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -1339,7 +1310,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw ( uno::Exception, std::exception ) { std::unique_ptr< ContentProperties > xProps; std::unique_ptr< ContentProperties > xCachedProps; @@ -1795,7 +1765,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( uno::Sequence< uno::Any > Content::setPropertyValues( const uno::Sequence< beans::PropertyValue >& rValues, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw ( uno::Exception, std::exception ) { uno::Reference< ucb::XContentIdentifier > xIdentifier; rtl::Reference< ContentProvider > xProvider; @@ -2199,7 +2168,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any Content::open( const ucb::OpenCommandArgument3 & rArg, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw (uno::Exception, std::exception) { uno::Any aRet; @@ -2395,7 +2363,6 @@ uno::Any Content::open( void Content::post( const ucb::PostCommandArgument2 & rArg, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception, std::exception ) { uno::Reference< io::XActiveDataSink > xSink( rArg.Sink, uno::UNO_QUERY ); if ( xSink.is() ) @@ -2533,7 +2500,6 @@ void Content::insert( const uno::Reference< io::XInputStream > & xInputStream, bool bReplaceExisting, const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception, std::exception ) { bool bTransient, bCollection; OUString aEscapedTitle; @@ -2796,7 +2762,6 @@ void Content::insert( void Content::transfer( const ucb::TransferInfo & rArgs, const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception, std::exception ) { uno::Reference< ucb::XContentIdentifier > xIdentifier; uno::Reference< ucb::XContentProvider > xProvider; @@ -3045,7 +3010,6 @@ void Content::transfer( void Content::destroy( bool bDeletePhysical ) - throw( uno::Exception, std::exception ) { // @@@ take care about bDeletePhysical -> trashcan support uno::Reference< ucb::XContent > xThis = this; @@ -3269,7 +3233,6 @@ Content::ResourceType Content::resourceTypeForLocks( void Content::lock( const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception, std::exception ) { // prepare aURL to be used in exception, see below OUString aURL; @@ -3417,7 +3380,6 @@ void Content::lock( void Content::unlock( const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception, std::exception ) { try @@ -3560,7 +3522,6 @@ bool Content::exchangeIdentity( bool Content::isFolder( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception, std::exception ) { { osl::MutexGuard aGuard( m_aMutex ); @@ -3765,7 +3726,6 @@ void Content::cancelCommandExecution( const DAVException & e, const uno::Reference< ucb::XCommandEnvironment > & xEnv, bool bWrite /* = sal_False */ ) - throw ( uno::Exception, std::exception ) { ucbhelper::cancelCommandExecution( MapDAVException( e, bWrite ), xEnv ); // Unreachable @@ -3806,7 +3766,6 @@ Content::ResourceType Content::getResourceType( const uno::Reference< ucb::XCommandEnvironment >& xEnv, const std::unique_ptr< DAVResourceAccess > & rResAccess, bool * networkAccessAllowed) - throw ( uno::Exception, std::exception ) { { osl::MutexGuard g(m_aMutex); @@ -3988,7 +3947,6 @@ Content::ResourceType Content::getResourceType( Content::ResourceType Content::getResourceType( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw ( uno::Exception, std::exception ) { std::unique_ptr< DAVResourceAccess > xResAccess; { @@ -4037,7 +3995,6 @@ void Content::getResourceOptions( DAVOptions& rDAVOptions, const std::unique_ptr< DAVResourceAccess > & rResAccess, bool * networkAccessAllowed ) - throw ( css::uno::Exception, std::exception ) { OUString aRedirURL; OUString aTargetURL = rResAccess->getURL(); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index 4510674a918c..571dec7b2fa6 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -123,20 +123,17 @@ private: virtual OUString getParentURL() override; /// @throws css::uno::Exception - bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( css::uno::Exception, std::exception ); + bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception css::uno::Reference< css::sdbc::XRow > getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception css::uno::Sequence< css::uno::Any > setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); typedef rtl::Reference< Content > ContentRef; typedef std::list< ContentRef > ContentRefList; @@ -150,56 +147,47 @@ private: /// @throws css::uno::Exception ResourceType - getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( css::uno::Exception, std::exception ); + getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception ResourceType getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const std::unique_ptr< DAVResourceAccess > & rResAccess, - bool * networkAccessAllowed = nullptr) - throw ( css::uno::Exception, std::exception ); + bool * networkAccessAllowed = nullptr); // Command "open" /// @throws css::uno::Exception css::uno::Any open( const css::ucb::OpenCommandArgument3 & rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw (css::uno::Exception, std::exception); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); // Command "post" /// @throws css::uno::Exception void post( const css::ucb::PostCommandArgument2 & rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); // Command "insert" /// @throws css::uno::Exception void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, bool bReplaceExisting, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); // Command "transfer" /// @throws css::uno::Exception void transfer( const css::ucb::TransferInfo & rArgs, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); // Command "delete" /// @throws css::uno::Exception - void destroy( bool bDeletePhysical ) - throw( css::uno::Exception, std::exception ); + void destroy( bool bDeletePhysical ); // Command "lock" /// @throws css::uno::Exception - void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, std::exception ); + void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); // Command "unlock" /// @throws css::uno::Exception - void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, std::exception ); + void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); css::uno::Any MapDAVException( const DAVException & e, bool bWrite ); @@ -207,8 +195,7 @@ private: void cancelCommandExecution( const DAVException & e, const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, - bool bWrite = false ) - throw( css::uno::Exception, std::exception ); + bool bWrite = false ); static bool shouldAccessNetworkAfterException( const DAVException & e ); @@ -224,22 +211,13 @@ private: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException void addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::beans::PropertyExistException, - css::beans::IllegalTypeException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); /// @throws css::beans::UnknownPropertyException /// @throws css::beans::NotRemoveableException /// @throws css::uno::RuntimeException void removeProperty( const OUString& Name, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::beans::UnknownPropertyException, - css::beans::NotRemoveableException, - css::uno::RuntimeException, - std::exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); public: /// @throws css::ucb::ContentCreationException @@ -247,73 +225,54 @@ public: Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - rtl::Reference< DAVSessionFactory > const & rSessionFactory ) - throw (css::ucb::ContentCreationException, css::uno::RuntimeException); + rtl::Reference< DAVSessionFactory > const & rSessionFactory ); /// @throws css::ucb::ContentCreationException /// @throws css::uno::RuntimeException Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - bool isCollection ) - throw (css::ucb::ContentCreationException, css::uno::RuntimeException); + bool isCollection ); virtual ~Content() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; // XContent virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException, std::exception ) override; + getContentType() override; // XCommandProcessor virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, - css::ucb::CommandAbortedException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; virtual void SAL_CALL - abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException, std::exception ) override; + abort( sal_Int32 CommandId ) override; // XPropertyContainer virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, - const css::uno::Any& DefaultValue ) - throw( css::beans::PropertyExistException, - css::beans::IllegalTypeException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + const css::uno::Any& DefaultValue ) override; virtual void SAL_CALL - removeProperty( const OUString& Name ) - throw( css::beans::UnknownPropertyException, - css::beans::NotRemoveableException, - css::uno::RuntimeException, std::exception ) override; + removeProperty( const OUString& Name ) override; // Additional interfaces @@ -321,11 +280,9 @@ public: // XContentCreator virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL - queryCreatableContentsInfo() - throw( css::uno::RuntimeException, std::exception ) override; + queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException, std::exception ) override; + createNewContent( const css::ucb::ContentInfo& Info ) override; // Non-interface methods. @@ -346,8 +303,7 @@ public: void getResourceOptions( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, DAVOptions& rDAVOptions, const std::unique_ptr< DAVResourceAccess > & rResAccess, - bool * networkAccessAllowed = nullptr) - throw ( css::uno::Exception, std::exception ); + bool * networkAccessAllowed = nullptr); static bool isResourceAvailable( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const std::unique_ptr< DAVResourceAccess > & rResAccess, diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index 7eef0b111b35..92a290699cd3 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -321,7 +321,6 @@ void DataSupplier::close() // virtual void DataSupplier::validate() - throw( ucb::ResultSetException ) { if ( m_pImpl->m_bThrowException ) throw ucb::ResultSetException(); diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx index 141a6ee14a12..d717f41a88c0 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx @@ -72,8 +72,7 @@ public: virtual void close() override; - virtual void validate() - throw( css::ucb::ResultSetException ) override; + virtual void validate() override; }; } diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index 4c68042591fb..f1f5530787d2 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -76,7 +76,6 @@ void SAL_CALL ContentProvider::release() } css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -102,7 +101,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) )); @@ -130,8 +128,6 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) - throw( ucb::IllegalIdentifierException, - 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 cadd3f71e91c..071260c6e4c5 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -80,26 +80,20 @@ public: virtual ~ContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -110,9 +104,7 @@ public: // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException, std::exception ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; // Non-interface methods. diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 9fd3a179a16f..f1eb8bab0e74 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -161,7 +161,6 @@ void DAVResourceAccess::PROPFIND( const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -204,7 +203,6 @@ void DAVResourceAccess::PROPFIND( const Depth nDepth, std::vector< DAVResourceInfo > & rResInfo, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -244,7 +242,6 @@ void DAVResourceAccess::PROPFIND( void DAVResourceAccess::PROPPATCH( const std::vector< ProppatchValue >& rValues, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( DAVException ) { initialize(); @@ -284,7 +281,6 @@ void DAVResourceAccess::HEAD( const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( DAVException ) { initialize(); @@ -323,7 +319,6 @@ void DAVResourceAccess::HEAD( uno::Reference< io::XInputStream > DAVResourceAccess::GET( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -365,7 +360,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( void DAVResourceAccess::GET( uno::Reference< io::XOutputStream > & rStream, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -405,7 +399,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -451,7 +444,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -496,7 +488,6 @@ void DAVResourceAccess::GET( const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -535,7 +526,6 @@ void DAVResourceAccess::GET( void DAVResourceAccess::abort() - throw( DAVException ) { // 17.11.09 (tkr): abort currently disabled caused by issue i106766 // initialize(); @@ -548,7 +538,6 @@ namespace { /// @throws DAVException void resetInputStream( const uno::Reference< io::XInputStream > & rStream ) - throw( DAVException ) { try { @@ -576,7 +565,6 @@ namespace { void DAVResourceAccess::PUT( const uno::Reference< io::XInputStream > & rStream, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -625,7 +613,6 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw ( DAVException ) { initialize(); @@ -689,7 +676,6 @@ void DAVResourceAccess::POST( const uno::Reference< io::XInputStream > & rInputStream, uno::Reference< io::XOutputStream > & rOutputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw ( DAVException ) { initialize(); @@ -747,7 +733,6 @@ void DAVResourceAccess::POST( void DAVResourceAccess::MKCOL( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -787,7 +772,6 @@ void DAVResourceAccess::COPY( const OUString & rDestinationURI, bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -829,7 +813,6 @@ void DAVResourceAccess::MOVE( const OUString & rDestinationURI, bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -868,7 +851,6 @@ void DAVResourceAccess::MOVE( void DAVResourceAccess::DESTROY( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) { initialize(); @@ -907,7 +889,6 @@ void DAVResourceAccess::DESTROY( void DAVResourceAccess::LOCK( ucb::Lock & inLock, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ) { initialize(); @@ -991,7 +972,6 @@ sal_Int64 DAVResourceAccess::LOCK( void DAVResourceAccess::UNLOCK( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ) { initialize(); @@ -1027,7 +1007,6 @@ void DAVResourceAccess::UNLOCK( void DAVResourceAccess::setURL( const OUString & rNewURL ) - throw( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); m_aURL = rNewURL; @@ -1037,7 +1016,6 @@ void DAVResourceAccess::setURL( const OUString & rNewURL ) // init dav session and path void DAVResourceAccess::initialize() - throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); if ( m_aPath.isEmpty() ) @@ -1120,7 +1098,6 @@ void DAVResourceAccess::getUserRequestHeaders( bool DAVResourceAccess::detectRedirectCycle( const OUString& rRedirectURL ) - throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -1157,7 +1134,6 @@ void DAVResourceAccess::resetUri() bool DAVResourceAccess::handleException( DAVException & e, int errorCount ) - throw ( DAVException ) { switch ( e.getError() ) { diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index 1327a0b40c68..44f7f393d0f7 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -62,8 +62,7 @@ public: DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); /// @throws DAVException - void setURL( const OUString & rNewURL ) - throw ( DAVException ); + void setURL( const OUString & rNewURL ); void resetUri(); @@ -81,77 +80,66 @@ public: PROPFIND( const Depth nDepth, const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); // propnames /// @throws DAVException void PROPFIND( const Depth nDepth, std::vector< DAVResourceInfo > & rResInfo, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void PROPPATCH( const std::vector< ProppatchValue > & rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws DAVException void HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws DAVException css::uno::Reference< css::io::XInputStream > - GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void GET( css::uno::Reference< css::io::XOutputStream > & rStream, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException css::uno::Reference< css::io::XInputStream > GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException css::uno::Reference< css::io::XInputStream > GET( DAVRequestHeaders & rRequestHeaders, const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void GET( css::uno::Reference< css::io::XOutputStream > & rStream, const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void PUT( const css::uno::Reference< css::io::XInputStream > & rStream, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException css::uno::Reference< css::io::XInputStream > POST( const OUString & rContentType, const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & rInputStream, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws DAVException void @@ -159,41 +147,35 @@ public: const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & rInputStream, css::uno::Reference< css::io::XOutputStream > & rOutputStream, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws DAVException void - MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void COPY( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void MOVE( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void - DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); // set new lock. /// @throws DAVException void LOCK( css::ucb::Lock & inLock, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); #if 0 // currently not used, but please don't remove code // refresh existing lock. @@ -205,13 +187,11 @@ public: /// @throws DAVException void - UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw ( DAVException ); + UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); /// @throws DAVException void - static abort() - throw ( DAVException ); + static abort(); // helper static void @@ -224,14 +204,11 @@ public: private: const OUString & getRequestURI() const; /// @throws DAVException - bool detectRedirectCycle( const OUString& rRedirectURL ) - throw ( DAVException ); + bool detectRedirectCycle( const OUString& rRedirectURL ); /// @throws DAVException - bool handleException( DAVException & e, int errorCount ) - throw ( DAVException ); + bool handleException( DAVException & e, int errorCount ); /// @throws DAVException - void initialize() - throw ( DAVException ); + void initialize(); }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index 4a28d40a8d27..1c6a8c0e01aa 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -79,49 +79,42 @@ public: const Depth inDepth, const std::vector< OUString > & inPropertyNames, std::vector< DAVResource > & ioResources, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; // propnames /// @throws DAVException virtual void PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual void HEAD( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual void GET( const OUString & inPath, css::uno::Reference< css::io::XOutputStream >& o, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual void @@ -129,14 +122,12 @@ public: css::uno::Reference< css::io::XOutputStream >& o, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual void PUT( const OUString & inPath, const css::uno::Reference< css::io::XInputStream >& s, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual css::uno::Reference< css::io::XInputStream > @@ -144,8 +135,7 @@ public: const OUString & rContentType, const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & inInputStream, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual void POST( const OUString & inPath, @@ -153,55 +143,46 @@ public: const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & inInputStream, css::uno::Reference< css::io::XOutputStream > & oOutputStream, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual void MKCOL( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual void COPY( const OUString & inSource, const OUString & inDestination, const DAVRequestEnvironment & rEnv, - bool inOverwrite = false ) - throw( DAVException ) = 0; + bool inOverwrite = false ) = 0; /// @throws DAVException virtual void MOVE( const OUString & inSource, const OUString & inDestination, const DAVRequestEnvironment & rEnv, - bool inOverwrite = false ) - throw( DAVException ) = 0; + bool inOverwrite = false ) = 0; /// @throws DAVException virtual void DESTROY( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; // set new lock. /// @throws DAVException virtual void LOCK( const OUString & inPath, css::ucb::Lock & inLock, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; // refresh existing lock. /// @throws DAVException virtual sal_Int64 LOCK( const OUString & inPath, sal_Int64 nTimeout, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException virtual void UNLOCK( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) = 0; + const DAVRequestEnvironment & rEnv ) = 0; /// @throws DAVException - virtual void abort() - throw( DAVException ) = 0; + virtual void abort() = 0; protected: rtl::Reference< DAVSessionFactory > m_xFactory; diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx index abb74ee7b7c8..c31d3cc0a9a7 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx @@ -32,7 +32,6 @@ DAVSessionFactory::~DAVSessionFactory() rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( const OUString & inUri, const uno::Reference< uno::XComponentContext > & rxContext ) - throw( DAVException ) { osl::MutexGuard aGuard( m_aMutex ); diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx index fb2b5338a1e0..29d504b59733 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -52,8 +52,7 @@ public: /// @throws DAVException rtl::Reference< DAVSession > createDAVSession( const OUString & inUri, - const css::uno::Reference< css::uno::XComponentContext >& rxContext ) - throw( DAVException ); + const css::uno::Reference< css::uno::XComponentContext >& rxContext ); private: typedef std::map< OUString, DAVSession * > Map; diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx index 2575cb08227e..3ca05e55a383 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.cxx +++ b/ucb/source/ucp/webdav/SerfInputStream.cxx @@ -59,7 +59,6 @@ void SerfInputStream::AddToStream( const char * inBuf, sal_Int32 inLen ) // queryInterface Any SerfInputStream::queryInterface( const Type &type ) - throw( RuntimeException ) { Any aRet = ::cppu::queryInterface( type, static_cast< XInputStream * >( this ), @@ -73,10 +72,6 @@ Any SerfInputStream::queryInterface( const Type &type ) sal_Int32 SAL_CALL SerfInputStream::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException ) { // Work out how much we're actually going to write sal_Int32 theBytes2Read = nBytesToRead; @@ -102,10 +97,6 @@ sal_Int32 SAL_CALL SerfInputStream::readBytes( sal_Int32 SAL_CALL SerfInputStream::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException ) { // Warning: What should this be doing ? return readBytes( aData, nMaxBytesToRead ); @@ -116,10 +107,6 @@ sal_Int32 SAL_CALL SerfInputStream::readSomeBytes( // Moves the current stream position forward void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException ) { mPos += nBytesToSkip; if ( mPos >= mLen ) @@ -131,9 +118,6 @@ void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip ) // Returns the number of unread bytes currently remaining on the stream sal_Int32 SAL_CALL SerfInputStream::available( ) - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException ) { return sal::static_int_cast<sal_Int32>(mLen - mPos); } @@ -142,9 +126,6 @@ sal_Int32 SAL_CALL SerfInputStream::available( ) // closeInput void SAL_CALL SerfInputStream::closeInput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException ) { } @@ -152,9 +133,6 @@ void SAL_CALL SerfInputStream::closeInput() // seek void SAL_CALL SerfInputStream::seek( sal_Int64 location ) - throw( css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException ) { if ( location < 0 ) throw css::lang::IllegalArgumentException(); @@ -169,8 +147,6 @@ void SAL_CALL SerfInputStream::seek( sal_Int64 location ) // getPosition sal_Int64 SAL_CALL SerfInputStream::getPosition() - throw( css::io::IOException, - css::uno::RuntimeException ) { return mPos; } @@ -179,8 +155,6 @@ sal_Int64 SAL_CALL SerfInputStream::getPosition() // getLength sal_Int64 SAL_CALL SerfInputStream::getLength() - throw( css::io::IOException, - css::uno::RuntimeException ) { return mLen; } diff --git a/ucb/source/ucp/webdav/SerfInputStream.hxx b/ucb/source/ucp/webdav/SerfInputStream.hxx index fd893c813a7b..7d849e6c9bdb 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.hxx +++ b/ucb/source/ucp/webdav/SerfInputStream.hxx @@ -53,8 +53,7 @@ class SerfInputStream : public css::io::XInputStream, void AddToStream( const char * inBuf, sal_Int32 inLen ); // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) - throw( css::uno::RuntimeException ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) override; virtual void SAL_CALL acquire() throw () override @@ -68,49 +67,24 @@ class SerfInputStream : public css::io::XInputStream, // XInputStream virtual sal_Int32 SAL_CALL readBytes( css::uno::Sequence< sal_Int8 > & aData, - sal_Int32 nBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException ) override; + sal_Int32 nBytesToRead ) override; virtual sal_Int32 SAL_CALL readSomeBytes( css::uno::Sequence< sal_Int8 > & aData, - sal_Int32 nMaxBytesToRead ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException ) override; - - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException ) override; - - virtual sal_Int32 SAL_CALL available() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException ) override; - - virtual void SAL_CALL closeInput() - throw( css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException ) override; + sal_Int32 nMaxBytesToRead ) override; + + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + + virtual sal_Int32 SAL_CALL available() override; + + virtual void SAL_CALL closeInput() override; // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) - throw( css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException ) override; - - virtual sal_Int64 SAL_CALL getPosition() - throw( css::io::IOException, - css::uno::RuntimeException ) override; - - virtual sal_Int64 SAL_CALL getLength() - throw( css::io::IOException, - css::uno::RuntimeException ) override; + virtual void SAL_CALL seek( sal_Int64 location ) override; + + virtual sal_Int64 SAL_CALL getPosition() override; + + virtual sal_Int64 SAL_CALL getLength() override; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 40c8ffe9fb26..90becfc60cb6 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -58,7 +58,6 @@ SerfSession::SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, const OUString& inUri, const ucbhelper::InternetProxyDecider & rProxyDecider ) - throw ( DAVException ) : DAVSession( rSessionFactory ) , m_aMutex() , m_aUri( inUri ) @@ -91,7 +90,6 @@ SerfSession::~SerfSession( ) void SerfSession::Init( const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); m_aEnv = rEnv; @@ -100,7 +98,6 @@ void SerfSession::Init( const DAVRequestEnvironment & rEnv ) void SerfSession::Init() - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -597,7 +594,6 @@ void SerfSession::PROPFIND( const OUString & inPath, const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -627,7 +623,6 @@ void SerfSession::PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) - throw( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -655,7 +650,6 @@ void SerfSession::PROPFIND( const OUString & inPath, void SerfSession::PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) - throw( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -676,7 +670,6 @@ void SerfSession::HEAD( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -703,7 +696,6 @@ void SerfSession::HEAD( const OUString & inPath, uno::Reference< io::XInputStream > SerfSession::GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -726,7 +718,6 @@ SerfSession::GET( const OUString & inPath, void SerfSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -748,7 +739,6 @@ SerfSession::GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -777,7 +767,6 @@ void SerfSession::GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -801,7 +790,6 @@ void SerfSession::GET( const OUString & inPath, void SerfSession::PUT( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -828,7 +816,6 @@ SerfSession::POST( const OUString & inPath, const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -863,7 +850,6 @@ void SerfSession::POST( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, uno::Reference< io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -892,7 +878,6 @@ void SerfSession::POST( const OUString & inPath, void SerfSession::MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -912,7 +897,6 @@ void SerfSession::COPY( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, bool inOverWrite ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -933,7 +917,6 @@ void SerfSession::MOVE( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, bool inOverWrite ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -952,7 +935,6 @@ void SerfSession::MOVE( const OUString & inSourceURL, void SerfSession::DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -1002,7 +984,6 @@ namespace void SerfSession::LOCK( const OUString & inPath, ucb::Lock & rLock, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -1020,7 +1001,6 @@ void SerfSession::LOCK( const OUString & inPath, sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/, sal_Int64 nTimeout, const DAVRequestEnvironment & /*rEnv*/ ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -1084,7 +1064,6 @@ bool SerfSession::LOCK( const OUString& rLock, void SerfSession::UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) { osl::Guard< osl::Mutex > theGuard( m_aMutex ); @@ -1128,7 +1107,6 @@ void SerfSession::UNLOCK( const OUString& rLock ) void SerfSession::abort() - throw ( DAVException ) { // 11.11.09 (tkr): The following code lines causing crashes if // closing a ongoing connection. It turned out that this existing @@ -1249,7 +1227,6 @@ bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/, // Common Error Handler void SerfSession::HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc ) - throw ( DAVException ) { m_aEnv = DAVRequestEnvironment(); diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index 9bcc112a4d59..3e162258117c 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -74,8 +74,7 @@ public: /// @throws DAVException SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, const OUString& inUri, - const ucbhelper::InternetProxyDecider & rProxyDecider ) - throw ( DAVException ); + const ucbhelper::InternetProxyDecider & rProxyDecider ); // Serf library callbacks apr_status_t setupSerfConnection( apr_socket_t * inAprSocket, @@ -121,71 +120,61 @@ public: const Depth inDepth, const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; // propnames virtual void PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo >& ioResInfo, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void HEAD( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; bool isHeadRequestInProgress(); virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void GET( const OUString & inPath, css::uno::Reference< css::io::XOutputStream > & ioOutputStream, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void GET( const OUString & inPath, css::uno::Reference< css::io::XOutputStream > & ioOutputStream, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void PUT( const OUString & inPath, const css::uno::Reference< css::io::XInputStream > & inInputStream, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual css::uno::Reference< css::io::XInputStream > POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & inInputStream, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void POST( const OUString & inPath, @@ -193,51 +182,42 @@ public: const OUString & rReferer, const css::uno::Reference< css::io::XInputStream > & inInputStream, css::uno::Reference< css::io::XOutputStream > & oOutputStream, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void MKCOL( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void COPY( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, - bool inOverWrite = false ) - throw ( DAVException ) override; + bool inOverWrite = false ) override; virtual void MOVE( const OUString & inSourceURL, const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, - bool inOverWrite = false ) - throw ( DAVException ) override; + bool inOverWrite = false ) override; virtual void DESTROY( const OUString & inPath, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; // set new lock. virtual void LOCK( const OUString & inURL, css::ucb::Lock & inLock, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; // refresh existing lock. virtual sal_Int64 LOCK( const OUString & inURL, sal_Int64 nTimeout, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; virtual void UNLOCK( const OUString & inURL, - const DAVRequestEnvironment & rEnv ) - throw ( DAVException ) override; + const DAVRequestEnvironment & rEnv ) override; // helpers - virtual void abort() - throw ( DAVException ) override; + virtual void abort() override; const OUString & getHostName() const { return m_aUri.GetHost(); } int getPort() const { return m_aUri.GetPort(); } @@ -248,16 +228,13 @@ private: friend class SerfLockStore; /// @throws DAVException - void Init() - throw ( DAVException ); + void Init(); /// @throws DAVException - void Init( const DAVRequestEnvironment & rEnv ) - throw ( DAVException ); + void Init( const DAVRequestEnvironment & rEnv ); /// @throws DAVException - void HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc ) - throw ( DAVException ); + void HandleError( std::shared_ptr<SerfRequestProcessor> rReqProc ); const ucbhelper::InternetProxyServer & getProxySettings() const; diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx index 565ece80d364..7aec24f61bc0 100644 --- a/ucb/source/ucp/webdav/SerfUri.cxx +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -31,7 +31,6 @@ using namespace http_dav_ucp; SerfUri::SerfUri( const apr_uri_t * inUri ) - throw ( DAVException ) : mAprUri( *inUri ) , mURI() , mScheme() @@ -54,7 +53,6 @@ SerfUri::SerfUri( const apr_uri_t * inUri ) } SerfUri::SerfUri( const OUString & inUri ) - throw ( DAVException ) : mAprUri() , mURI() , mScheme() diff --git a/ucb/source/ucp/webdav/SerfUri.hxx b/ucb/source/ucp/webdav/SerfUri.hxx index 31361582c253..f943cd489e0e 100644 --- a/ucb/source/ucp/webdav/SerfUri.hxx +++ b/ucb/source/ucp/webdav/SerfUri.hxx @@ -51,9 +51,9 @@ class SerfUri public: /// @throws DAVException - explicit SerfUri( const OUString & inUri ) throw ( DAVException ); + explicit SerfUri( const OUString & inUri ); /// @throws DAVException - explicit SerfUri( const apr_uri_t * inUri ) throw ( DAVException ); + explicit SerfUri( const apr_uri_t * inUri ); ~SerfUri( ); bool operator== ( const SerfUri & rOther ) const; diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 101aa1793f7f..5b193ea25bb4 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -197,7 +197,6 @@ Content::Content( ContentProvider* pProvider, const uno::Reference< ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory ) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_eResourceType( UNKNOWN ), m_pProvider( pProvider ), @@ -230,7 +229,6 @@ Content::Content( const uno::Reference< ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory, bool isCollection ) - throw ( ucb::ContentCreationException ) : ContentImplHelper( rxContext, pProvider, Identifier ), m_eResourceType( UNKNOWN ), m_pProvider( pProvider ), @@ -282,7 +280,6 @@ void SAL_CALL Content::release() // virtual uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) - throw ( uno::RuntimeException, std::exception ) { // Note: isFolder may require network activities! So call it only // if it is really necessary!!! @@ -335,7 +332,6 @@ XTYPEPROVIDER_COMMON_IMPL( Content ); // virtual uno::Sequence< uno::Type > SAL_CALL Content::getTypes() - throw( uno::RuntimeException, std::exception ) { bool bFolder = false; try @@ -428,7 +424,6 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() // virtual OUString SAL_CALL Content::getImplementationName() - throw( uno::RuntimeException ) { return OUString( "com.sun.star.comp.ucb.WebDAVContent" ); } @@ -436,7 +431,6 @@ OUString SAL_CALL Content::getImplementationName() // virtual uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() - throw( uno::RuntimeException ) { uno::Sequence<OUString> aSNS { WEBDAV_CONTENT_SERVICE_NAME }; return aSNS; @@ -448,7 +442,6 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() // virtual OUString SAL_CALL Content::getContentType() - throw( uno::RuntimeException ) { bool bFolder = false; try @@ -479,9 +472,6 @@ uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, sal_Int32 /*CommandId*/, const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception, - ucb::CommandAbortedException, - uno::RuntimeException ) { SAL_INFO("ucb.ucp.webdav", ">>>>> Content::execute: start: command: " << aCommand.Name << ", env: " << (Environment.is() ? "present" : "missing") ); @@ -804,7 +794,6 @@ uno::Any SAL_CALL Content::execute( // virtual void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) - throw( uno::RuntimeException ) { try { @@ -831,10 +820,6 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) -throw( beans::PropertyExistException, - beans::IllegalTypeException, - lang::IllegalArgumentException, - uno::RuntimeException ) { // if ( m_bTransient ) // @@@ ??? @@ -966,9 +951,6 @@ throw( beans::PropertyExistException, void Content::removeProperty( const rtl::OUString& Name, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) -throw( beans::UnknownPropertyException, - beans::NotRemoveableException, - uno::RuntimeException ) { #if 0 // @@@ REMOVABLE at the moment not properly set in the PropSetInfo @@ -1074,10 +1056,6 @@ throw( beans::UnknownPropertyException, void SAL_CALL Content::addProperty( const rtl::OUString& Name, sal_Int16 Attributes, const uno::Any& DefaultValue ) - throw( beans::PropertyExistException, - beans::IllegalTypeException, - lang::IllegalArgumentException, - uno::RuntimeException ) { beans::Property aProperty; aProperty.Name = Name; @@ -1091,9 +1069,6 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name, // virtual void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) - throw( beans::UnknownPropertyException, - beans::NotRemoveableException, - uno::RuntimeException ) { removeProperty( Name, uno::Reference< ucb::XCommandEnvironment >() ); @@ -1106,7 +1081,6 @@ void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() - throw( uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -1140,7 +1114,6 @@ Content::queryCreatableContentsInfo() // virtual uno::Reference< ucb::XContent > SAL_CALL Content::createNewContent( const ucb::ContentInfo& Info ) - throw( uno::RuntimeException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -1311,7 +1284,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw ( uno::Exception ) { std::unique_ptr< ContentProperties > xProps; std::unique_ptr< ContentProperties > xCachedProps; @@ -1651,7 +1623,6 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( uno::Sequence< uno::Any > Content::setPropertyValues( const uno::Sequence< beans::PropertyValue >& rValues, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw ( uno::Exception ) { uno::Reference< ucb::XContentIdentifier > xIdentifier; rtl::Reference< ContentProvider > xProvider; @@ -2061,7 +2032,6 @@ uno::Sequence< uno::Any > Content::setPropertyValues( uno::Any Content::open( const ucb::OpenCommandArgument2 & rArg, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { uno::Any aRet; @@ -2226,7 +2196,6 @@ uno::Any Content::open( void Content::post( const ucb::PostCommandArgument2 & rArg, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( uno::Exception ) { uno::Reference< io::XActiveDataSink > xSink( rArg.Sink, uno::UNO_QUERY ); if ( xSink.is() ) @@ -2362,7 +2331,6 @@ void Content::insert( const uno::Reference< io::XInputStream > & xInputStream, bool bReplaceExisting, const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception ) { bool bTransient, bCollection; OUString aEscapedTitle; @@ -2605,7 +2573,6 @@ void Content::insert( void Content::transfer( const ucb::TransferInfo & rArgs, const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception ) { uno::Reference< uno::XComponentContext > xContext; uno::Reference< ucb::XContentIdentifier > xIdentifier; @@ -2844,7 +2811,6 @@ void Content::transfer( void Content::destroy( bool bDeletePhysical ) - throw( uno::Exception ) { // @@@ take care about bDeletePhysical -> trashcan support @@ -2898,7 +2864,6 @@ bool Content::supportsExclusiveWriteLock( void Content::lock( const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception ) { try { @@ -2938,7 +2903,6 @@ void Content::lock( void Content::unlock( const uno::Reference< ucb::XCommandEnvironment >& Environment ) - throw( uno::Exception ) { try { @@ -3034,7 +2998,6 @@ bool Content::exchangeIdentity( bool Content::isFolder( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw( uno::Exception ) { { osl::MutexGuard aGuard( m_aMutex ); @@ -3258,7 +3221,6 @@ void Content::cancelCommandExecution( const DAVException & e, const uno::Reference< ucb::XCommandEnvironment > & xEnv, bool bWrite /* = false */ ) - throw ( uno::Exception ) { ucbhelper::cancelCommandExecution( MapDAVException( e, bWrite ), xEnv ); // Unreachable @@ -3299,7 +3261,6 @@ Content::ResourceType Content::getResourceType( const uno::Reference< ucb::XCommandEnvironment >& xEnv, const std::unique_ptr< DAVResourceAccess > & rResAccess, bool * networkAccessAllowed ) - throw ( uno::Exception ) { { osl::MutexGuard g(m_aMutex); @@ -3380,7 +3341,6 @@ Content::ResourceType Content::getResourceType( Content::ResourceType Content::getResourceType( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) - throw ( uno::Exception ) { std::unique_ptr< DAVResourceAccess > xResAccess; { diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index 57341fcab0ea..8eefba6f2f32 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -91,20 +91,17 @@ private: virtual OUString getParentURL() override; /// @throws css::uno::Exception - bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( css::uno::Exception ); + bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception css::uno::Reference< css::sdbc::XRow > getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception css::uno::Sequence< css::uno::Any > setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, - const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); typedef rtl::Reference< Content > ContentRef; typedef std::list< ContentRef > ContentRefList; @@ -118,57 +115,48 @@ private: /// @throws css::uno::Exception ResourceType - getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) - throw ( css::uno::Exception ); + getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); /// @throws css::uno::Exception ResourceType getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const std::unique_ptr< DAVResourceAccess > & rResAccess, - bool * networkAccessAllowed = nullptr ) - throw ( css::uno::Exception ); + bool * networkAccessAllowed = nullptr ); // Command "open" /// @throws css::uno::Exception css::uno::Any open( const css::ucb::OpenCommandArgument2 & rArg, const css::uno::Reference< - css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + css::ucb::XCommandEnvironment > & xEnv ); // Command "post" /// @throws css::uno::Exception void post( const css::ucb::PostCommandArgument2 & rArg, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ); // Command "insert" /// @throws css::uno::Exception void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, bool bReplaceExisting, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); // Command "transfer" /// @throws css::uno::Exception void transfer( const css::ucb::TransferInfo & rArgs, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); // Command "delete" /// @throws css::uno::Exception - void destroy( bool bDeletePhysical ) - throw( css::uno::Exception ); + void destroy( bool bDeletePhysical ); // Command "lock" /// @throws css::uno::Exception - void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception ); + void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); // Command "unlock" /// @throws css::uno::Exception - void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception ); + void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); css::uno::Any MapDAVException( const DAVException & e, bool bWrite ); @@ -176,8 +164,7 @@ private: void cancelCommandExecution( const DAVException & e, const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, - bool bWrite = false ) - throw( css::uno::Exception ); + bool bWrite = false ); static bool shouldAccessNetworkAfterException( const DAVException & e ); @@ -190,91 +177,65 @@ private: /// @throws css::lang::IllegalArgumentException /// @throws css::uno::RuntimeException void addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::beans::PropertyExistException, - css::beans::IllegalTypeException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); /// @throws css::beans::PropertyExistException /// @throws css::beans::NotRemoveableException /// @throws css::uno::RuntimeException void removeProperty( const rtl::OUString& Name, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::beans::UnknownPropertyException, - css::beans::NotRemoveableException, - css::uno::RuntimeException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); public: /// @throws css::ucb::ContentCreationException Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, - rtl::Reference< DAVSessionFactory > const & rSessionFactory ) - throw ( css::ucb::ContentCreationException ); + rtl::Reference< DAVSessionFactory > const & rSessionFactory ); /// @throws css::ucb::ContentCreationException Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - bool isCollection ) - throw ( css::ucb::ContentCreationException ); + bool isCollection ); virtual ~Content() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException ) override; + getImplementationName() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException ) override; + getSupportedServiceNames() override; // XContent virtual OUString SAL_CALL - getContentType() - throw( css::uno::RuntimeException ) override; + getContentType() override; // XCommandProcessor virtual css::uno::Any SAL_CALL execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) - throw( css::uno::Exception, - css::ucb::CommandAbortedException, - css::uno::RuntimeException ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) override; virtual void SAL_CALL - abort( sal_Int32 CommandId ) - throw( css::uno::RuntimeException ) override; + abort( sal_Int32 CommandId ) override; // XPropertyContainer virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, - const css::uno::Any& DefaultValue ) - throw( css::beans::PropertyExistException, - css::beans::IllegalTypeException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException ) override; + const css::uno::Any& DefaultValue ) override; virtual void SAL_CALL - removeProperty( const OUString& Name ) - throw( css::beans::UnknownPropertyException, - css::beans::NotRemoveableException, - css::uno::RuntimeException ) override; + removeProperty( const OUString& Name ) override; // Additional interfaces @@ -282,11 +243,9 @@ public: // XContentCreator virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL - queryCreatableContentsInfo() - throw( css::uno::RuntimeException ) override; + queryCreatableContentsInfo() override; virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - createNewContent( const css::ucb::ContentInfo& Info ) - throw( css::uno::RuntimeException ) override; + createNewContent( const css::ucb::ContentInfo& Info ) override; // Non-interface methods. diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index 9765d8486d6b..4ff990a9995d 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -320,7 +320,6 @@ void DataSupplier::close() // virtual void DataSupplier::validate() - throw( ucb::ResultSetException ) { if ( m_pImpl->m_bThrowException ) throw ucb::ResultSetException(); diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx index 7c168c0e661d..9224f9259a72 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -67,8 +67,7 @@ public: virtual void close() override; - virtual void validate() - throw( css::ucb::ResultSetException ) override; + virtual void validate() override; }; } diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 4a76fa8f7f73..4fc3d300bd75 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -61,7 +61,6 @@ void SAL_CALL ContentProvider::release() } css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) { css::uno::Any aRet = cppu::queryInterface( rType, (static_cast< lang::XTypeProvider* >(this)), @@ -87,7 +86,6 @@ XSERVICEINFO_COMMOM_IMPL( ContentProvider, /// @throws css::uno::Exception static css::uno::Reference< css::uno::XInterface > SAL_CALL ContentProvider_CreateInstance( const css::uno::Reference< css::lang::XMultiServiceFactory> & rSMgr ) - throw( css::uno::Exception ) { css::lang::XServiceInfo* pX = static_cast<css::lang::XServiceInfo*>(new ContentProvider( ucbhelper::getComponentContext(rSMgr) )); @@ -115,8 +113,6 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) - throw( ucb::IllegalIdentifierException, - uno::RuntimeException ) { // Check URL scheme... diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index 2672b262383a..383ffc119f7f 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -73,26 +73,20 @@ public: virtual ~ContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static OUString getImplementationName_Static(); static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); @@ -103,9 +97,7 @@ public: // XContentProvider virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) - throw( css::ucb::IllegalIdentifierException, - css::uno::RuntimeException ) override; + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; // Non-interface methods. diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index d7f30dd78479..f90aaed2593b 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -355,14 +355,14 @@ namespace virtual ~WebDAVResponseParser() override; // Methods XDocumentHandler - virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) override; - virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) override; - virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) override; - virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) override; - virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException) override; - virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException) override; + virtual void SAL_CALL startDocument( ) override; + virtual void SAL_CALL endDocument( ) override; + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override; + virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) override; const std::vector< ucb::Lock >& getResult_Lock() const { return maResult_Lock; } const std::vector< http_dav_ucp::DAVResource >& getResult_PropFind() const { return maResult_PropFind; } @@ -398,17 +398,17 @@ namespace } } - void SAL_CALL WebDAVResponseParser::startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::startDocument( ) { SAL_WARN_IF(mpContext, "ucb.ucp.webdav", "Parser start with existing content (!)"); } - void SAL_CALL WebDAVResponseParser::endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::endDocument( ) { SAL_WARN_IF(mpContext, "ucb.ucp.webdav", "Parser end with existing content (!)"); } - void SAL_CALL WebDAVResponseParser::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) { const sal_Int32 nLen(aName.getLength()); @@ -507,7 +507,7 @@ namespace } } - void SAL_CALL WebDAVResponseParser::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::endElement( const OUString& aName ) { const sal_Int32 nLen(aName.getLength()); SAL_WARN_IF(!mpContext, "ucb.ucp.webdav", "Parser EndElement without content (!)"); @@ -790,7 +790,7 @@ namespace } } - void SAL_CALL WebDAVResponseParser::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::characters( const OUString& aChars ) { // collect whitespace over evtl. several calls in mpContext SAL_WARN_IF(!mpContext, "ucb.ucp.webdav", "Parser characters without content (!)"); @@ -817,15 +817,15 @@ namespace } } - void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) { } - void SAL_CALL WebDAVResponseParser::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) { } - void SAL_CALL WebDAVResponseParser::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::setDocumentLocator( const uno::Reference< xml::sax::XLocator >& /*xLocator*/ ) { } } // end of anonymous namespace |