diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /svx/source/unodraw/XPropertyTable.cxx | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'svx/source/unodraw/XPropertyTable.cxx')
-rw-r--r-- | svx/source/unodraw/XPropertyTable.cxx | 104 |
1 files changed, 52 insertions, 52 deletions
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index c6d1ad904331..82abcb3a73a2 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -58,22 +58,22 @@ public: virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw() = 0; // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException); - virtual void SAL_CALL removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException); - virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( uno::RuntimeException); + virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception); + virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( uno::RuntimeException, std::exception); // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( uno::RuntimeException); + virtual sal_Bool SAL_CALL hasElements( ) throw( uno::RuntimeException, std::exception); }; SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw() @@ -95,14 +95,14 @@ XPropertyEntry* SvxUnoXPropertyTable::get( long index ) const // XServiceInfo sal_Bool SAL_CALL SvxUnoXPropertyTable::supportsService( const OUString& ServiceName ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } // XNameContainer void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) + throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -123,7 +123,7 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const } void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -148,7 +148,7 @@ void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -177,7 +177,7 @@ void SAL_CALL SvxUnoXPropertyTable::replaceByName( const OUString& aName, const // XNameAccess uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) + throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -198,7 +198,7 @@ uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName ) } uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames() - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -219,7 +219,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames() } sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -240,7 +240,7 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName ) // XElementAccess sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( ) - throw( uno::RuntimeException) + throw( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -259,11 +259,11 @@ public: virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(); // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException ); + virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException ); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception); }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw() @@ -291,18 +291,18 @@ XPropertyEntry* SvxUnoXColorTable::getEntry( const OUString& rName, const uno::A // XElementAccess uno::Type SAL_CALL SvxUnoXColorTable::getElementType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ::getCppuType((const sal_Int32*)0); } // XServiceInfo -OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) throw( uno::RuntimeException ) +OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) { return OUString( "SvxUnoXColorTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) throw( uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.drawing.ColorTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -321,11 +321,11 @@ public: virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(); // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException ); + virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException ); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception); }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw() @@ -364,18 +364,18 @@ XPropertyEntry* SvxUnoXLineEndTable::getEntry( const OUString& rName, const uno: // XElementAccess uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ::getCppuType((const drawing::PolyPolygonBezierCoords*)0); } // XServiceInfo -OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) throw( uno::RuntimeException ) +OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) { return OUString( "SvxUnoXLineEndTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) throw( uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.drawing.LineEndTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -394,11 +394,11 @@ public: virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(); // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException ); + virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException ); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception); }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw() @@ -445,18 +445,18 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An // XElementAccess uno::Type SAL_CALL SvxUnoXDashTable::getElementType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ::getCppuType((const drawing::LineDash*)0); } // XServiceInfo -OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) throw( uno::RuntimeException ) +OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) { return OUString( "SvxUnoXDashTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.drawing.DashTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -475,11 +475,11 @@ public: virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(); // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException ); + virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException ); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception); }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw() @@ -521,18 +521,18 @@ XPropertyEntry* SvxUnoXHatchTable::getEntry( const OUString& rName, const uno::A // XElementAccess uno::Type SAL_CALL SvxUnoXHatchTable::getElementType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ::getCppuType((const drawing::Hatch*)0); } // XServiceInfo -OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) throw( uno::RuntimeException ) +OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) { return OUString( "SvxUnoXHatchTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.drawing.HatchTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -551,11 +551,11 @@ public: virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(); // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException ); + virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException ); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception); }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw() @@ -609,18 +609,18 @@ XPropertyEntry* SvxUnoXGradientTable::getEntry( const OUString& rName, const uno // XElementAccess uno::Type SAL_CALL SvxUnoXGradientTable::getElementType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ::getCppuType((const awt::Gradient*)0); } // XServiceInfo -OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) throw( uno::RuntimeException ) +OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) { return OUString( "SvxUnoXGradientTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.drawing.GradientTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); @@ -639,11 +639,11 @@ public: virtual XPropertyEntry* getEntry( const OUString& rName, const uno::Any& rAny ) const throw(); // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException ); + virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException ); - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw( uno::RuntimeException, std::exception ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception); }; uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw() @@ -676,18 +676,18 @@ XPropertyEntry* SvxUnoXBitmapTable::getEntry( const OUString& rName, const uno:: // XElementAccess uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType() - throw( uno::RuntimeException ) + throw( uno::RuntimeException, std::exception ) { return ::getCppuType((const OUString*)0); } // XServiceInfo -OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) throw( uno::RuntimeException ) +OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) throw( uno::RuntimeException, std::exception ) { return OUString( "SvxUnoXBitmapTable" ); } -uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.drawing.BitmapTable" ); uno::Sequence< OUString > aServices( &aServiceName, 1 ); |