summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-17 09:52:45 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-10-17 15:19:54 +0100
commitb520fca88d29bb130115224317bf6b627b5a7c54 (patch)
tree01d8911303603ae4714ada6da247c2933dc67df8
parentf5b1b266bc0164b0c69a7c36bb1deed0e451efce (diff)
coverity#1247647 Uncaught exception
Change-Id: I1e47f3970f944aa3556e4ddb9b7918d9ee23c0eb
-rw-r--r--chart2/source/controller/inc/GraphicPropertyItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/ItemConverter.hxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx2
4 files changed, 4 insertions, 4 deletions
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 0310add98428..adf598ee5cd2 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -58,7 +58,7 @@ protected:
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const SAL_OVERRIDE;
virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
+ throw (css::uno::Exception, std::exception) SAL_OVERRIDE;
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
throw( ::com::sun::star::uno::Exception ) SAL_OVERRIDE;
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 4d3e21571f17..e2623c3be12f 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -148,7 +148,7 @@ protected:
The default implementation does nothing except showing an assertion
*/
virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( ::com::sun::star::uno::Exception );
+ throw (css::uno::Exception, std::exception);
/** for items that can not be mapped directly to a property.
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 565aafd27cd9..a513e99e75c4 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -234,7 +234,7 @@ bool GraphicPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tProp
void GraphicPropertyItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
+ throw (uno::Exception, std::exception)
{
switch( nWhichId )
{
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 1e0e5a50536d..9574f36f7775 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -150,7 +150,7 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
void ItemConverter::FillSpecialItem(
sal_uInt16 /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const
- throw( uno::Exception )
+ throw (uno::Exception, std::exception)
{
OSL_FAIL( "ItemConverter: Unhandled special item found!" );
}