diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /include/canvas | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (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 'include/canvas')
-rw-r--r-- | include/canvas/base/bitmapcanvasbase.hxx | 9 | ||||
-rw-r--r-- | include/canvas/base/bufferedgraphicdevicebase.hxx | 23 | ||||
-rw-r--r-- | include/canvas/base/cachedprimitivebase.hxx | 8 | ||||
-rw-r--r-- | include/canvas/base/canvasbase.hxx | 70 | ||||
-rw-r--r-- | include/canvas/base/canvascustomspritebase.hxx | 24 | ||||
-rw-r--r-- | include/canvas/base/disambiguationhelper.hxx | 4 | ||||
-rw-r--r-- | include/canvas/base/graphicdevicebase.hxx | 72 | ||||
-rw-r--r-- | include/canvas/base/integerbitmapbase.hxx | 10 | ||||
-rw-r--r-- | include/canvas/base/spritecanvasbase.hxx | 13 | ||||
-rw-r--r-- | include/canvas/parametricpolypolygon.hxx | 14 |
10 files changed, 89 insertions, 158 deletions
diff --git a/include/canvas/base/bitmapcanvasbase.hxx b/include/canvas/base/bitmapcanvasbase.hxx index 7b73477b64cb..55d156edf474 100644 --- a/include/canvas/base/bitmapcanvasbase.hxx +++ b/include/canvas/base/bitmapcanvasbase.hxx @@ -68,20 +68,20 @@ namespace canvas typedef CanvasBase< Base, CanvasHelper, Mutex, UnambiguousBase > BaseType; // XBitmap - virtual css::geometry::IntegerSize2D SAL_CALL getSize( ) throw (css::uno::RuntimeException) override + virtual css::geometry::IntegerSize2D SAL_CALL getSize( ) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); return BaseType::maCanvasHelper.getSize(); } - virtual sal_Bool SAL_CALL hasAlpha( ) throw (css::uno::RuntimeException) override + virtual sal_Bool SAL_CALL hasAlpha( ) override { return true; } virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL getScaledBitmap( const css::geometry::RealSize2D& newSize, - sal_Bool beFast ) throw (css::uno::RuntimeException, std::exception) override + sal_Bool beFast ) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -107,8 +107,7 @@ namespace canvas const css::rendering::RenderState& sourceRenderState, const css::geometry::RealRectangle2D& destRect, const css::rendering::ViewState& destViewState, - const css::rendering::RenderState& destRenderState ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + const css::rendering::RenderState& destRenderState ) override { tools::verifyArgs(sourceCanvas, sourceRect, sourceViewState, sourceRenderState, destRect, destViewState, destRenderState, diff --git a/include/canvas/base/bufferedgraphicdevicebase.hxx b/include/canvas/base/bufferedgraphicdevicebase.hxx index fb63de688739..77df5197f89a 100644 --- a/include/canvas/base/bufferedgraphicdevicebase.hxx +++ b/include/canvas/base/bufferedgraphicdevicebase.hxx @@ -93,34 +93,31 @@ namespace canvas } // XGraphicDevice - virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController( ) throw (css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController( ) override { return this; } // XBufferController - virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + virtual ::sal_Int32 SAL_CALL createBuffers( ::sal_Int32 nBuffers ) override { tools::verifyRange( nBuffers, (sal_Int32)1 ); return 1; } - virtual void SAL_CALL destroyBuffers( ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL destroyBuffers( ) override { } - virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) - throw (css::uno::RuntimeException, - std::exception) override + virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override { MutexType aGuard( BaseType::m_aMutex ); return BaseType::maDeviceHelper.showBuffer( mbIsVisible, bUpdateAll ); } - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override { MutexType aGuard( BaseType::m_aMutex ); @@ -216,7 +213,7 @@ namespace canvas } // XWindowListener - virtual void disposeEventSource( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override + virtual void disposeEventSource( const css::lang::EventObject& Source ) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -226,24 +223,24 @@ namespace canvas BaseType::disposeEventSource(Source); } - virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& e ) override { boundsChanged( e ); } - virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& e ) override { boundsChanged( e ); } - virtual void SAL_CALL windowShown( const css::lang::EventObject& ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL windowShown( const css::lang::EventObject& ) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); mbIsVisible = true; } - virtual void SAL_CALL windowHidden( const css::lang::EventObject& ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL windowHidden( const css::lang::EventObject& ) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/cachedprimitivebase.hxx b/include/canvas/base/cachedprimitivebase.hxx index 8fb1ac04639c..65811c33e0e4 100644 --- a/include/canvas/base/cachedprimitivebase.hxx +++ b/include/canvas/base/cachedprimitivebase.hxx @@ -60,12 +60,12 @@ namespace canvas virtual void SAL_CALL disposing() override; // XCachedPrimitive - virtual ::sal_Int8 SAL_CALL redraw( const css::rendering::ViewState& aState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int8 SAL_CALL redraw( const css::rendering::ViewState& aState ) 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; protected: virtual ~CachedPrimitiveBase() override; // we're a ref-counted UNO class. _We_ destroy ourselves. diff --git a/include/canvas/base/canvasbase.hxx b/include/canvas/base/canvasbase.hxx index cf30aabc8c6a..ce9ea3fbccff 100644 --- a/include/canvas/base/canvasbase.hxx +++ b/include/canvas/base/canvasbase.hxx @@ -122,7 +122,7 @@ namespace canvas } // XCanvas - virtual void SAL_CALL clear() throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL clear() override { MutexType aGuard( BaseType::m_aMutex ); @@ -133,10 +133,7 @@ namespace canvas virtual void SAL_CALL drawPoint(const css::geometry::RealPoint2D& aPoint, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + const css::rendering::RenderState& renderState) override { tools::verifyArgs(aPoint, viewState, renderState, OSL_THIS_FUNC, @@ -150,10 +147,7 @@ namespace canvas virtual void SAL_CALL drawLine(const css::geometry::RealPoint2D& aStartPoint, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + const css::rendering::RenderState& renderState) override { tools::verifyArgs(aStartPoint, aEndPoint, viewState, renderState, OSL_THIS_FUNC, @@ -169,10 +163,7 @@ namespace canvas virtual void SAL_CALL drawBezier( const css::geometry::RealBezierSegment2D& aBezierSegment, const css::geometry::RealPoint2D& aEndPoint, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + const css::rendering::RenderState& renderState ) override { tools::verifyArgs(aBezierSegment, aEndPoint, viewState, renderState, OSL_THIS_FUNC, @@ -188,10 +179,7 @@ namespace canvas virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL drawPolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + const css::rendering::RenderState& renderState) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, OSL_THIS_FUNC, @@ -208,10 +196,7 @@ namespace canvas strokePolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState, const css::rendering::RenderState& renderState, - const css::rendering::StrokeAttributes& strokeAttributes) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + const css::rendering::StrokeAttributes& strokeAttributes) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, OSL_THIS_FUNC, @@ -229,8 +214,7 @@ namespace canvas const css::rendering::ViewState& viewState, const css::rendering::RenderState& renderState, const css::uno::Sequence< css::rendering::Texture >& textures, - const css::rendering::StrokeAttributes& strokeAttributes ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + const css::rendering::StrokeAttributes& strokeAttributes ) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, OSL_THIS_FUNC, @@ -249,8 +233,7 @@ namespace canvas const css::rendering::RenderState& renderState, const css::uno::Sequence< css::rendering::Texture >& textures, const css::uno::Reference< css::geometry::XMapping2D >& xMapping, - const css::rendering::StrokeAttributes& strokeAttributes ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + const css::rendering::StrokeAttributes& strokeAttributes ) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, strokeAttributes, OSL_THIS_FUNC, @@ -267,8 +250,7 @@ namespace canvas queryStrokeShapes( const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState, const css::rendering::RenderState& renderState, - const css::rendering::StrokeAttributes& strokeAttributes ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + const css::rendering::StrokeAttributes& strokeAttributes ) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, strokeAttributes, OSL_THIS_FUNC, @@ -284,10 +266,7 @@ namespace canvas virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL fillPolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + const css::rendering::RenderState& renderState) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, OSL_THIS_FUNC, @@ -304,10 +283,7 @@ namespace canvas fillTexturedPolyPolygon(const css::uno::Reference< css::rendering::XPolyPolygon2D >& xPolyPolygon, const css::rendering::ViewState& viewState, const css::rendering::RenderState& renderState, - const css::uno::Sequence< css::rendering::Texture >& textures) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + const css::uno::Sequence< css::rendering::Texture >& textures) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, OSL_THIS_FUNC, @@ -325,7 +301,7 @@ namespace canvas const css::rendering::ViewState& viewState, const css::rendering::RenderState& renderState, const css::uno::Sequence< css::rendering::Texture >& textures, - const css::uno::Reference< css::geometry::XMapping2D >& xMapping ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override + const css::uno::Reference< css::geometry::XMapping2D >& xMapping ) override { tools::verifyArgs(xPolyPolygon, viewState, renderState, textures, xMapping, OSL_THIS_FUNC, @@ -342,8 +318,7 @@ namespace canvas virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL createFont( const css::rendering::FontRequest& fontRequest, const css::uno::Sequence< css::beans::PropertyValue >& extraFontProperties, - const css::geometry::Matrix2D& fontMatrix ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + const css::geometry::Matrix2D& fontMatrix ) override { tools::verifyArgs(fontRequest, // dummy, to keep argPos in sync @@ -360,8 +335,7 @@ namespace canvas virtual css::uno::Sequence< css::rendering::FontInfo > SAL_CALL queryAvailableFonts( const css::rendering::FontInfo& aFilter, - const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + const css::uno::Sequence< css::beans::PropertyValue >& aFontProperties ) override { tools::verifyArgs(aFilter, OSL_THIS_FUNC, @@ -378,10 +352,7 @@ namespace canvas const css::uno::Reference< css::rendering::XCanvasFont >& xFont, const css::rendering::ViewState& viewState, const css::rendering::RenderState& renderState, - sal_Int8 textDirection) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + sal_Int8 textDirection) override { tools::verifyArgs(xFont, viewState, renderState, OSL_THIS_FUNC, @@ -401,10 +372,7 @@ namespace canvas virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL drawTextLayout(const css::uno::Reference< css::rendering::XTextLayout >& laidOutText, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + const css::rendering::RenderState& renderState) override { tools::verifyArgs(laidOutText, viewState, renderState, OSL_THIS_FUNC, @@ -421,7 +389,7 @@ namespace canvas virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL drawBitmap( const css::uno::Reference< css::rendering::XBitmap >& xBitmap, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override + const css::rendering::RenderState& renderState ) override { tools::verifyArgs(xBitmap, viewState, renderState, OSL_THIS_FUNC, @@ -437,7 +405,7 @@ namespace canvas virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL drawBitmapModulated( const css::uno::Reference< css::rendering::XBitmap >& xBitmap, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override + const css::rendering::RenderState& renderState ) override { tools::verifyArgs(xBitmap, viewState, renderState, OSL_THIS_FUNC, @@ -451,7 +419,7 @@ namespace canvas } virtual css::uno::Reference< css::rendering::XGraphicDevice > SAL_CALL - getDevice() throw (css::uno::RuntimeException) override + getDevice() override { MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/canvascustomspritebase.hxx b/include/canvas/base/canvascustomspritebase.hxx index 4e4175c70287..470c3d8e2df5 100644 --- a/include/canvas/base/canvascustomspritebase.hxx +++ b/include/canvas/base/canvascustomspritebase.hxx @@ -102,7 +102,7 @@ namespace canvas } // XCanvas: selectively override base's methods here, for opacity tracking - virtual void SAL_CALL clear() throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL clear() override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -115,8 +115,7 @@ namespace canvas virtual css::uno::Reference< css::rendering::XCachedPrimitive > SAL_CALL drawBitmap( const css::uno::Reference< css::rendering::XBitmap >& xBitmap, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + const css::rendering::RenderState& renderState ) override { tools::verifyArgs(xBitmap, viewState, renderState, OSL_THIS_FUNC, @@ -140,8 +139,7 @@ namespace canvas // functionality provided at the baseclass. // XSprite - virtual void SAL_CALL setAlpha( double alpha ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + virtual void SAL_CALL setAlpha( double alpha ) override { tools::verifyRange( alpha, 0.0, 1.0 ); @@ -152,8 +150,7 @@ namespace canvas virtual void SAL_CALL move( const css::geometry::RealPoint2D& aNewPos, const css::rendering::ViewState& viewState, - const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + const css::rendering::RenderState& renderState ) override { tools::verifyArgs(aNewPos, viewState, renderState, OSL_THIS_FUNC, @@ -164,8 +161,7 @@ namespace canvas maSpriteHelper.move( this, aNewPos, viewState, renderState ); } - virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) override { tools::verifyArgs(aTransformation, OSL_THIS_FUNC, @@ -176,7 +172,7 @@ namespace canvas maSpriteHelper.transform( this, aTransformation ); } - virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) override { // NULL xClip explicitly allowed here (to clear clipping) @@ -185,21 +181,21 @@ namespace canvas maSpriteHelper.clip( this, aClip ); } - virtual void SAL_CALL setPriority( double nPriority ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL setPriority( double nPriority ) override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); maSpriteHelper.setPriority( this, nPriority ); } - virtual void SAL_CALL show() throw (css::uno::RuntimeException) override + virtual void SAL_CALL show() override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); maSpriteHelper.show( this ); } - virtual void SAL_CALL hide() throw (css::uno::RuntimeException) override + virtual void SAL_CALL hide() override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); @@ -208,7 +204,7 @@ namespace canvas // XCustomSprite virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL - getContentCanvas() throw (css::uno::RuntimeException) override + getContentCanvas() override { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); diff --git a/include/canvas/base/disambiguationhelper.hxx b/include/canvas/base/disambiguationhelper.hxx index ca9d36fa25fb..4a89d83e3525 100644 --- a/include/canvas/base/disambiguationhelper.hxx +++ b/include/canvas/base/disambiguationhelper.hxx @@ -62,7 +62,7 @@ namespace canvas virtual void disposeThis() {} /// @throws css::uno::RuntimeException - virtual void disposeEventSource( const css::lang::EventObject& ) throw (css::uno::RuntimeException) + virtual void disposeEventSource( const css::lang::EventObject& ) {} mutable ::osl::Mutex m_aMutex; @@ -71,7 +71,7 @@ namespace canvas virtual void SAL_CALL disposing() override { disposeThis(); } - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override { disposeEventSource(Source); } }; diff --git a/include/canvas/base/graphicdevicebase.hxx b/include/canvas/base/graphicdevicebase.hxx index 28c208a1d296..df7a2c4bc2e3 100644 --- a/include/canvas/base/graphicdevicebase.hxx +++ b/include/canvas/base/graphicdevicebase.hxx @@ -141,50 +141,47 @@ namespace canvas } // XGraphicDevice - virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController( ) throw (css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XBufferController > SAL_CALL getBufferController( ) override { return css::uno::Reference< css::rendering::XBufferController >(); } - virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getDeviceColorSpace( ) throw (css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getDeviceColorSpace( ) override { MutexType aGuard( BaseType::m_aMutex ); return maDeviceHelper.getColorSpace(); } - virtual css::geometry::RealSize2D SAL_CALL getPhysicalResolution() throw (css::uno::RuntimeException, std::exception) override + virtual css::geometry::RealSize2D SAL_CALL getPhysicalResolution() override { MutexType aGuard( BaseType::m_aMutex ); return maDeviceHelper.getPhysicalResolution(); } - virtual css::geometry::RealSize2D SAL_CALL getPhysicalSize() throw (css::uno::RuntimeException, std::exception) override + virtual css::geometry::RealSize2D SAL_CALL getPhysicalSize() override { MutexType aGuard( BaseType::m_aMutex ); return maDeviceHelper.getPhysicalSize(); } - virtual css::uno::Reference< css::rendering::XLinePolyPolygon2D > SAL_CALL createCompatibleLinePolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points ) throw (css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XLinePolyPolygon2D > SAL_CALL createCompatibleLinePolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealPoint2D > >& points ) override { MutexType aGuard( BaseType::m_aMutex ); return maDeviceHelper.createCompatibleLinePolyPolygon( this, points ); } - virtual css::uno::Reference< css::rendering::XBezierPolyPolygon2D > SAL_CALL createCompatibleBezierPolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points ) throw (css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XBezierPolyPolygon2D > SAL_CALL createCompatibleBezierPolyPolygon( const css::uno::Sequence< css::uno::Sequence< css::geometry::RealBezierSegment2D > >& points ) override { MutexType aGuard( BaseType::m_aMutex ); return maDeviceHelper.createCompatibleBezierPolyPolygon( this, points ); } - virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const css::geometry::IntegerSize2D& size ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleBitmap( const css::geometry::IntegerSize2D& size ) override { tools::verifyBitmapSize(size, OSL_THIS_FUNC, @@ -195,8 +192,7 @@ namespace canvas return maDeviceHelper.createCompatibleBitmap( this, size ); } - virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileBitmap( const css::geometry::IntegerSize2D& size ) override { tools::verifyBitmapSize(size, OSL_THIS_FUNC, @@ -207,10 +203,7 @@ namespace canvas return maDeviceHelper.createVolatileBitmap( this, size ); } - virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) override + virtual css::uno::Reference< css::rendering::XBitmap > SAL_CALL createCompatibleAlphaBitmap( const css::geometry::IntegerSize2D& size ) override { tools::verifyBitmapSize(size, OSL_THIS_FUNC, @@ -221,8 +214,7 @@ namespace canvas return maDeviceHelper.createCompatibleAlphaBitmap( this, size ); } - virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const css::geometry::IntegerSize2D& size ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XVolatileBitmap > SAL_CALL createVolatileAlphaBitmap( const css::geometry::IntegerSize2D& size ) override { tools::verifyBitmapSize(size, OSL_THIS_FUNC, @@ -233,23 +225,23 @@ namespace canvas return maDeviceHelper.createVolatileAlphaBitmap( this, size ); } - virtual css::uno::Reference< css::lang::XMultiServiceFactory > SAL_CALL getParametricPolyPolygonFactory( ) throw (css::uno::RuntimeException) override + virtual css::uno::Reference< css::lang::XMultiServiceFactory > SAL_CALL getParametricPolyPolygonFactory( ) override { return this; } - virtual sal_Bool SAL_CALL hasFullScreenMode( ) throw (css::uno::RuntimeException) override + virtual sal_Bool SAL_CALL hasFullScreenMode( ) override { return false; } - virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool ) throw (css::uno::RuntimeException) override + virtual sal_Bool SAL_CALL enterFullScreenMode( sal_Bool ) override { return false; } // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (css::uno::Exception, css::uno::RuntimeException) override + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override { return css::uno::Reference< css::rendering::XParametricPolyPolygon2D >( ParametricPolyPolygon::create(this, @@ -257,7 +249,7 @@ namespace canvas css::uno::Sequence< css::uno::Any >())); } - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& aServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) throw (css::uno::Exception, css::uno::RuntimeException) override + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& aServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override { return css::uno::Reference< css::rendering::XParametricPolyPolygon2D >( ParametricPolyPolygon::create(this, @@ -265,14 +257,14 @@ namespace canvas Arguments)); } - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException) override + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) override { return ParametricPolyPolygon::getAvailableServiceNames(); } // XUpdatable - virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL update() override { MutexType aGuard( BaseType::m_aMutex ); @@ -282,37 +274,27 @@ namespace canvas // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException) override + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override { MutexType aGuard( BaseType::m_aMutex ); return maPropHelper.getPropertySetInfo(); } 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 { MutexType aGuard( BaseType::m_aMutex ); maPropHelper.setPropertyValue( aPropertyName, aValue ); } - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& aPropertyName ) override { MutexType aGuard( BaseType::m_aMutex ); return maPropHelper.getPropertyValue( aPropertyName ); } 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) override + const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override { MutexType aGuard( BaseType::m_aMutex ); maPropHelper.addPropertyChangeListener( aPropertyName, @@ -320,16 +302,12 @@ namespace canvas } virtual void SAL_CALL removePropertyChangeListener( const OUString& , - const css::uno::Reference< css::beans::XPropertyChangeListener >& ) throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override + const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override { } virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override + const css::uno::Reference< css::beans::XVetoableChangeListener >& xListener ) override { MutexType aGuard( BaseType::m_aMutex ); maPropHelper.addVetoableChangeListener( aPropertyName, @@ -337,9 +315,7 @@ namespace canvas } virtual void SAL_CALL removeVetoableChangeListener( const OUString& , - const css::uno::Reference< css::beans::XVetoableChangeListener >& ) throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override + const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override { } diff --git a/include/canvas/base/integerbitmapbase.hxx b/include/canvas/base/integerbitmapbase.hxx index 4cc2af209cd7..ecebd5794a3f 100644 --- a/include/canvas/base/integerbitmapbase.hxx +++ b/include/canvas/base/integerbitmapbase.hxx @@ -42,7 +42,7 @@ namespace canvas public: // XIntegerBitmap virtual css::uno::Sequence< sal_Int8 > SAL_CALL getData( css::rendering::IntegerBitmapLayout& bitmapLayout, - const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override + const css::geometry::IntegerRectangle2D& rect ) override { tools::verifyArgs(rect, OSL_THIS_FUNC, @@ -57,7 +57,7 @@ namespace canvas virtual void SAL_CALL setData( const css::uno::Sequence< sal_Int8 >&, const css::rendering::IntegerBitmapLayout& bitmapLayout, - const css::geometry::IntegerRectangle2D& rect ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override + const css::geometry::IntegerRectangle2D& rect ) override { tools::verifyArgs(bitmapLayout, rect, OSL_THIS_FUNC, @@ -71,7 +71,7 @@ namespace canvas virtual void SAL_CALL setPixel( const css::uno::Sequence< sal_Int8 >&, const css::rendering::IntegerBitmapLayout& bitmapLayout, - const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override + const css::geometry::IntegerPoint2D& pos ) override { tools::verifyArgs(bitmapLayout, pos, OSL_THIS_FUNC, @@ -84,7 +84,7 @@ namespace canvas } virtual css::uno::Sequence< sal_Int8 > SAL_CALL getPixel( css::rendering::IntegerBitmapLayout& bitmapLayout, - const css::geometry::IntegerPoint2D& pos ) throw (css::lang::IndexOutOfBoundsException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override + const css::geometry::IntegerPoint2D& pos ) override { tools::verifyArgs(pos, OSL_THIS_FUNC, @@ -97,7 +97,7 @@ namespace canvas pos ); } - virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (css::uno::RuntimeException) override + virtual css::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) override { typename Base::MutexType aGuard( Base::m_aMutex ); diff --git a/include/canvas/base/spritecanvasbase.hxx b/include/canvas/base/spritecanvasbase.hxx index 41c1c3880669..044a279c061e 100644 --- a/include/canvas/base/spritecanvasbase.hxx +++ b/include/canvas/base/spritecanvasbase.hxx @@ -88,8 +88,7 @@ namespace canvas } // XSpriteCanvas - virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) override { tools::verifyArgs(animation, OSL_THIS_FUNC, @@ -101,9 +100,7 @@ namespace canvas } virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps, - sal_Int8 interpolationMode ) throw (css::lang::IllegalArgumentException, - css::rendering::VolatileContentDestroyedException, - css::uno::RuntimeException) override + sal_Int8 interpolationMode ) override { tools::verifyArgs(animationBitmaps, OSL_THIS_FUNC, @@ -117,8 +114,7 @@ namespace canvas return BaseType::maCanvasHelper.createSpriteFromBitmaps(animationBitmaps, interpolationMode); } - virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) override { tools::verifySpriteSize(spriteSize, OSL_THIS_FUNC, @@ -129,8 +125,7 @@ namespace canvas return BaseType::maCanvasHelper.createCustomSprite(spriteSize); } - virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException) override + virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) override { tools::verifyArgs(original, OSL_THIS_FUNC, diff --git a/include/canvas/parametricpolypolygon.hxx b/include/canvas/parametricpolypolygon.hxx index 10b563eb62fd..396b42094ede 100644 --- a/include/canvas/parametricpolypolygon.hxx +++ b/include/canvas/parametricpolypolygon.hxx @@ -100,15 +100,15 @@ namespace canvas virtual void SAL_CALL disposing() override; // XParametricPolyPolygon2D - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL getOutline( double t ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL getColor( double t ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL getPointColor( const css::geometry::RealPoint2D& point ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL getOutline( double t ) override; + virtual css::uno::Sequence< double > SAL_CALL getColor( double t ) override; + virtual css::uno::Sequence< double > SAL_CALL getPointColor( const css::geometry::RealPoint2D& point ) override; + virtual css::uno::Reference< css::rendering::XColorSpace > SAL_CALL getColorSpace() 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; /// Query all defining values of this object atomically Values getValues() const; |