summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-13 13:09:44 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-13 14:56:20 +0000
commit2d72cfb5027bdab62ca4b509dd4aa1397bf56bf0 (patch)
tree9c450ec7e28605a870847b82a3a47a3a0b930606
parentbeb0a165ec7577c0012b6d183f1046cd7cfb3026 (diff)
coverity#737151 Uncaught exception
Change-Id: I133012cf88020e38eb0fc0932979347b996943fe
-rw-r--r--forms/source/richtext/richtextcontrol.cxx4
-rw-r--r--forms/source/richtext/richtextcontrol.hxx4
-rw-r--r--include/toolkit/awt/vclxwindow.hxx4
-rw-r--r--toolkit/source/awt/vclxwindow.cxx4
4 files changed, 12 insertions, 4 deletions
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index aa89f898be4a..80cae8b7f1ad 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -392,7 +392,9 @@ namespace frm
}
//--------------------------------------------------------------------
- void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue ) throw (RuntimeException)
+ void SAL_CALL ORichTextPeer::setProperty( const OUString& _rPropertyName, const Any& _rValue )
+ throw (RuntimeException,
+ std::exception)
{
if ( !GetWindow() )
{
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index 5888deff7792..fb1a1f669384 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -119,7 +119,9 @@ namespace frm
void SAL_CALL draw( sal_Int32 nX, sal_Int32 nY ) throw(::com::sun::star::uno::RuntimeException);
// XVclWindowPeer
- virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setProperty( const OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rValue )
+ throw (::com::sun::star::uno::RuntimeException,
+ std::exception);
// XTypeProvider
DECLARE_XTYPEPROVIDER( )
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 21cf84212150..c28bfbb355a2 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -183,7 +183,9 @@ public:
void SAL_CALL setForeground( sal_Int32 Color ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL setControlFont( const ::com::sun::star::awt::FontDescriptor& aFont ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL getStyles( sal_Int16 nType, ::com::sun::star::awt::FontDescriptor& Font, sal_Int32& ForegroundColor, sal_Int32& BackgroundColor ) throw(::com::sun::star::uno::RuntimeException);
- void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
+ void SAL_CALL setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value )
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception);
::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::awt::XLayoutConstrains
diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 5b4d51e89b28..a994d7f85c5c 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1406,7 +1406,9 @@ namespace
}
}
-void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException)
+void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::star::uno::Any& Value )
+ throw(::com::sun::star::uno::RuntimeException,
+ std::exception)
{
SolarMutexGuard aGuard;