diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /cppcanvas/source/uno | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'cppcanvas/source/uno')
| -rw-r--r-- | cppcanvas/source/uno/uno_mtfrenderer.cxx | 6 | ||||
| -rw-r--r-- | cppcanvas/source/uno/uno_mtfrenderer.hxx | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cppcanvas/source/uno/uno_mtfrenderer.cxx b/cppcanvas/source/uno/uno_mtfrenderer.cxx index 8fa7199933ca..4a9cc0937666 100644 --- a/cppcanvas/source/uno/uno_mtfrenderer.cxx +++ b/cppcanvas/source/uno/uno_mtfrenderer.cxx @@ -14,12 +14,12 @@ using namespace ::com::sun::star; -void MtfRenderer::setMetafile (const uno::Sequence< sal_Int8 >& /*rMtf*/) throw (uno::RuntimeException) +void MtfRenderer::setMetafile (const uno::Sequence< sal_Int8 >& /*rMtf*/) throw (uno::RuntimeException, std::exception) { // printf ("MtfRenderer::setMetafile unimplemented, use fast property set or implement me\n"); } -void MtfRenderer::draw (double fScaleX, double fScaleY) throw (uno::RuntimeException) +void MtfRenderer::draw (double fScaleX, double fScaleY) throw (uno::RuntimeException, std::exception) { if (mpMetafile && mxCanvas.get()) { cppcanvas::VCLFactory& factory = cppcanvas::VCLFactory::getInstance(); @@ -32,7 +32,7 @@ void MtfRenderer::draw (double fScaleX, double fScaleY) throw (uno::RuntimeExcep } } -void MtfRenderer::setFastPropertyValue( sal_Int32 nHandle, const uno::Any& aAny) throw (uno::RuntimeException) +void MtfRenderer::setFastPropertyValue( sal_Int32 nHandle, const uno::Any& aAny) throw (uno::RuntimeException, std::exception) { if (nHandle == 0) { mpMetafile = (GDIMetaFile*) *reinterpret_cast<const sal_Int64*>(aAny.getValue()); diff --git a/cppcanvas/source/uno/uno_mtfrenderer.hxx b/cppcanvas/source/uno/uno_mtfrenderer.hxx index afd9e82a8676..5e72fdc7d034 100644 --- a/cppcanvas/source/uno/uno_mtfrenderer.hxx +++ b/cppcanvas/source/uno/uno_mtfrenderer.hxx @@ -26,13 +26,13 @@ public: com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&); // XMtfRenderer iface - void SAL_CALL setMetafile (const ::com::sun::star::uno::Sequence< sal_Int8 >& rMtf) throw (::com::sun::star::uno::RuntimeException); - void SAL_CALL draw (double fScaleX, double fScaleY) throw (::com::sun::star::uno::RuntimeException); + void SAL_CALL setMetafile (const ::com::sun::star::uno::Sequence< sal_Int8 >& rMtf) throw (::com::sun::star::uno::RuntimeException, std::exception); + void SAL_CALL draw (double fScaleX, double fScaleY) throw (::com::sun::star::uno::RuntimeException, std::exception); // XFastPropertySet // setFastPropertyValue (0, GDIMetaFile*) is used to speedup the rendering - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) throw (::com::sun::star::uno::RuntimeException) { return ::com::sun::star::uno::Any(); } - virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 /*nHandle*/) throw (::com::sun::star::uno::RuntimeException, std::exception) { return ::com::sun::star::uno::Any(); } + virtual void SAL_CALL setFastPropertyValue(sal_Int32 nHandle, const ::com::sun::star::uno::Any&) throw (::com::sun::star::uno::RuntimeException, std::exception); private: GDIMetaFile* mpMetafile; |