summaryrefslogtreecommitdiff
path: root/i18npool/source/textconversion
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /i18npool/source/textconversion
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'i18npool/source/textconversion')
-rw-r--r--i18npool/source/textconversion/textconversion.cxx6
-rw-r--r--i18npool/source/textconversion/textconversionImpl.cxx14
-rw-r--r--i18npool/source/textconversion/textconversion_ko.cxx8
-rw-r--r--i18npool/source/textconversion/textconversion_zh.cxx8
4 files changed, 18 insertions, 18 deletions
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index 2f44cf2ab23a..aec186e016cf 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.cxx
@@ -71,19 +71,19 @@ TextConversion::getFunctionBySymbol(const sal_Char* func)
#endif
OUString SAL_CALL
-TextConversion::getImplementationName() throw( RuntimeException )
+TextConversion::getImplementationName() throw( RuntimeException, std::exception )
{
return OUString::createFromAscii(implementationName);
}
sal_Bool SAL_CALL
-TextConversion::supportsService(const OUString& rServiceName) throw( RuntimeException )
+TextConversion::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL
-TextConversion::getSupportedServiceNames() throw( RuntimeException )
+TextConversion::getSupportedServiceNames() throw( RuntimeException, std::exception )
{
Sequence< OUString > aRet(1);
aRet[0] = OUString::createFromAscii(implementationName);
diff --git a/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index 00e1480561ed..3e916385716d 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.cxx
@@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace i18n {
TextConversionResult SAL_CALL
TextConversionImpl::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
getLocaleSpecificTextConversion(rLocale);
@@ -44,7 +44,7 @@ TextConversionImpl::getConversions( const OUString& aText, sal_Int32 nStartPos,
OUString SAL_CALL
TextConversionImpl::getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
getLocaleSpecificTextConversion(rLocale);
@@ -57,7 +57,7 @@ TextConversionImpl::getConversion( const OUString& aText, sal_Int32 nStartPos, s
OUString SAL_CALL
TextConversionImpl::getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence< sal_Int32>& offset)
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
getLocaleSpecificTextConversion(rLocale);
@@ -69,7 +69,7 @@ TextConversionImpl::getConversionWithOffset( const OUString& aText, sal_Int32 nS
sal_Bool SAL_CALL
TextConversionImpl::interactiveConversion( const Locale& rLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions )
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
getLocaleSpecificTextConversion(rLocale);
@@ -111,20 +111,20 @@ TextConversionImpl::getLocaleSpecificTextConversion(const Locale& rLocale) throw
}
OUString SAL_CALL
-TextConversionImpl::getImplementationName() throw( RuntimeException )
+TextConversionImpl::getImplementationName() throw( RuntimeException, std::exception )
{
return OUString("com.sun.star.i18n.TextConversion");
}
sal_Bool SAL_CALL
TextConversionImpl::supportsService(const OUString& rServiceName)
- throw( RuntimeException )
+ throw( RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
Sequence< OUString > SAL_CALL
-TextConversionImpl::getSupportedServiceNames() throw( RuntimeException )
+TextConversionImpl::getSupportedServiceNames() throw( RuntimeException, std::exception )
{
Sequence< OUString > aRet(1);
aRet[0] = OUString("com.sun.star.i18n.TextConversion");
diff --git a/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 2fcc9f7ed091..a658c3246771 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -218,7 +218,7 @@ static Sequence< OUString >& operator += (Sequence< OUString > &rSeq1, Sequence<
TextConversionResult SAL_CALL
TextConversion_ko::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const Locale& aLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
TextConversionResult result;
Sequence <OUString> candidates;
@@ -308,7 +308,7 @@ TextConversion_ko::getConversions( const OUString& aText, sal_Int32 nStartPos, s
OUString SAL_CALL
TextConversion_ko::getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const Locale& aLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
sal_Int32 length = aText.getLength() - nStartPos;
@@ -342,7 +342,7 @@ TextConversion_ko::getConversion( const OUString& aText, sal_Int32 nStartPos, sa
OUString SAL_CALL
TextConversion_ko::getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset)
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
offset.realloc(0);
return getConversion(aText, nStartPos, nLength, rLocale, nConversionType, nConversionOptions);
@@ -350,7 +350,7 @@ TextConversion_ko::getConversionWithOffset( const OUString& aText, sal_Int32 nSt
sal_Bool SAL_CALL
TextConversion_ko::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ )
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
return sal_True;
}
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 8db111856c4b..a4a4a1b81f64 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.cxx
@@ -267,7 +267,7 @@ TextConversion_zh::getWordConversion(const OUString& aText, sal_Int32 nStartPos,
TextConversionResult SAL_CALL
TextConversion_zh::getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
TextConversionResult result;
@@ -282,7 +282,7 @@ TextConversion_zh::getConversions( const OUString& aText, sal_Int32 nStartPos, s
OUString SAL_CALL
TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions)
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) {
@@ -304,7 +304,7 @@ TextConversion_zh::getConversion( const OUString& aText, sal_Int32 nStartPos, sa
OUString SAL_CALL
TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const Locale& rLocale, sal_Int16 nConversionType, sal_Int32 nConversionOptions, Sequence<sal_Int32>& offset)
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
if (rLocale.Language == "zh" && ( nConversionType == TextConversionType::TO_SCHINESE || nConversionType == TextConversionType::TO_TCHINESE) ) {
@@ -327,7 +327,7 @@ TextConversion_zh::getConversionWithOffset( const OUString& aText, sal_Int32 nSt
sal_Bool SAL_CALL
TextConversion_zh::interactiveConversion( const Locale& /*rLocale*/, sal_Int16 /*nTextConversionType*/, sal_Int32 /*nTextConversionOptions*/ )
- throw( RuntimeException, IllegalArgumentException, NoSupportException )
+ throw( RuntimeException, IllegalArgumentException, NoSupportException, std::exception )
{
return sal_False;
}