summaryrefslogtreecommitdiff
path: root/svx/source/unodraw/XPropertyTable.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /svx/source/unodraw/XPropertyTable.cxx
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svx/source/unodraw/XPropertyTable.cxx')
-rw-r--r--svx/source/unodraw/XPropertyTable.cxx106
1 files changed, 46 insertions, 60 deletions
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 60758c01d382..7dbd98693f8a 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -54,28 +54,28 @@ public:
SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw();
/// @throws uno::RuntimeException
- virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) = 0;
+ virtual uno::Any getAny( const XPropertyEntry* pEntry ) const = 0;
/// @throws uno::RuntimeException
/// @throws lang::IllegalArgumentException
- virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException, lang::IllegalArgumentException) = 0;
+ virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const = 0;
// XServiceInfo
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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;
- virtual void SAL_CALL removeByName( const OUString& Name ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override;
+ virtual void SAL_CALL removeByName( const OUString& Name ) override;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override;
// XNameAccess
- virtual uno::Any SAL_CALL getByName( const OUString& aName ) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override;
- virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( uno::RuntimeException, std::exception) override;
+ virtual uno::Any SAL_CALL getByName( const OUString& aName ) override;
+ virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XElementAccess
- virtual sal_Bool SAL_CALL hasElements( ) throw( uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) override;
};
SvxUnoXPropertyTable::SvxUnoXPropertyTable( sal_Int16 nWhich, XPropertyList* pList ) throw()
@@ -93,14 +93,12 @@ const XPropertyEntry* SvxUnoXPropertyTable::get(long index) const
// XServiceInfo
sal_Bool SAL_CALL SvxUnoXPropertyTable::supportsService( const OUString& ServiceName )
- 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, std::exception)
{
SolarMutexGuard aGuard;
@@ -120,7 +118,6 @@ void SAL_CALL SvxUnoXPropertyTable::insertByName( const OUString& aName, const
}
void SAL_CALL SvxUnoXPropertyTable::removeByName( const OUString& Name )
- throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -143,7 +140,6 @@ 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, std::exception)
{
SolarMutexGuard aGuard;
@@ -170,7 +166,6 @@ 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, std::exception)
{
SolarMutexGuard aGuard;
@@ -190,7 +185,6 @@ uno::Any SAL_CALL SvxUnoXPropertyTable::getByName( const OUString& aName )
}
uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames()
- throw( uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -210,7 +204,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoXPropertyTable::getElementNames()
}
sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName )
- throw( uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -230,7 +223,6 @@ sal_Bool SAL_CALL SvxUnoXPropertyTable::hasByName( const OUString& aName )
// XElementAccess
sal_Bool SAL_CALL SvxUnoXPropertyTable::hasElements( )
- throw( uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -248,11 +240,11 @@ public:
virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override;
// XElementAccess
- virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+ virtual uno::Type SAL_CALL getElementType() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) 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 uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
uno::Reference< uno::XInterface > SAL_CALL SvxUnoXColorTable_createInstance( XPropertyList* pList ) throw()
@@ -278,18 +270,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXColorTable::createEntry(const OUString& r
// XElementAccess
uno::Type SAL_CALL SvxUnoXColorTable::getElementType()
- throw( uno::RuntimeException, std::exception )
{
return ::cppu::UnoType<sal_Int32>::get();
}
// XServiceInfo
-OUString SAL_CALL SvxUnoXColorTable::getImplementationName( ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXColorTable::getImplementationName( )
{
return OUString( "SvxUnoXColorTable" );
}
-uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( )
{
const OUString aServiceName( "com.sun.star.drawing.ColorTable" );
uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -304,14 +295,14 @@ public:
// SvxUnoXPropertyTable
virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw() override;
- virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(lang::IllegalArgumentException) override;
+ virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override;
// XElementAccess
- virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+ virtual uno::Type SAL_CALL getElementType() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) 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 uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
uno::Reference< uno::XInterface > SAL_CALL SvxUnoXLineEndTable_createInstance( XPropertyList* pTable ) throw()
@@ -328,7 +319,7 @@ uno::Any SvxUnoXLineEndTable::getAny( const XPropertyEntry* pEntry ) const throw
return uno::Any(aBezier);
}
-std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& rName, const uno::Any& rAny) const throw(lang::IllegalArgumentException)
+std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString& rName, const uno::Any& rAny) const
{
auto pCoords = o3tl::tryAccess<drawing::PolyPolygonBezierCoords>(rAny);
if( !pCoords )
@@ -346,18 +337,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXLineEndTable::createEntry(const OUString&
// XElementAccess
uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType()
- throw( uno::RuntimeException, std::exception )
{
return cppu::UnoType<drawing::PolyPolygonBezierCoords>::get();
}
// XServiceInfo
-OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( )
{
return OUString( "SvxUnoXLineEndTable" );
}
-uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( )
{
const OUString aServiceName( "com.sun.star.drawing.LineEndTable" );
uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -375,11 +365,11 @@ public:
virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override;
// XElementAccess
- virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+ virtual uno::Type SAL_CALL getElementType() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) 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 uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
uno::Reference< uno::XInterface > SAL_CALL SvxUnoXDashTable_createInstance( XPropertyList* pTable ) throw()
@@ -424,18 +414,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXDashTable::createEntry(const OUString& rN
// XElementAccess
uno::Type SAL_CALL SvxUnoXDashTable::getElementType()
- throw( uno::RuntimeException, std::exception )
{
return cppu::UnoType<drawing::LineDash>::get();
}
// XServiceInfo
-OUString SAL_CALL SvxUnoXDashTable::getImplementationName( ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXDashTable::getImplementationName( )
{
return OUString( "SvxUnoXDashTable" );
}
-uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( )
{
const OUString aServiceName( "com.sun.star.drawing.DashTable" );
uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -453,11 +442,11 @@ public:
virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override;
// XElementAccess
- virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+ virtual uno::Type SAL_CALL getElementType() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) 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 uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
uno::Reference< uno::XInterface > SAL_CALL SvxUnoXHatchTable_createInstance( XPropertyList* pTable ) throw()
@@ -497,18 +486,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXHatchTable::createEntry(const OUString& r
// XElementAccess
uno::Type SAL_CALL SvxUnoXHatchTable::getElementType()
- throw( uno::RuntimeException, std::exception )
{
return cppu::UnoType<drawing::Hatch>::get();
}
// XServiceInfo
-OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( )
{
return OUString( "SvxUnoXHatchTable" );
}
-uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( )
{
const OUString aServiceName( "com.sun.star.drawing.HatchTable" );
uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -526,11 +514,11 @@ public:
virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw() override;
// XElementAccess
- virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+ virtual uno::Type SAL_CALL getElementType() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) 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 uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
uno::Reference< uno::XInterface > SAL_CALL SvxUnoXGradientTable_createInstance( XPropertyList* pTable ) throw()
@@ -582,18 +570,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXGradientTable::createEntry(const OUString
// XElementAccess
uno::Type SAL_CALL SvxUnoXGradientTable::getElementType()
- throw( uno::RuntimeException, std::exception )
{
return cppu::UnoType<awt::Gradient>::get();
}
// XServiceInfo
-OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( )
{
return OUString( "SvxUnoXGradientTable" );
}
-uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( )
{
const OUString aServiceName( "com.sun.star.drawing.GradientTable" );
uno::Sequence< OUString > aServices( &aServiceName, 1 );
@@ -607,15 +594,15 @@ public:
explicit SvxUnoXBitmapTable( XPropertyList* pTable ) throw() : SvxUnoXPropertyTable( XATTR_FILLBITMAP, pTable ) {};
// SvxUnoXPropertyTable
- virtual uno::Any getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException) override;
- virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException) override;
+ virtual uno::Any getAny( const XPropertyEntry* pEntry ) const override;
+ virtual std::unique_ptr<XPropertyEntry> createEntry(const OUString& rName, const uno::Any& rAny) const override;
// XElementAccess
- virtual uno::Type SAL_CALL getElementType() throw( uno::RuntimeException, std::exception ) override;
+ virtual uno::Type SAL_CALL getElementType() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) 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 uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XPropertyList* pTable ) throw()
@@ -624,7 +611,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoXBitmapTable_createInstance( XP
}
// SvxUnoXPropertyTable
-uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw(uno::RuntimeException)
+uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const
{
OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX);
const GraphicObject& rGraphicObject(static_cast<const XBitmapEntry*>(pEntry)->GetGraphicObject());
@@ -633,7 +620,7 @@ uno::Any SvxUnoXBitmapTable::getAny( const XPropertyEntry* pEntry ) const throw(
return uno::Any(aURL);
}
-std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& rName, const uno::Any& rAny) const throw(uno::RuntimeException)
+std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString& rName, const uno::Any& rAny) const
{
OUString aURL;
if(!(rAny >>= aURL))
@@ -646,18 +633,17 @@ std::unique_ptr<XPropertyEntry> SvxUnoXBitmapTable::createEntry(const OUString&
// XElementAccess
uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType()
- throw( uno::RuntimeException, std::exception )
{
return ::cppu::UnoType<OUString>::get();
}
// XServiceInfo
-OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( ) throw( uno::RuntimeException, std::exception )
+OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( )
{
return OUString( "SvxUnoXBitmapTable" );
}
-uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( ) throw( uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( )
{
const OUString aServiceName( "com.sun.star.drawing.BitmapTable" );
uno::Sequence< OUString > aServices( &aServiceName, 1 );