summaryrefslogtreecommitdiff
path: root/svtools/source/graphic/graphic.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/source/graphic/graphic.cxx')
-rw-r--r--svtools/source/graphic/graphic.cxx15
1 files changed, 3 insertions, 12 deletions
diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index 91d784775d24..b156d6123384 100644
--- a/svtools/source/graphic/graphic.cxx
+++ b/svtools/source/graphic/graphic.cxx
@@ -50,7 +50,6 @@ void Graphic::init( const ::Graphic& rGraphic )
uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType )
- throw( uno::RuntimeException, std::exception )
{
uno::Any aAny;
if( rType == cppu::UnoType<graphic::XGraphic>::get())
@@ -67,7 +66,6 @@ uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType )
uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType )
- throw( uno::RuntimeException, std::exception )
{
css::uno::Any aReturn = ::unographic::GraphicDescriptor::queryInterface( rType );
if ( !aReturn.hasValue() )
@@ -89,19 +87,16 @@ void SAL_CALL Graphic::release() throw()
}
OUString SAL_CALL Graphic::getImplementationName()
- throw( uno::RuntimeException, std::exception )
{
return OUString( "com.sun.star.comp.graphic.Graphic" );
}
sal_Bool SAL_CALL Graphic::supportsService( const OUString& rServiceName )
- throw( uno::RuntimeException, std::exception )
{
return cppu::supportsService( this, rServiceName );
}
uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames()
- throw( uno::RuntimeException, std::exception )
{
uno::Sequence< OUString > aRet( ::unographic::GraphicDescriptor::getSupportedServiceNames() );
uno::Sequence< OUString > aNew { "com.sun.star.graphic.Graphic" };
@@ -116,7 +111,6 @@ uno::Sequence< OUString > SAL_CALL Graphic::getSupportedServiceNames()
}
uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes()
- throw(uno::RuntimeException, std::exception)
{
uno::Sequence< uno::Type > aRet( ::unographic::GraphicDescriptor::getTypes() );
sal_Int32 nOldCount = aRet.getLength();
@@ -130,14 +124,12 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId()
- throw(uno::RuntimeException, std::exception)
{
return css::uno::Sequence<sal_Int8>();
}
sal_Int8 SAL_CALL Graphic::getType()
- throw (uno::RuntimeException, std::exception)
{
sal_Int8 cRet = graphic::GraphicType::EMPTY;
@@ -158,7 +150,7 @@ sal_Int8 SAL_CALL Graphic::getType()
// XBitmap
-awt::Size SAL_CALL Graphic::getSize() throw (uno::RuntimeException, std::exception)
+awt::Size SAL_CALL Graphic::getSize()
{
SolarMutexGuard aGuard;
@@ -171,7 +163,7 @@ awt::Size SAL_CALL Graphic::getSize() throw (uno::RuntimeException, std::excepti
}
-uno::Sequence<sal_Int8> SAL_CALL Graphic::getDIB() throw (uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL Graphic::getDIB()
{
SolarMutexGuard aGuard;
@@ -189,7 +181,7 @@ uno::Sequence<sal_Int8> SAL_CALL Graphic::getDIB() throw (uno::RuntimeException,
}
-uno::Sequence<sal_Int8> SAL_CALL Graphic::getMaskDIB() throw (uno::RuntimeException, std::exception)
+uno::Sequence<sal_Int8> SAL_CALL Graphic::getMaskDIB()
{
SolarMutexGuard aGuard;
@@ -216,7 +208,6 @@ const ::Graphic* Graphic::getImplementation( const uno::Reference< uno::XInterfa
sal_Int64 SAL_CALL Graphic::getSomething( const uno::Sequence< sal_Int8 >& rId )
- throw( uno::RuntimeException, std::exception )
{
return( ( rId.getLength() == 16 && 0 == memcmp( ::Graphic::getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) ?
reinterpret_cast<sal_Int64>(&maGraphic) : 0 );