diff options
Diffstat (limited to 'svtools/source/graphic')
-rw-r--r-- | svtools/source/graphic/descriptor.cxx | 14 | ||||
-rw-r--r-- | svtools/source/graphic/graphic.cxx | 11 | ||||
-rw-r--r-- | svtools/source/graphic/grfattr.cxx | 5 | ||||
-rw-r--r-- | svtools/source/graphic/grfcache.hxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 3 | ||||
-rw-r--r-- | svtools/source/graphic/provider.cxx | 9 | ||||
-rw-r--r-- | svtools/source/graphic/renderer.cxx | 12 | ||||
-rw-r--r-- | svtools/source/graphic/transformer.cxx | 4 | ||||
-rw-r--r-- | svtools/source/graphic/transformer.hxx | 2 |
9 files changed, 0 insertions, 62 deletions
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index 0f55ecfcf701..f9e64af9acef 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -49,8 +49,6 @@ using namespace ::com::sun::star; namespace unographic { - - GraphicDescriptor::GraphicDescriptor() : ::comphelper::PropertySetHelper( createPropertySetInfo(), SAL_NO_ACQUIRE ), mpGraphic( nullptr ), @@ -153,7 +151,6 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) } - OUString GraphicDescriptor::getImplementationName_Static() throw() { @@ -161,7 +158,6 @@ OUString GraphicDescriptor::getImplementationName_Static() } - uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() throw( ) { @@ -170,7 +166,6 @@ uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() } - uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -193,7 +188,6 @@ uno::Any SAL_CALL GraphicDescriptor::queryAggregation( const uno::Type & rType ) } - uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -201,7 +195,6 @@ uno::Any SAL_CALL GraphicDescriptor::queryInterface( const uno::Type & rType ) } - void SAL_CALL GraphicDescriptor::acquire() throw() { @@ -209,7 +202,6 @@ void SAL_CALL GraphicDescriptor::acquire() } - void SAL_CALL GraphicDescriptor::release() throw() { @@ -217,7 +209,6 @@ void SAL_CALL GraphicDescriptor::release() } - OUString SAL_CALL GraphicDescriptor::getImplementationName() throw( uno::RuntimeException, std::exception ) { @@ -231,7 +222,6 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceNam } - uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { @@ -239,7 +229,6 @@ uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() } - uno::Sequence< uno::Type > SAL_CALL GraphicDescriptor::getTypes() throw( uno::RuntimeException, std::exception ) { @@ -263,7 +252,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() } - ::comphelper::PropertySetInfo* GraphicDescriptor::createPropertySetInfo() { SolarMutexGuard aGuard; @@ -289,7 +277,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() } - void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** /*ppEntries*/, const uno::Any* /*pValues*/ ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -300,7 +287,6 @@ void GraphicDescriptor::_setPropertyValues( const comphelper::PropertyMapEntry** } - void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { diff --git a/svtools/source/graphic/graphic.cxx b/svtools/source/graphic/graphic.cxx index ccfea396b7d7..207f0de3293f 100644 --- a/svtools/source/graphic/graphic.cxx +++ b/svtools/source/graphic/graphic.cxx @@ -39,7 +39,6 @@ Graphic::Graphic() : } - Graphic::~Graphic() throw() { @@ -47,7 +46,6 @@ Graphic::~Graphic() } - void Graphic::init( const ::Graphic& rGraphic ) throw() { @@ -57,7 +55,6 @@ void Graphic::init( const ::Graphic& rGraphic ) } - uno::Any SAL_CALL Graphic::queryAggregation( const uno::Type& rType ) throw( uno::RuntimeException, std::exception ) { @@ -75,7 +72,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 ) { @@ -86,7 +82,6 @@ uno::Any SAL_CALL Graphic::queryInterface( const uno::Type & rType ) } - void SAL_CALL Graphic::acquire() throw() { @@ -94,7 +89,6 @@ void SAL_CALL Graphic::acquire() } - void SAL_CALL Graphic::release() throw() { ::unographic::GraphicDescriptor::release(); @@ -107,7 +101,6 @@ OUString Graphic::getImplementationName_Static() } - uno::Sequence< OUString > Graphic::getSupportedServiceNames_Static() throw() { @@ -156,7 +149,6 @@ uno::Sequence< uno::Type > SAL_CALL Graphic::getTypes() } - uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() throw(uno::RuntimeException, std::exception) { @@ -164,7 +156,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Graphic::getImplementationId() } - ::sal_Int8 SAL_CALL Graphic::getType() throw (uno::RuntimeException, std::exception) { @@ -192,7 +183,6 @@ awt::Size SAL_CALL Graphic::getSize( ) throw (uno::RuntimeException, std::excep } - uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -211,7 +201,6 @@ uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getDIB( ) throw (uno::RuntimeExce } - uno::Sequence< ::sal_Int8 > SAL_CALL Graphic::getMaskDIB( ) throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/svtools/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx index dd6585c1c3c9..03d49086856e 100644 --- a/svtools/source/graphic/grfattr.cxx +++ b/svtools/source/graphic/grfattr.cxx @@ -22,8 +22,6 @@ #include <svtools/grfmgr.hxx> - - GraphicAttr::GraphicAttr() : mfGamma ( 1.0 ), mnMirrFlags ( BmpMirrorFlags::NONE ), @@ -44,13 +42,11 @@ GraphicAttr::GraphicAttr() : } - GraphicAttr::~GraphicAttr() { } - bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const { return( ( mfGamma == rAttr.mfGamma ) && @@ -71,5 +67,4 @@ bool GraphicAttr::operator==( const GraphicAttr& rAttr ) const } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index 7af69062cd91..d8408554716e 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -25,8 +25,6 @@ #include <list> - - class GraphicAttr; class GraphicCacheEntry; class GraphicDisplayCacheEntry; diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 82e76b359d79..7ffb4676773d 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -36,14 +36,11 @@ #include <memory> - #define WATERMARK_LUM_OFFSET 50 #define WATERMARK_CON_OFFSET -70 #define MAP( cVal0, cVal1, nFrac ) ((sal_uInt8)((((long)(cVal0)<<20L)+nFrac*((long)(cVal1)-(cVal0)))>>20L)) - - GraphicManager::GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize ) : mnUsedSize(0), mpCache( new GraphicCache( nCacheSize, nMaxObjCacheSize ) ) diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index cce56d148ecb..57ed103ed18f 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -100,7 +100,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -142,7 +141,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUS } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -162,8 +160,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( } - - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -193,7 +189,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno::Reference< awt::XBitmap >& xBtm ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -227,7 +222,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno } - uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; @@ -304,7 +298,6 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const O } - uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDescriptor( const uno::Sequence< beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -377,7 +370,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL GraphicProvider::queryGraphicDesc } - uno::Reference< ::graphic::XGraphic > SAL_CALL GraphicProvider::queryGraphic( const uno::Sequence< ::beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { @@ -720,7 +712,6 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal } - void SAL_CALL GraphicProvider::storeGraphic( const uno::Reference< ::graphic::XGraphic >& rxGraphic, const uno::Sequence< beans::PropertyValue >& rMediaProperties ) throw ( io::IOException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx index d717522fb223..f40036cfb3d5 100644 --- a/svtools/source/graphic/renderer.cxx +++ b/svtools/source/graphic/renderer.cxx @@ -49,14 +49,12 @@ GraphicRendererVCL::GraphicRendererVCL() : } - GraphicRendererVCL::~GraphicRendererVCL() throw() { } - uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -81,7 +79,6 @@ uno::Any SAL_CALL GraphicRendererVCL::queryAggregation( const uno::Type & rType } - uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) { @@ -89,7 +86,6 @@ uno::Any SAL_CALL GraphicRendererVCL::queryInterface( const uno::Type & rType ) } - void SAL_CALL GraphicRendererVCL::acquire() throw() { @@ -97,7 +93,6 @@ void SAL_CALL GraphicRendererVCL::acquire() } - void SAL_CALL GraphicRendererVCL::release() throw() { @@ -105,7 +100,6 @@ void SAL_CALL GraphicRendererVCL::release() } - OUString SAL_CALL GraphicRendererVCL::getImplementationName() throw( uno::RuntimeException, std::exception ) { @@ -119,7 +113,6 @@ sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceNa } - uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) { @@ -128,7 +121,6 @@ uno::Sequence< OUString > SAL_CALL GraphicRendererVCL::getSupportedServiceNames( } - uno::Sequence< uno::Type > SAL_CALL GraphicRendererVCL::getTypes() throw( uno::RuntimeException, std::exception ) { @@ -153,7 +145,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() } - ::comphelper::PropertySetInfo* GraphicRendererVCL::createPropertySetInfo() { SolarMutexGuard aGuard; @@ -174,7 +165,6 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicRendererVCL::getImplementationId() } - void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry** ppEntries, const uno::Any* pValues ) throw( beans::UnknownPropertyException, beans::PropertyVetoException, @@ -229,7 +219,6 @@ void GraphicRendererVCL::_setPropertyValues( const comphelper::PropertyMapEntry* } - void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, uno::Any* pValues ) throw( beans::UnknownPropertyException, lang::WrappedTargetException ) { @@ -268,7 +257,6 @@ void GraphicRendererVCL::_getPropertyValues( const comphelper::PropertyMapEntry* } - void SAL_CALL GraphicRendererVCL::render( const uno::Reference< graphic::XGraphic >& rxGraphic ) throw (uno::RuntimeException, std::exception) { diff --git a/svtools/source/graphic/transformer.cxx b/svtools/source/graphic/transformer.cxx index 8636fe3f7d48..fbfdfa30516e 100644 --- a/svtools/source/graphic/transformer.cxx +++ b/svtools/source/graphic/transformer.cxx @@ -39,20 +39,16 @@ using namespace com::sun::star; namespace unographic { - - GraphicTransformer::GraphicTransformer() { } - GraphicTransformer::~GraphicTransformer() { } - void setAlpha( Bitmap& rBitmap, AlphaMask& rAlpha, sal_uInt8 cIndexFrom, sal_Int8 nAlphaTo ) { BitmapWriteAccess* pWriteAccess = rAlpha.AcquireWriteAccess(); diff --git a/svtools/source/graphic/transformer.hxx b/svtools/source/graphic/transformer.hxx index c6af0cc3b4b9..764daddfffa6 100644 --- a/svtools/source/graphic/transformer.hxx +++ b/svtools/source/graphic/transformer.hxx @@ -27,8 +27,6 @@ namespace unographic { - - typedef ::cppu::WeakAggImplHelper1< css::graphic::XGraphicTransformer > GraphicTransformer_UnoImplHelper1; |