summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /drawinglayer
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx16
-rw-r--r--drawinglayer/source/primitive2d/baseprimitive2d.cxx4
-rw-r--r--drawinglayer/source/primitive3d/baseprimitive3d.cxx4
3 files changed, 12 insertions, 12 deletions
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
index 128d0ff98d1d..3883044ce8d4 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
@@ -61,12 +61,12 @@ namespace drawinglayer
::sal_uInt32 DPI_X,
::sal_uInt32 DPI_Y,
const ::com::sun::star::geometry::RealRectangle2D& Range,
- ::sal_uInt32 MaximumQuadraticPixels) throw (uno::RuntimeException);
+ ::sal_uInt32 MaximumQuadraticPixels) throw (uno::RuntimeException, std::exception);
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException);
- virtual ::sal_Bool SAL_CALL supportsService(const OUString&) throw(uno::RuntimeException);
- virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw(uno::RuntimeException, std::exception);
+ virtual ::sal_Bool SAL_CALL supportsService(const OUString&) throw(uno::RuntimeException, std::exception);
+ virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(uno::RuntimeException, std::exception);
};
} // end of namespace unorenderer
} // end of namespace drawinglayer
@@ -118,7 +118,7 @@ namespace drawinglayer
::sal_uInt32 DPI_X,
::sal_uInt32 DPI_Y,
const ::com::sun::star::geometry::RealRectangle2D& Range,
- ::sal_uInt32 MaximumQuadraticPixels) throw (uno::RuntimeException)
+ ::sal_uInt32 MaximumQuadraticPixels) throw (uno::RuntimeException, std::exception)
{
uno::Reference< rendering::XBitmap > XBitmap;
@@ -187,17 +187,17 @@ namespace drawinglayer
return XBitmap;
}
- OUString SAL_CALL XPrimitive2DRenderer::getImplementationName() throw(uno::RuntimeException)
+ OUString SAL_CALL XPrimitive2DRenderer::getImplementationName() throw(uno::RuntimeException, std::exception)
{
return(XPrimitive2DRenderer_getImplementationName());
}
- sal_Bool SAL_CALL XPrimitive2DRenderer::supportsService(const OUString& rServiceName) throw(uno::RuntimeException)
+ sal_Bool SAL_CALL XPrimitive2DRenderer::supportsService(const OUString& rServiceName) throw(uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
- uno::Sequence< OUString > SAL_CALL XPrimitive2DRenderer::getSupportedServiceNames() throw(uno::RuntimeException)
+ uno::Sequence< OUString > SAL_CALL XPrimitive2DRenderer::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
{
return XPrimitive2DRenderer_getSupportedServiceNames();
}
diff --git a/drawinglayer/source/primitive2d/baseprimitive2d.cxx b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
index ec348074ee8b..f0dcf4778e7a 100644
--- a/drawinglayer/source/primitive2d/baseprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/baseprimitive2d.cxx
@@ -55,13 +55,13 @@ namespace drawinglayer
return Primitive2DSequence();
}
- Primitive2DSequence SAL_CALL BasePrimitive2D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException )
+ Primitive2DSequence SAL_CALL BasePrimitive2D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
{
const geometry::ViewInformation2D aViewInformation(rViewParameters);
return get2DDecomposition(aViewInformation);
}
- com::sun::star::geometry::RealRectangle2D SAL_CALL BasePrimitive2D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException )
+ com::sun::star::geometry::RealRectangle2D SAL_CALL BasePrimitive2D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
{
const geometry::ViewInformation2D aViewInformation(rViewParameters);
return basegfx::unotools::rectangle2DFromB2DRectangle(getB2DRange(aViewInformation));
diff --git a/drawinglayer/source/primitive3d/baseprimitive3d.cxx b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
index 2e888cd4fcef..7dce9608d7f7 100644
--- a/drawinglayer/source/primitive3d/baseprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/baseprimitive3d.cxx
@@ -55,13 +55,13 @@ namespace drawinglayer
return Primitive3DSequence();
}
- Primitive3DSequence SAL_CALL BasePrimitive3D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException )
+ Primitive3DSequence SAL_CALL BasePrimitive3D::getDecomposition( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
{
const geometry::ViewInformation3D aViewInformation(rViewParameters);
return get3DDecomposition(aViewInformation);
}
- com::sun::star::geometry::RealRectangle3D SAL_CALL BasePrimitive3D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException )
+ com::sun::star::geometry::RealRectangle3D SAL_CALL BasePrimitive3D::getRange( const uno::Sequence< beans::PropertyValue >& rViewParameters ) throw ( uno::RuntimeException, std::exception )
{
const geometry::ViewInformation3D aViewInformation(rViewParameters);
return basegfx::unotools::rectangle3DFromB3DRectangle(getB3DRange(aViewInformation));