summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-01-29 15:37:15 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-01-29 16:41:32 +0000
commit9bd0e895a4c937f1f831aab1cca6f2e94387260b (patch)
treecfc543fd34317c85246e169d4100ca3d6b8429ab
parentcoverity#1079001 Uncaught exception (diff)
downloadcore-9bd0e895a4c937f1f831aab1cca6f2e94387260b.tar.gz
core-9bd0e895a4c937f1f831aab1cca6f2e94387260b.zip
coverity#1079000 Uncaught exception
Change-Id: I7ffee42abe03c34d68b6168328143666d72e7efc
-rw-r--r--comphelper/source/property/propertycontainer.cxx3
-rw-r--r--include/comphelper/propertycontainer.hxx3
-rw-r--r--include/cppuhelper/propshlp.hxx3
-rw-r--r--sc/inc/chartuno.hxx3
-rw-r--r--sc/source/ui/unoobj/chartuno.cxx3
5 files changed, 10 insertions, 5 deletions
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index 89fc64cf45c6..a322ff1b1cee 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.cxx
@@ -77,7 +77,8 @@ sal_Bool OPropertyContainer::convertFastPropertyValue(
}
//--------------------------------------------------------------------------
-void OPropertyContainer::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception)
+void OPropertyContainer::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue)
+ throw (Exception, std::exception)
{
OPropertyContainerHelper::setFastPropertyValue( _nHandle, _rValue );
}
diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index e34822564a40..a594b71e9ea2 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -67,7 +67,8 @@ protected:
sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue
)
- throw (::com::sun::star::uno::Exception);
+ throw (::com::sun::star::uno::Exception,
+ std::exception);
using OPropertyContainer_Base::getFastPropertyValue;
virtual void SAL_CALL getFastPropertyValue(
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index bc01cbccb2b2..6bbf67130dfc 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -603,7 +603,8 @@ protected:
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(
sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue )
- throw (::com::sun::star::uno::Exception) = 0;
+ throw (::com::sun::star::uno::Exception,
+ std::exception) = 0;
/**
The same as getFastProperyValue, but return the value through rValue and nHandle
is always valid.
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index c4030487493d..317e9ca5dc9d 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -135,7 +135,8 @@ protected:
// ::comphelper::OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue )
- throw (::com::sun::star::uno::Exception);
+ throw (::com::sun::star::uno::Exception,
+ std::exception);
using ::cppu::OPropertySetHelper::getFastPropertyValue;
virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle ) const;
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index b3bed22b39ff..cbd44d8cba64 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -560,7 +560,8 @@ void ScChartObj::Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, b
return *ScChartObj_PABase::getArrayHelper();
}
-void ScChartObj::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception)
+void ScChartObj::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue )
+ throw (uno::Exception, std::exception)
{
switch ( nHandle )
{