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 /i18npool/source/nativenumber | |
parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'i18npool/source/nativenumber')
-rw-r--r-- | i18npool/source/nativenumber/nativenumbersupplier.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index d4ec4331c56c..3883840ab167 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -598,7 +598,7 @@ OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString& aN } OUString SAL_CALL NativeNumberSupplier::getNativeNumberString(const OUString& aNumberString, const Locale& rLocale, - sal_Int16 nNativeNumberMode) throw (RuntimeException) + sal_Int16 nNativeNumberMode) throw (RuntimeException, std::exception) { Sequence< sal_Int32 > offset; return getNativeNumberString(aNumberString, rLocale, nNativeNumberMode, offset); @@ -638,7 +638,7 @@ sal_Unicode SAL_CALL NativeNumberSupplier::getNativeNumberChar( const sal_Unicod return inChar; } -sal_Bool SAL_CALL NativeNumberSupplier::isValidNatNum( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException) +sal_Bool SAL_CALL NativeNumberSupplier::isValidNatNum( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception) { sal_Int16 langnum = getLanguageNumber(rLocale); @@ -665,7 +665,7 @@ sal_Bool SAL_CALL NativeNumberSupplier::isValidNatNum( const Locale& rLocale, sa return sal_False; } -NativeNumberXmlAttributes SAL_CALL NativeNumberSupplier::convertToXmlAttributes( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException) +NativeNumberXmlAttributes SAL_CALL NativeNumberSupplier::convertToXmlAttributes( const Locale& rLocale, sal_Int16 nNativeNumberMode ) throw (RuntimeException, std::exception) { static const sal_Int16 attShort = 0; static const sal_Int16 attMedium = 1; @@ -741,7 +741,7 @@ static sal_Bool natNumIn(sal_Int16 num, const sal_Int16 natnum[], sal_Int16 len) return sal_False; } -sal_Int16 SAL_CALL NativeNumberSupplier::convertFromXmlAttributes( const NativeNumberXmlAttributes& aAttr ) throw (RuntimeException) +sal_Int16 SAL_CALL NativeNumberSupplier::convertFromXmlAttributes( const NativeNumberXmlAttributes& aAttr ) throw (RuntimeException, std::exception) { sal_Unicode numberChar[NumberChar_Count]; for (sal_Int16 i = 0; i < NumberChar_Count; i++) @@ -889,19 +889,19 @@ OUString SAL_CALL getHebrewNativeNumberString(const OUString& aNumberString, sal static const sal_Char* implementationName = "com.sun.star.i18n.NativeNumberSupplier"; -OUString SAL_CALL NativeNumberSupplier::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL NativeNumberSupplier::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii( implementationName ); } sal_Bool SAL_CALL -NativeNumberSupplier::supportsService(const OUString& rServiceName) throw( RuntimeException ) +NativeNumberSupplier::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -NativeNumberSupplier::getSupportedServiceNames() throw( RuntimeException ) +NativeNumberSupplier::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii( implementationName ); |