diff options
Diffstat (limited to 'canvas')
50 files changed, 452 insertions, 499 deletions
diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index d56256d2f6cd..b3f403927f69 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -121,7 +121,7 @@ namespace cairocanvas CanvasBaseT::disposeThis(); } - OUString SAL_CALL Canvas::getServiceName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL Canvas::getServiceName( ) { return OUString( CANVAS_SERVICE_NAME ); } diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 588b13e2d4cc..4f32368dcd79 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -124,7 +124,7 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName( ) override; // RepaintTarget virtual bool repaint( const ::cairo::SurfaceSharedPtr& pSurface, diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 09e1d210a9e7..88cef30db4c8 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -104,7 +104,7 @@ namespace cairocanvas return maCanvasHelper.repaint( pSurface, viewState, renderState ); } - uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) { uno::Any aRV( sal_Int32(0) ); // 0 ... get BitmapEx @@ -208,17 +208,17 @@ namespace cairocanvas return aRV; } - OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL CanvasBitmap::getImplementationName( ) { return OUString( "CairoCanvas.CanvasBitmap" ); } - sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) { return { "com.sun.star.rendering.CanvasBitmap" }; } diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index d7954183e75d..8b583340d3cc 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -87,9 +87,9 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase ) // 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; // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; @@ -113,8 +113,8 @@ namespace cairocanvas // 1st a bool value: true - free the pixmap after used by XFreePixmap, false do nothing, the pixmap is used internally in the canvas // 2nd the pixmap handle // 3rd the pixmap depth - virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override {} + virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override; + virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {} private: SurfaceProviderRef mpSurfaceProvider; diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index 107b0fe393c5..eeb0b2abc755 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -132,17 +132,17 @@ namespace cairocanvas return mpSpriteCanvas->getOutputDevice(); } - OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL CanvasCustomSprite::getImplementationName() { return OUString( "CairoCanvas.CanvasCustomSprite" ); } - sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasCustomSprite" }; } diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index 6ce6102fbbc3..95f5bf91ef0c 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.hxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx @@ -113,9 +113,9 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) // 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; // Sprite virtual void redraw( const ::cairo::CairoSharedPtr& pCairo, diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 3206e2c31a3c..cbb9ff8f0d58 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -92,7 +92,7 @@ namespace cairocanvas mpRefDevice.clear(); } - uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) { SolarMutexGuard aGuard; @@ -106,42 +106,42 @@ namespace cairocanvas mpRefDevice ); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException, std::exception) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) { SolarMutexGuard aGuard; return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException, std::exception) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) { // TODO(F1) return rendering::FontMetrics(); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) { // TODO(F1) return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) { // TODO(F1) return uno::Sequence< beans::PropertyValue >(); } - OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL CanvasFont::getImplementationName() { return OUString( "CairoCanvas::CanvasFont" ); } - sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasFont" }; } diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx index 1fdeba085f6d..2bcb97eb2f8b 100644 --- a/canvas/source/cairo/cairo_canvasfont.hxx +++ b/canvas/source/cairo/cairo_canvasfont.hxx @@ -61,16 +61,16 @@ namespace cairocanvas virtual void SAL_CALL disposing() override; // XCanvasFont - virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override; + virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) override; + virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) override; + virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) 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; vcl::Font getVCLFont() const; diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index b2f673bab8c5..e75300ad1621 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1602,25 +1602,24 @@ namespace cairocanvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -1628,7 +1627,7 @@ namespace cairocanvas convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1649,7 +1648,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1670,7 +1669,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1687,7 +1686,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1704,7 +1703,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1721,7 +1720,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1740,21 +1739,20 @@ namespace cairocanvas } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getEndianness( ) override { return util::Endianness::LITTLE; } virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) ) { @@ -1785,8 +1783,7 @@ namespace cairocanvas } } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override { if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) ) { @@ -1802,8 +1799,7 @@ namespace cairocanvas return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1828,8 +1824,7 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1854,8 +1849,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1877,8 +1871,7 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1896,8 +1889,7 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1915,8 +1907,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1959,25 +1950,24 @@ namespace cairocanvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -1985,7 +1975,7 @@ namespace cairocanvas convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -2019,15 +2009,15 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override { return impl_convertToARGB( deviceColor ); } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override { return impl_convertToARGB( deviceColor ); } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -2061,31 +2051,30 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { return impl_convertFromARGB( rgbColor ); } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { return impl_convertFromARGB( rgbColor ); } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getEndianness( ) override { return util::Endianness::LITTLE; } virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { if( dynamic_cast<CairoColorSpace*>(targetColorSpace.get()) ) { @@ -2116,8 +2105,7 @@ namespace cairocanvas } } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override { if( dynamic_cast<CairoNoAlphaColorSpace*>(targetColorSpace.get()) ) { @@ -2133,8 +2121,7 @@ namespace cairocanvas return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -2152,13 +2139,11 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { return impl_convertIntegerToARGB( deviceColor ); } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { return impl_convertIntegerToARGB( deviceColor ); } @@ -2184,8 +2169,7 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -2203,13 +2187,11 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { return impl_convertIntegerFromARGB( rgbColor ); } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { return impl_convertIntegerFromARGB( rgbColor ); } diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index 906c220115ec..3370a9513b9f 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -115,17 +115,17 @@ namespace cairocanvas SpriteCanvasBaseT::disposeThis(); } - sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) { return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) { return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -138,7 +138,7 @@ namespace cairocanvas mbSurfaceDirty); } - OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL SpriteCanvas::getServiceName( ) { return OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 9a3b61aaeb75..ee0b14d9e654 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -121,14 +121,14 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) - virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override; + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override; // XSpriteCanvas (partial) - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override; // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName( ) override; // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 24efd369e062..eaf439923992 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -107,32 +107,32 @@ namespace cairocanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) { // TODO return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maLogicalAdvancements; } - void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -145,7 +145,7 @@ namespace cairocanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException, std::exception) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -182,27 +182,27 @@ namespace cairocanvas } } - double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::justify( double /*nSize*/ ) { // TODO return 0.0; } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, - double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double /*nSize*/ ) { // TODO return 0.0; } - rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException, std::exception) + rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) { // TODO return rendering::TextHit(); } rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return rendering::Caret(); @@ -210,47 +210,47 @@ namespace cairocanvas sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, sal_Int32 /*nCaretAdvancement*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return 0; } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::getBaselineOffset( ) { // TODO return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException, std::exception) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mnTextDirection; } - uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mpFont.get(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) + rendering::StringContext SAL_CALL TextLayout::getText( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -559,17 +559,17 @@ namespace cairocanvas OffsetTransformer( aMatrix ) ); } - OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL TextLayout::getImplementationName() { return OUString( "CairoCanvas::TextLayout" ); } - sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() { return { "com.sun.star.rendering.TextLayout" }; } diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index e39ce77457f0..b3db7803b2fa 100644 --- a/canvas/source/cairo/cairo_textlayout.hxx +++ b/canvas/source/cairo/cairo_textlayout.hxx @@ -59,28 +59,28 @@ namespace cairocanvas virtual void SAL_CALL disposing() override; // XTextLayout - virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getBaselineOffset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::StringContext SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) override; + virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) override; + virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override; + virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) override; + virtual double SAL_CALL justify( double nSize ) override; + virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override; + virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override; + virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override; + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual double SAL_CALL getBaselineOffset( ) override; + virtual sal_Int8 SAL_CALL getMainTextDirection( ) override; + virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; + virtual css::rendering::StringContext SAL_CALL getText( ) 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; bool draw( ::cairo::CairoSharedPtr& pSCairo, OutputDevice& rOutDev, diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index b42f2ab92d56..3fa91396ee47 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -126,7 +126,7 @@ namespace dxcanvas CanvasBaseT::disposeThis(); } - OUString SAL_CALL Canvas::getServiceName( ) throw (uno::RuntimeException) + OUString SAL_CALL Canvas::getServiceName( ) { return OUString( CANVAS_SERVICE_NAME ); } @@ -202,7 +202,7 @@ namespace dxcanvas BitmapCanvasBaseT::disposeThis(); } - OUString SAL_CALL BitmapCanvas::getServiceName( ) throw (uno::RuntimeException) + OUString SAL_CALL BitmapCanvas::getServiceName( ) { return OUString( BITMAPCANVAS_SERVICE_NAME ); } diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 8648d31a2d70..e690ca04f073 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -92,7 +92,7 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getServiceName( ) override; private: css::uno::Sequence< css::uno::Any > maArguments; @@ -148,7 +148,7 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getServiceName( ) override; // BitmapProvider virtual IBitmapSharedPtr getBitmap() const override; diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index 1b86f9c98f0e..edc1c0ace2cc 100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx @@ -74,7 +74,7 @@ namespace dxcanvas } }; - uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException) + uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) { uno::Any aRes; // 0 ... get BitmapEx @@ -239,17 +239,17 @@ namespace dxcanvas return aRes; } - OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException) + OUString SAL_CALL CanvasBitmap::getImplementationName( ) { return OUString( "DXCanvas.CanvasBitmap" ); } - sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) + sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) { return { "com.sun.star.rendering.CanvasBitmap" }; } diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index 53c8b2b7a7f0..a547717e656d 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -70,15 +70,15 @@ namespace dxcanvas virtual void disposeThis() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) 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; // BitmapProvider virtual IBitmapSharedPtr getBitmap() const override { return mpBitmap; } - virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) throw (css::uno::RuntimeException) override {} + virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override; + virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {} private: /** MUST hold here, too, since CanvasHelper only contains a diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx index 148f2636b50d..b0e4b740ef67 100644 --- a/canvas/source/directx/dx_canvascustomsprite.cxx +++ b/canvas/source/directx/dx_canvascustomsprite.cxx @@ -81,17 +81,17 @@ namespace dxcanvas CanvasCustomSpriteBaseT::disposeThis(); } - OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasCustomSprite::getImplementationName() { return OUString( "DXCanvas.CanvasCustomSprite" ); } - sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasCustomSprite" }; } diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx index c53c84616788..a3b57917ed7b 100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx @@ -112,9 +112,9 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) 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; // Sprite virtual void redraw() const override; diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx index d3274b03560c..58a22da907ef 100644 --- a/canvas/source/directx/dx_canvasfont.cxx +++ b/canvas/source/directx/dx_canvasfont.cxx @@ -84,49 +84,49 @@ namespace dxcanvas uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, - sal_Int64 nRandomSeed ) throw (uno::RuntimeException) + sal_Int64 nRandomSeed ) { ::osl::MutexGuard aGuard( m_aMutex ); return new TextLayout( aText, nDirection, nRandomSeed, ImplRef( this ) ); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) { // TODO return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) { // TODO return uno::Sequence< beans::PropertyValue >(); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) { // TODO return rendering::FontMetrics(); } - OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasFont::getImplementationName() { return OUString( "DXCanvas::CanvasFont" ); } - sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasFont" }; } diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx index 533f78c5eebb..7d463a386ae2 100644 --- a/canvas/source/directx/dx_canvasfont.hxx +++ b/canvas/source/directx/dx_canvasfont.hxx @@ -62,16 +62,16 @@ namespace dxcanvas virtual void SAL_CALL disposing() override; // XCanvasFont - virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException) override; - virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) throw (css::uno::RuntimeException) override; - virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override; + virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) override; + virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) override; + virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) 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; double getCellAscent() const; double getEmHeight() const; diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index 5c65c336e6a4..9fbd2d5dc154 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -116,7 +116,7 @@ namespace dxcanvas SpriteCanvasBaseT::disposeThis(); } - sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -126,7 +126,7 @@ namespace dxcanvas return mbIsVisible && SpriteCanvasBaseT::showBuffer( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -136,7 +136,7 @@ namespace dxcanvas return mbIsVisible && SpriteCanvasBaseT::switchBuffer( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -149,7 +149,7 @@ namespace dxcanvas mbSurfaceDirty ); } - OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException) + OUString SAL_CALL SpriteCanvas::getServiceName( ) { return OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx index 04471f8a509b..f57cbe5eee27 100644 --- a/canvas/source/directx/dx_spritecanvas.hxx +++ b/canvas/source/directx/dx_spritecanvas.hxx @@ -118,14 +118,14 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) - virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override; + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override; // XSpriteCanvas (partial) - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override; // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getServiceName( ) override; /// Retrieve rendermodule object for this Canvas const IDXRenderModuleSharedPtr& getRenderModule() const; diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx index 84fa7181ef62..e96822a29b3c 100644 --- a/canvas/source/directx/dx_textlayout.cxx +++ b/canvas/source/directx/dx_textlayout.cxx @@ -56,32 +56,32 @@ namespace dxcanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) { // TODO return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maLogicalAdvancements; } - void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException) + void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -94,7 +94,7 @@ namespace dxcanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -112,27 +112,27 @@ namespace dxcanvas return aBounds; } - double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double SAL_CALL TextLayout::justify( double /*nSize*/ ) { // TODO return 0.0; } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, - double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double /*nSize*/ ) { // TODO return 0.0; } - rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException) + rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) { // TODO return rendering::TextHit(); } rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return rendering::Caret(); @@ -140,47 +140,47 @@ namespace dxcanvas sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, sal_Int32 /*nCaretAdvancement*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return 0; } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException) + double SAL_CALL TextLayout::getBaselineOffset( ) { // TODO return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mnTextDirection; } - uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException) + uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mpFont.get(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException) + rendering::StringContext SAL_CALL TextLayout::getText( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -213,17 +213,17 @@ namespace dxcanvas return true; } - OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL TextLayout::getImplementationName() { return OUString( "DXCanvas::TextLayout" ); } - sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() { return { "com.sun.star.rendering.TextLayout" }; } diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx index 0cdea204431c..b24a1c8f00dc 100644 --- a/canvas/source/directx/dx_textlayout.hxx +++ b/canvas/source/directx/dx_textlayout.hxx @@ -57,28 +57,28 @@ namespace dxcanvas virtual void SAL_CALL disposing() override; // XTextLayout - virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override; - virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (css::uno::RuntimeException) override; - virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override; - virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override; - virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException) override; - virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; - virtual double SAL_CALL getBaselineOffset( ) throw (css::uno::RuntimeException) override; - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException) override; - virtual css::rendering::StringContext SAL_CALL getText( ) throw (css::uno::RuntimeException) override; + virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) override; + virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) override; + virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override; + virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) override; + virtual double SAL_CALL justify( double nSize ) override; + virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override; + virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override; + virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override; + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual double SAL_CALL getBaselineOffset( ) override; + virtual sal_Int8 SAL_CALL getMainTextDirection( ) override; + virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; + virtual css::rendering::StringContext SAL_CALL getText( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) 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; bool draw( const GraphicsSharedPtr& rGraphics, const css::rendering::ViewState& rViewState, diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index a174adaae6ee..f72785057e14 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -89,31 +89,26 @@ public: explicit CanvasFactory( Reference<XComponentContext> const & xContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) override; - virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override; + virtual Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XMultiComponentFactory - virtual Sequence<OUString> SAL_CALL getAvailableServiceNames() - throw (RuntimeException, std::exception) override; + virtual Sequence<OUString> SAL_CALL getAvailableServiceNames() override; virtual Reference<XInterface> SAL_CALL createInstanceWithContext( OUString const & name, - Reference<XComponentContext> const & xContext ) throw (Exception, std::exception) override; + Reference<XComponentContext> const & xContext ) override; virtual Reference<XInterface> SAL_CALL createInstanceWithArgumentsAndContext( OUString const & name, Sequence<Any> const & args, - Reference<XComponentContext> const & xContext ) throw (Exception, std::exception) override; + Reference<XComponentContext> const & xContext ) override; // XMultiServiceFactory virtual Reference<XInterface> SAL_CALL createInstance( - OUString const & name ) - throw (Exception, std::exception) override; + OUString const & name ) override; virtual Reference<XInterface> SAL_CALL createInstanceWithArguments( - OUString const & name, Sequence<Any> const & args ) - throw (Exception, std::exception) override; + OUString const & name, Sequence<Any> const & args ) override; }; CanvasFactory::CanvasFactory( Reference<XComponentContext> const & xContext ) : @@ -217,26 +212,23 @@ CanvasFactory::~CanvasFactory() // XServiceInfo -OUString CanvasFactory::getImplementationName() throw (RuntimeException, std::exception) +OUString CanvasFactory::getImplementationName() { return OUString("com.sun.star.comp.rendering.CanvasFactory"); } sal_Bool CanvasFactory::supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } Sequence<OUString> CanvasFactory::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return { "com.sun.star.rendering.CanvasFactory" }; } // XMultiComponentFactory Sequence<OUString> CanvasFactory::getAvailableServiceNames() - throw (RuntimeException, std::exception) { Sequence<OUString> aServiceNames(m_aAvailableImplementations.size()); std::transform(m_aAvailableImplementations.begin(), @@ -248,7 +240,6 @@ Sequence<OUString> CanvasFactory::getAvailableServiceNames() Reference<XInterface> CanvasFactory::createInstanceWithContext( OUString const & name, Reference<XComponentContext> const & xContext ) - throw (Exception, std::exception) { return createInstanceWithArgumentsAndContext( name, Sequence<Any>(), xContext ); @@ -453,7 +444,7 @@ Reference<XInterface> CanvasFactory::lookupAndUse( Reference<XInterface> CanvasFactory::createInstanceWithArgumentsAndContext( OUString const & preferredOne, Sequence<Any> const & args, - Reference<XComponentContext> const & xContext ) throw (Exception, std::exception) + Reference<XComponentContext> const & xContext ) { Reference<XInterface> xCanvas( lookupAndUse( preferredOne, args, xContext ) ); @@ -467,7 +458,6 @@ Reference<XInterface> CanvasFactory::createInstanceWithArgumentsAndContext( // XMultiServiceFactory Reference<XInterface> CanvasFactory::createInstance( OUString const & name ) - throw (Exception, std::exception) { return createInstanceWithArgumentsAndContext( name, Sequence<Any>(), m_xContext ); @@ -475,7 +465,7 @@ Reference<XInterface> CanvasFactory::createInstance( OUString const & name ) Reference<XInterface> CanvasFactory::createInstanceWithArguments( - OUString const & name, Sequence<Any> const & args ) throw (Exception, std::exception) + OUString const & name, Sequence<Any> const & args ) { return createInstanceWithArgumentsAndContext( name, args, m_xContext ); diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index 6b23d4504740..d16659896fc4 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -58,8 +58,7 @@ namespace oglcanvas CanvasCustomSpriteBaseT::disposeThis(); } - void SAL_CALL CanvasCustomSprite::setAlpha( double alpha ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::setAlpha( double alpha ) { canvas::tools::verifyRange( alpha, 0.0, 1.0 ); @@ -69,8 +68,7 @@ namespace oglcanvas void SAL_CALL CanvasCustomSprite::move( const geometry::RealPoint2D& aNewPos, const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + const rendering::RenderState& renderState ) { canvas::tools::verifyArgs(aNewPos, viewState, renderState, OSL_THIS_FUNC, @@ -87,39 +85,38 @@ namespace oglcanvas maPosition *= aTransform; } - void SAL_CALL CanvasCustomSprite::transform( const geometry::AffineMatrix2D& aTransformation ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::transform( const geometry::AffineMatrix2D& aTransformation ) { ::osl::MutexGuard aGuard( m_aMutex ); maTransformation = aTransformation; } - void SAL_CALL CanvasCustomSprite::clip( const uno::Reference< rendering::XPolyPolygon2D >& xClip ) throw (uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::clip( const uno::Reference< rendering::XPolyPolygon2D >& xClip ) { mxClip = xClip; } - void SAL_CALL CanvasCustomSprite::setPriority( double nPriority ) throw (uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::setPriority( double nPriority ) { ::osl::MutexGuard aGuard( m_aMutex ); mfPriority = nPriority; } - void SAL_CALL CanvasCustomSprite::show() throw (uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::show() { ::osl::MutexGuard aGuard( m_aMutex ); if( mpSpriteCanvas.is() ) mpSpriteCanvas->show(this); } - void SAL_CALL CanvasCustomSprite::hide() throw (uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::hide() { ::osl::MutexGuard aGuard( m_aMutex ); if( mpSpriteCanvas.is() ) mpSpriteCanvas->hide(this); } - uno::Reference< rendering::XCanvas > SAL_CALL CanvasCustomSprite::getContentCanvas() throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XCanvas > SAL_CALL CanvasCustomSprite::getContentCanvas() { return this; } diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx index bad063e19a71..c26d955c8ea6 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.hxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx @@ -63,16 +63,16 @@ namespace oglcanvas virtual void disposeThis() override; // XSprite - virtual void SAL_CALL setAlpha( double alpha ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPriority( double nPriority ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL show() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL hide() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAlpha( double alpha ) override; + virtual void SAL_CALL move( const css::geometry::RealPoint2D& aNewPos, const css::rendering::ViewState& viewState, const css::rendering::RenderState& renderState ) override; + virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) override; + virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) override; + virtual void SAL_CALL setPriority( double nPriority ) override; + virtual void SAL_CALL show() override; + virtual void SAL_CALL hide() override; // XCustomSprite - virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL getContentCanvas() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL getContentCanvas() override; double getPriority() const { return mfPriority; } diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx index e129a5c9e890..0434bb0856cb 100644 --- a/canvas/source/opengl/ogl_canvasfont.cxx +++ b/canvas/source/opengl/ogl_canvasfont.cxx @@ -31,33 +31,33 @@ namespace oglcanvas uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, - sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception) + sal_Int64 nRandomSeed ) { ::osl::MutexGuard aGuard( m_aMutex ); return new TextLayout( aText, nDirection, nRandomSeed, ImplRef( this ) ); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) { // TODO return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) { // TODO return uno::Sequence< beans::PropertyValue >(); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException, std::exception) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException, std::exception) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) { // TODO return rendering::FontMetrics(); diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx index 9aca57f7044a..1743bc3c985e 100644 --- a/canvas/source/opengl/ogl_canvasfont.hxx +++ b/canvas/source/opengl/ogl_canvasfont.hxx @@ -42,11 +42,11 @@ namespace oglcanvas const css::geometry::Matrix2D& fontMatrix ); // XCanvasFont - virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override; + virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) override; + virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) override; + virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) override; const css::geometry::Matrix2D& getFontMatrix() const { return maFontMatrix; } diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 8e9cbb8636ff..17ae212764b7 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -88,7 +88,7 @@ namespace oglcanvas SpriteCanvasBaseT::disposeThis(); } - sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -98,7 +98,7 @@ namespace oglcanvas return mbIsVisible && SpriteCanvasBaseT::showBuffer( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -109,44 +109,38 @@ namespace oglcanvas } uno::Reference< rendering::XAnimatedSprite > SAL_CALL SpriteCanvas::createSpriteFromAnimation( - const uno::Reference< rendering::XAnimation >& /*animation*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + const uno::Reference< rendering::XAnimation >& /*animation*/ ) { return uno::Reference< rendering::XAnimatedSprite >(); } uno::Reference< rendering::XAnimatedSprite > SAL_CALL SpriteCanvas::createSpriteFromBitmaps( const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, - ::sal_Int8 /*interpolationMode*/ ) throw (lang::IllegalArgumentException, - rendering::VolatileContentDestroyedException, - uno::RuntimeException, std::exception) + ::sal_Int8 /*interpolationMode*/ ) { return uno::Reference< rendering::XAnimatedSprite >(); } uno::Reference< rendering::XCustomSprite > SAL_CALL SpriteCanvas::createCustomSprite( - const geometry::RealSize2D& spriteSize ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + const geometry::RealSize2D& spriteSize ) { return uno::Reference< rendering::XCustomSprite >( new CanvasCustomSprite(spriteSize, this, maDeviceHelper) ); } uno::Reference< rendering::XSprite > SAL_CALL SpriteCanvas::createClonedSprite( - const uno::Reference< rendering::XSprite >& /*original*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + const uno::Reference< rendering::XSprite >& /*original*/ ) { return uno::Reference< rendering::XSprite >(); } sal_Bool SAL_CALL SpriteCanvas::updateScreen(sal_Bool bUpdateAll) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maDeviceHelper.showBuffer(mbIsVisible, bUpdateAll); } - ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException, std::exception) + ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) { return ::rtl::OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index 47e58254100c..202370bfd844 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -85,20 +85,18 @@ namespace oglcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) - virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override; + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override; // 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, std::exception) override; - 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, std::exception) override; - virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - 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, std::exception) override; - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) override; + virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) override; + virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) override; + virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) override; + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override; // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getServiceName( ) override; void show( const ::rtl::Reference< CanvasCustomSprite >& ); void hide( const ::rtl::Reference< CanvasCustomSprite >& ); diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx index c11815033586..0331c8c9d2ba 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -37,32 +37,32 @@ namespace oglcanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) { // TODO return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maLogicalAdvancements; } - void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -75,7 +75,7 @@ namespace oglcanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException, std::exception) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -101,27 +101,27 @@ namespace oglcanvas } } - double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::justify( double /*nSize*/ ) { // TODO return 0.0; } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, - double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double /*nSize*/ ) { // TODO return 0.0; } - rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException, std::exception) + rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) { // TODO return rendering::TextHit(); } rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return rendering::Caret(); @@ -129,47 +129,47 @@ namespace oglcanvas sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, sal_Int32 /*nCaretAdvancement*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return 0; } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::getBaselineOffset( ) { // TODO return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException, std::exception) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mnTextDirection; } - uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mpFont.get(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) + rendering::StringContext SAL_CALL TextLayout::getText( ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx index 168282adb1ff..c98cdcf5d465 100644 --- a/canvas/source/opengl/ogl_textlayout.hxx +++ b/canvas/source/opengl/ogl_textlayout.hxx @@ -43,23 +43,23 @@ namespace oglcanvas virtual void SAL_CALL disposing() override; // XTextLayout - virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getBaselineOffset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::StringContext SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) override; + virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) override; + virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override; + virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) override; + virtual double SAL_CALL justify( double nSize ) override; + virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override; + virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override; + virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override; + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual double SAL_CALL getBaselineOffset( ) override; + virtual sal_Int8 SAL_CALL getMainTextDirection( ) override; + virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; + virtual css::rendering::StringContext SAL_CALL getText( ) override; bool draw( const css::rendering::ViewState& rViewState, const css::rendering::RenderState& rRenderState, diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 613724558734..8d632ec4886a 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -171,7 +171,7 @@ namespace private: // Ifc XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getServiceName( ) override { return OUString( SERVICE_NAME ); } @@ -180,7 +180,7 @@ namespace virtual void SAL_CALL selectFont( const OUString& sFontName, double size, sal_Bool bold, - sal_Bool italic ) throw (uno::RuntimeException, std::exception) override + sal_Bool italic ) override { ::osl::MutexGuard aGuard( m_aMutex ); @@ -192,31 +192,31 @@ namespace italic ? rendering::PanoseLetterForm::OBLIQUE_CONTACT : rendering::PanoseLetterForm::ANYTHING; } - virtual void SAL_CALL setPenColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPenColor( ::sal_Int32 nsRgbaColor ) override { ::osl::MutexGuard aGuard( m_aMutex ); *(maRenderState.m_aPenColor) = nsRgbaColor; } - virtual void SAL_CALL setFillColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL setFillColor( ::sal_Int32 nsRgbaColor ) override { ::osl::MutexGuard aGuard( m_aMutex ); *(maRenderState.m_aFillColor) = nsRgbaColor; } - virtual void SAL_CALL setRectClip( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL setRectClip( const geometry::RealRectangle2D& aRect ) override { ::osl::MutexGuard aGuard( m_aMutex ); *(maRenderState.m_aRectClip) = aRect; } - virtual void SAL_CALL setTransformation( const geometry::AffineMatrix2D& aTransform ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL setTransformation( const geometry::AffineMatrix2D& aTransform ) override { ::osl::MutexGuard aGuard( m_aMutex ); maRenderState.m_aTransformation = aTransform; } - virtual void SAL_CALL drawPixel( const geometry::RealPoint2D& aPoint ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL drawPixel( const geometry::RealPoint2D& aPoint ) override { ::osl::MutexGuard aGuard( m_aMutex ); mxCanvas->drawPoint(aPoint, @@ -225,7 +225,7 @@ namespace } virtual void SAL_CALL drawLine( const geometry::RealPoint2D& aStartPoint, - const geometry::RealPoint2D& aEndPoint ) throw (uno::RuntimeException, std::exception) override + const geometry::RealPoint2D& aEndPoint ) override { ::osl::MutexGuard aGuard( m_aMutex ); mxCanvas->drawLine(aStartPoint, @@ -234,7 +234,7 @@ namespace createStrokingRenderState()); } - virtual void SAL_CALL drawRect( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL drawRect( const geometry::RealRectangle2D& aRect ) override { ::osl::MutexGuard aGuard( m_aMutex ); uno::Reference< rendering::XPolyPolygon2D > xPoly( @@ -251,8 +251,7 @@ namespace createStrokingRenderState()); } - virtual void SAL_CALL drawPolyPolygon( const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon ) - throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL drawPolyPolygon( const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon ) override { ::osl::MutexGuard aGuard( m_aMutex ); @@ -268,7 +267,7 @@ namespace virtual void SAL_CALL drawText( const rendering::StringContext& aText, const geometry::RealPoint2D& aOutPos, - ::sal_Int8 nTextDirection ) throw (uno::RuntimeException, std::exception) override + ::sal_Int8 nTextDirection ) override { ::osl::MutexGuard aGuard( m_aMutex ); const basegfx::B2DHomMatrix offsetTransform(basegfx::tools::createTranslateB2DHomMatrix(aOutPos.X,aOutPos.Y)); @@ -283,8 +282,7 @@ namespace } virtual void SAL_CALL drawBitmap( const uno::Reference< rendering::XBitmap >& xBitmap, - const geometry::RealPoint2D& aLeftTop ) - throw (uno::RuntimeException, std::exception) override + const geometry::RealPoint2D& aLeftTop ) override { ::osl::MutexGuard aGuard( m_aMutex ); const basegfx::B2DHomMatrix offsetTransform(basegfx::tools::createTranslateB2DHomMatrix(aLeftTop.X,aLeftTop.Y)); @@ -294,61 +292,61 @@ namespace mxCanvas->drawBitmap(xBitmap,maViewState,aRenderState); } - virtual uno::Reference< rendering::XGraphicDevice > SAL_CALL getDevice( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< rendering::XGraphicDevice > SAL_CALL getDevice( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return mxCanvas->getDevice(); } - virtual uno::Reference< rendering::XCanvas > SAL_CALL getCanvas( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< rendering::XCanvas > SAL_CALL getCanvas( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return mxCanvas; } - virtual rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (uno::RuntimeException, std::exception) override + virtual rendering::FontMetrics SAL_CALL getFontMetrics( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maFont.getOutValue()->getFontMetrics(); } - virtual uno::Reference< rendering::XCanvasFont > SAL_CALL getCurrentFont( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< rendering::XCanvasFont > SAL_CALL getCurrentFont( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maFont.getOutValue(); } - virtual ::sal_Int32 SAL_CALL getCurrentPenColor( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCurrentPenColor( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aPenColor.getInValue(); } - virtual ::sal_Int32 SAL_CALL getCurrentFillColor( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCurrentFillColor( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aFillColor.getInValue(); } - virtual geometry::RealRectangle2D SAL_CALL getCurrentClipRect( ) throw (uno::RuntimeException, std::exception) override + virtual geometry::RealRectangle2D SAL_CALL getCurrentClipRect( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aRectClip.getInValue(); } - virtual geometry::AffineMatrix2D SAL_CALL getCurrentTransformation( ) throw (uno::RuntimeException, std::exception) override + virtual geometry::AffineMatrix2D SAL_CALL getCurrentTransformation( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aTransformation; } - virtual rendering::ViewState SAL_CALL getCurrentViewState( ) throw (uno::RuntimeException, std::exception) override + virtual rendering::ViewState SAL_CALL getCurrentViewState( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maViewState; } - virtual rendering::RenderState SAL_CALL getCurrentRenderState( sal_Bool bUseFillColor ) throw (uno::RuntimeException, std::exception) override + virtual rendering::RenderState SAL_CALL getCurrentRenderState( sal_Bool bUseFillColor ) override { ::osl::MutexGuard aGuard( m_aMutex ); if( bUseFillColor ) diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index e185bf969a0e..d84e96495828 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -51,7 +51,7 @@ namespace canvas mxTarget.clear(); } - sal_Int8 SAL_CALL CachedPrimitiveBase::redraw( const rendering::ViewState& aState ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + sal_Int8 SAL_CALL CachedPrimitiveBase::redraw( const rendering::ViewState& aState ) { ::basegfx::B2DHomMatrix aUsedTransformation; ::basegfx::B2DHomMatrix aNewTransformation; @@ -76,17 +76,17 @@ namespace canvas bSameViewTransforms ); } - OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) { return OUString("canvas::CachedPrimitiveBase"); } - sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) { return { "com.sun.star.rendering.CachedBitmap" }; } diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index fdf8ab7729a9..7ab36a8ed2e4 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -184,25 +184,24 @@ namespace canvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -210,7 +209,7 @@ namespace canvas convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -227,7 +226,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override { SAL_WARN_IF(deviceColor.getLength() == 0, "canvas", "empty deviceColor argument"); const double* pIn( deviceColor.getConstArray() ); @@ -245,7 +244,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -262,7 +261,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -279,7 +278,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -296,7 +295,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -315,21 +314,20 @@ namespace canvas } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getEndianness( ) override { return util::Endianness::LITTLE; } virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { if( dynamic_cast<StandardColorSpace*>(targetColorSpace.get()) ) { @@ -360,8 +358,7 @@ namespace canvas } } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override { if( dynamic_cast<StandardColorSpace*>(targetColorSpace.get()) ) { @@ -377,7 +374,7 @@ namespace canvas return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -398,7 +395,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -420,7 +417,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -443,7 +440,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -461,7 +458,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -479,7 +476,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -522,25 +519,24 @@ namespace canvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -548,7 +544,7 @@ namespace canvas convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -565,7 +561,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -582,7 +578,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -599,7 +595,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -616,7 +612,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -633,7 +629,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -652,21 +648,20 @@ namespace canvas } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getEndianness( ) override { return util::Endianness::LITTLE; } virtual uno::Sequence<double> SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { if( dynamic_cast<StandardNoAlphaColorSpace*>(targetColorSpace.get()) ) { @@ -697,8 +692,7 @@ namespace canvas } } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override { if( dynamic_cast<StandardNoAlphaColorSpace*>(targetColorSpace.get()) ) { @@ -714,7 +708,7 @@ namespace canvas return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -735,7 +729,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -757,7 +751,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -779,7 +773,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -797,7 +791,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -815,7 +809,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index 05697d8e2a8d..d5bed4381921 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -164,25 +164,25 @@ namespace canvas mxDevice.clear(); } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL ParametricPolyPolygon::getOutline( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL ParametricPolyPolygon::getOutline( double /*t*/ ) { // TODO(F1): outline NYI return uno::Reference< rendering::XPolyPolygon2D >(); } - uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getColor( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getColor( double /*t*/ ) { // TODO(F1): color NYI return uno::Sequence< double >(); } - uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getPointColor( const geometry::RealPoint2D& /*point*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getPointColor( const geometry::RealPoint2D& /*point*/ ) { // TODO(F1): point color NYI return uno::Sequence< double >(); } - uno::Reference< rendering::XColorSpace > SAL_CALL ParametricPolyPolygon::getColorSpace() throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XColorSpace > SAL_CALL ParametricPolyPolygon::getColorSpace() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -190,17 +190,17 @@ namespace canvas } - OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) { return OUString( "Canvas::ParametricPolyPolygon" ); } - sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) { return { "com.sun.star.rendering.ParametricPolyPolygon" }; } diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index bd3f89d7e21b..cb65127e4d37 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -129,7 +129,7 @@ namespace vclcanvas CanvasBaseT::disposeThis(); } - OUString SAL_CALL Canvas::getServiceName( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL Canvas::getServiceName( ) { return OUString( CANVAS_SERVICE_NAME ); } diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index d4ae09097002..225ca2a7f1f4 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -100,7 +100,7 @@ namespace vclcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName( ) override; // RepaintTarget virtual bool repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index 84b3adc7ef0b..9126fc5c0666 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -74,17 +74,17 @@ namespace vclcanvas } - OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL CanvasBitmap::getImplementationName( ) { return OUString( "VCLCanvas.CanvasBitmap" ); } - sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) { return { "com.sun.star.rendering.CanvasBitmap" }; } @@ -112,7 +112,7 @@ namespace vclcanvas return maCanvasHelper.repaint( rGrf, viewState, renderState, rPt, rSz, rAttr ); } - uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) { if( nHandle == 0 ) { BitmapEx* pBitmapEx = new BitmapEx( getBitmap() ); diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 543d80e3fa1b..ca0cbaaa9bab 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -82,9 +82,9 @@ namespace vclcanvas const OutDevProviderSharedPtr& rOutDevProvider ); // 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; // RepaintTarget interface virtual bool repaint( const GraphicObjectSharedPtr& rGrf, @@ -107,8 +107,8 @@ namespace vclcanvas // 1st a bool value: true - free the pixmap after used by XFreePixmap, false do nothing, the pixmap is used internally in the canvas // 2nd the pixmap handle // 3rd the pixmap depth - virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override {} + virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override; + virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {} private: /** MUST hold here, too, since CanvasHelper only contains a diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index acff95a08810..e8ee7752cc0d 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -115,17 +115,17 @@ namespace vclcanvas maCanvasHelper.clear(); } - OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL CanvasCustomSprite::getImplementationName() { return OUString( "VCLCanvas.CanvasCustomSprite" ); } - sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasCustomSprite" }; } diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index 43283e2f8629..4075200328bf 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -99,9 +99,9 @@ namespace vclcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) // 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; // Sprite virtual void redraw( OutputDevice& rOutDev, diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index da901cce4d97..94798710f829 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -92,7 +92,7 @@ namespace vclcanvas mpRefDevice.clear(); } - uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) { SolarMutexGuard aGuard; @@ -107,14 +107,14 @@ namespace vclcanvas mpOutDevProvider); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException, std::exception) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) { SolarMutexGuard aGuard; return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException, std::exception) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) { SolarMutexGuard aGuard; @@ -133,29 +133,29 @@ namespace vclcanvas aMetric.GetAscent() / 2.0); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) { // TODO(F1) return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) { // TODO(F1) return uno::Sequence< beans::PropertyValue >(); } - OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL CanvasFont::getImplementationName() { return OUString( "VCLCanvas::CanvasFont" ); } - sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasFont" }; } diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx index b17126222b7d..83c37deeed34 100644 --- a/canvas/source/vcl/canvasfont.hxx +++ b/canvas/source/vcl/canvasfont.hxx @@ -64,16 +64,16 @@ namespace vclcanvas virtual void SAL_CALL disposing() override; // XCanvasFont - virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override; + virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) override; + virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) override; + virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) 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; vcl::Font getVCLFont() const; diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 268ff3766981..11a6ca5e27c1 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -119,17 +119,17 @@ namespace vclcanvas SpriteCanvasBaseT::disposeThis(); } - sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) { return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) { return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) { SolarMutexGuard aGuard; @@ -140,7 +140,7 @@ namespace vclcanvas mbSurfaceDirty); } - OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL SpriteCanvas::getServiceName( ) { return OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index f339eead496e..b6f2bd5c6db8 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -125,14 +125,14 @@ namespace vclcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) - virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override; + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override; // XSpriteCanvas (partial) - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override; // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName( ) override; // RepaintTarget virtual bool repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 67520a399b15..bdab9f9a6fab 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -99,7 +99,7 @@ namespace vclcanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) { SolarMutexGuard aGuard; @@ -150,7 +150,7 @@ namespace vclcanvas return comphelper::containerToSequence(aOutlineSequence); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) { SolarMutexGuard aGuard; @@ -202,20 +202,20 @@ namespace vclcanvas return aBoundingBoxes; } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) { // TODO(F1) return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) { SolarMutexGuard aGuard; return maLogicalAdvancements; } - void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) { SolarMutexGuard aGuard; @@ -225,7 +225,7 @@ namespace vclcanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException, std::exception) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) { SolarMutexGuard aGuard; @@ -263,7 +263,7 @@ namespace vclcanvas } } - double SAL_CALL TextLayout::justify( double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::justify( double nSize ) { (void)nSize; @@ -272,7 +272,7 @@ namespace vclcanvas } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& aNextLayouts, - double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double nSize ) { (void)aNextLayouts; (void)nSize; @@ -281,7 +281,7 @@ namespace vclcanvas return 0.0; } - rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& aHitPoint ) throw (uno::RuntimeException, std::exception) + rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& aHitPoint ) { (void)aHitPoint; @@ -289,7 +289,7 @@ namespace vclcanvas return rendering::TextHit(); } - rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) { (void)nInsertionIndex; (void)bExcludeLigatures; @@ -298,7 +298,7 @@ namespace vclcanvas return rendering::Caret(); } - sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) { (void)nStartIndex; (void)nCaretAdvancement; @@ -308,7 +308,7 @@ namespace vclcanvas return 0; } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { (void)nStartIndex; (void)nEndIndex; @@ -317,7 +317,7 @@ namespace vclcanvas return uno::Reference< rendering::XPolyPolygon2D >(); } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { (void)nStartIndex; (void)nEndIndex; @@ -326,27 +326,27 @@ namespace vclcanvas return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::getBaselineOffset( ) { // TODO(F1) return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException, std::exception) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) { SolarMutexGuard aGuard; return mnTextDirection; } - uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) { SolarMutexGuard aGuard; return mpFont.get(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) + rendering::StringContext SAL_CALL TextLayout::getText( ) { SolarMutexGuard aGuard; @@ -441,17 +441,17 @@ namespace vclcanvas OffsetTransformer( aMatrix ) ); } - OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL TextLayout::getImplementationName() { return OUString( "VCLCanvas::TextLayout" ); } - sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() { return { "com.sun.star.rendering.TextLayout" }; } diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx index 713397045644..9994ac70ff6d 100644 --- a/canvas/source/vcl/textlayout.hxx +++ b/canvas/source/vcl/textlayout.hxx @@ -60,28 +60,28 @@ namespace vclcanvas virtual void SAL_CALL disposing() override; // XTextLayout - virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getBaselineOffset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::StringContext SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) override; + virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) override; + virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override; + virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) override; + virtual double SAL_CALL justify( double nSize ) override; + virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override; + virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override; + virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override; + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual double SAL_CALL getBaselineOffset( ) override; + virtual sal_Int8 SAL_CALL getMainTextDirection( ) override; + virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; + virtual css::rendering::StringContext SAL_CALL getText( ) 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; bool draw( OutputDevice& rOutDev, const Point& rOutpos, |