diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-06-29 12:30:41 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-29 12:58:06 +0100 |
commit | c921885cfd7119fcdbec92f4106890d6ce0ad9c2 (patch) | |
tree | c424088a1532d031cfdba0bb4b733997f58f8a13 | |
parent | 16f8348f366e27cc34d67cb8c075f0489bc9f63d (diff) |
coverity#1308463 Uncaught exception
Change-Id: If0308eb0068951af425cb691672b915decc384a2
-rw-r--r-- | include/svx/unoapi.hxx | 4 | ||||
-rw-r--r-- | svx/source/unodraw/unoprov.cxx | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx index 076f6295f895..1d4fd75efe23 100644 --- a/include/svx/unoapi.hxx +++ b/include/svx/unoapi.hxx @@ -82,14 +82,14 @@ SVX_DLLPUBLIC bool SvxFieldUnitToMeasureUnit( const FieldUnit nVcl, short& eApi * the corresponding API name. */ SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString - SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(); + SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(std::exception); /** * If the given name is a predefined API name it is replaced by the predefined name * for the current language. */ SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString - SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(); + SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(std::exception); #endif // INCLUDED_SVX_UNOAPI_HXX diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 3196ced5b3c8..2acaf80d1fc0 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -1126,7 +1126,7 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI return true; } -bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString ) throw() +bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount, OUString& rString ) throw(std::exception) { // first, calculate the search string length without an optional number behind the name sal_Int32 nLength = rString.getLength(); @@ -1281,7 +1281,7 @@ static const sal_uInt16 SvxUnoColorNameResId[] = -bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw() +bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uInt16* pDestResIds, int nCount, OUString& rString ) throw (std::exception) { //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't //replace "Red Hat 1" with the translation of Red :-) @@ -1312,7 +1312,7 @@ bool SvxUnoConvertResourceString( const sal_uInt16* pSourceResIds, const sal_uIn /** if the given name is a predefined name for the current language it is replaced by the corresponding api name. */ -OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw() +OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rInternalName) throw(std::exception) { OUString aNew = rInternalName; @@ -1345,7 +1345,7 @@ OUString SvxUnogetApiNameForItem(const sal_Int16 nWhich, const OUString& rIntern /** if the given name is a predefined api name it is replaced by the predefined name for the current language. */ -OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw() +OUString SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw(std::exception) { OUString aNew = rApiName; |