cppuhelper: retrofit std::exception into overriding exception specs

Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3

4 files changed, 41 insertions, 41 deletions

diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index d737db9f3f63..e56256b4aee7 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -49,7 +49,7 @@ BreakIteratorImpl::~BreakIteratorImpl()
 
 sal_Int32 SAL_CALL BreakIteratorImpl::nextCharacters( const OUString& Text, sal_Int32 nStartPos,
         const Locale &rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-        throw(RuntimeException)
+        throw(RuntimeException, std::exception)
 {
     if (nCount < 0) throw RuntimeException();
 
@@ -58,7 +58,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextCharacters( const OUString& Text, sal_
 
 sal_Int32 SAL_CALL BreakIteratorImpl::previousCharacters( const OUString& Text, sal_Int32 nStartPos,
         const Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-        throw(RuntimeException)
+        throw(RuntimeException, std::exception)
 {
     if (nCount < 0) throw RuntimeException();
 
@@ -97,7 +97,7 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 nPos, sal_Int32 len,
 }
 
 Boundary SAL_CALL BreakIteratorImpl::nextWord( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException)
+        const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException, std::exception)
 {
     sal_Int32 len = Text.getLength();
     if( nStartPos < 0 || len == 0 )
@@ -127,7 +127,7 @@ static inline sal_Bool SAL_CALL isCJK( const Locale& rLocale ) {
 }
 
 Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& rLocale, sal_Int16 rWordType) throw(RuntimeException)
+        const Locale& rLocale, sal_Int16 rWordType) throw(RuntimeException, std::exception)
 {
     sal_Int32 len = Text.getLength();
     if( nStartPos <= 0 || len == 0 ) {
@@ -153,7 +153,7 @@ Boundary SAL_CALL BreakIteratorImpl::previousWord( const OUString& Text, sal_Int
 
 
 Boundary SAL_CALL BreakIteratorImpl::getWordBoundary( const OUString& Text, sal_Int32 nPos, const Locale& rLocale,
-        sal_Int16 rWordType, sal_Bool bDirection ) throw(RuntimeException)
+        sal_Int16 rWordType, sal_Bool bDirection ) throw(RuntimeException, std::exception)
 {
     sal_Int32 len = Text.getLength();
     if( nPos < 0 || len == 0 )
@@ -186,7 +186,7 @@ Boundary SAL_CALL BreakIteratorImpl::getWordBoundary( const OUString& Text, sal_
 }
 
 sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int32 nPos,
-        const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException)
+        const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException, std::exception)
 {
     sal_Int32 len = Text.getLength();
 
@@ -202,7 +202,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::isBeginWord( const OUString& Text, sal_Int3
 }
 
 sal_Bool SAL_CALL BreakIteratorImpl::isEndWord( const OUString& Text, sal_Int32 nPos,
-        const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException)
+        const Locale& rLocale, sal_Int16 rWordType ) throw(RuntimeException, std::exception)
 {
     sal_Int32 len = Text.getLength();
 
@@ -218,7 +218,7 @@ sal_Bool SAL_CALL BreakIteratorImpl::isEndWord( const OUString& Text, sal_Int32
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const Locale &rLocale ) throw(RuntimeException)
+        const Locale &rLocale ) throw(RuntimeException, std::exception)
 {
     if (nStartPos < 0 || nStartPos > Text.getLength())
         return -1;
@@ -227,7 +227,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfSentence( const OUString& Text, sal
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::endOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const Locale &rLocale ) throw(RuntimeException)
+        const Locale &rLocale ) throw(RuntimeException, std::exception)
 {
     if (nStartPos < 0 || nStartPos > Text.getLength())
         return -1;
@@ -237,13 +237,13 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfSentence( const OUString& Text, sal_I
 
 LineBreakResults SAL_CALL BreakIteratorImpl::getLineBreak( const OUString& Text, sal_Int32 nStartPos,
         const Locale& rLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions,
-        const LineBreakUserOptions& bOptions ) throw(RuntimeException)
+        const LineBreakUserOptions& bOptions ) throw(RuntimeException, std::exception)
 {
     return LBI->getLineBreak(Text, nStartPos, rLocale, nMinBreakPos, hOptions, bOptions);
 }
 
 sal_Int16 SAL_CALL BreakIteratorImpl::getScriptType( const OUString& Text, sal_Int32 nPos )
-        throw(RuntimeException)
+        throw(RuntimeException, std::exception)
 {
     return (nPos < 0 || nPos >= Text.getLength()) ? ScriptType::WEAK :
         getScriptClass(Text.iterateCodePoints(&nPos, 0));
@@ -278,7 +278,7 @@ static sal_Int32 SAL_CALL iterateCodePoints(const OUString& Text, sal_Int32 &nSt
 
 
 sal_Int32 SAL_CALL BreakIteratorImpl::beginOfScript( const OUString& Text,
-        sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException)
+        sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException, std::exception)
 {
     if (nStartPos < 0 || nStartPos >= Text.getLength())
         return -1;
@@ -296,7 +296,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfScript( const OUString& Text,
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::endOfScript( const OUString& Text,
-        sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException)
+        sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException, std::exception)
 {
     if (nStartPos < 0 || nStartPos >= Text.getLength())
         return -1;
@@ -315,7 +315,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfScript( const OUString& Text,
 }
 
 sal_Int32  SAL_CALL BreakIteratorImpl::previousScript( const OUString& Text,
-        sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException)
+        sal_Int32 nStartPos, sal_Int16 ScriptType ) throw(RuntimeException, std::exception)
 {
     if (nStartPos < 0)
         return -1;
@@ -341,7 +341,7 @@ sal_Int32  SAL_CALL BreakIteratorImpl::previousScript( const OUString& Text,
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::nextScript( const OUString& Text, sal_Int32 nStartPos,
-        sal_Int16 ScriptType ) throw(RuntimeException)
+        sal_Int16 ScriptType ) throw(RuntimeException, std::exception)
 
 {
     if (nStartPos < 0)
@@ -363,7 +363,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextScript( const OUString& Text, sal_Int3
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException)
+        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception)
 {
     if (CharType == CharType::ANY_CHAR) return 0;
     if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
@@ -375,7 +375,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfCharBlock( const OUString& Text, sa
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::endOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException)
+        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception)
 {
     sal_Int32 strLen = Text.getLength();
 
@@ -389,7 +389,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfCharBlock( const OUString& Text, sal_
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::nextCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException)
+        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception)
 {
     if (CharType == CharType::ANY_CHAR) return -1;
     if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
@@ -406,7 +406,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::nextCharBlock( const OUString& Text, sal_I
 }
 
 sal_Int32 SAL_CALL BreakIteratorImpl::previousCharBlock( const OUString& Text, sal_Int32 nStartPos,
-        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException)
+        const Locale& /*rLocale*/, sal_Int16 CharType ) throw(RuntimeException, std::exception)
 {
     if(CharType == CharType::ANY_CHAR) return -1;
     if (nStartPos < 0 || nStartPos >= Text.getLength()) return -1;
@@ -428,7 +428,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::previousCharBlock( const OUString& Text, s
 
 
 sal_Int16 SAL_CALL BreakIteratorImpl::getWordType( const OUString& /*Text*/,
-        sal_Int32 /*nPos*/, const Locale& /*rLocale*/ ) throw(RuntimeException)
+        sal_Int32 /*nPos*/, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception)
 {
     return 0;
 }
@@ -606,19 +606,19 @@ BreakIteratorImpl::getLocaleSpecificBreakIterator(const Locale& rLocale) throw (
 }
 
 OUString SAL_CALL
-BreakIteratorImpl::getImplementationName(void) throw( RuntimeException )
+BreakIteratorImpl::getImplementationName(void) throw( RuntimeException, std::exception )
 {
     return OUString("com.sun.star.i18n.BreakIterator");
 }
 
 sal_Bool SAL_CALL
-BreakIteratorImpl::supportsService(const OUString& rServiceName) throw( RuntimeException )
+BreakIteratorImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 Sequence< OUString > SAL_CALL
-BreakIteratorImpl::getSupportedServiceNames(void) throw( RuntimeException )
+BreakIteratorImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception )
 {
     Sequence< OUString > aRet(1);
     aRet[0] = OUString("com.sun.star.i18n.BreakIterator");
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 9ff6a40a7c5d..ada4c2c349ec 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.cxx
@@ -42,7 +42,7 @@ BreakIterator_CJK::BreakIterator_CJK() :
 
 Boundary SAL_CALL
 BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos,
-        const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException)
+        const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException, std::exception)
 {
     if (dict) {
         result = dict->previousWord(text, anyPos, wordType);
@@ -59,7 +59,7 @@ BreakIterator_CJK::previousWord(const OUString& text, sal_Int32 anyPos,
 
 Boundary SAL_CALL
 BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos,
-        const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException)
+        const lang::Locale& nLocale, sal_Int16 wordType) throw(RuntimeException, std::exception)
 {
     if (dict) {
         result = dict->nextWord(text, anyPos, wordType);
@@ -77,7 +77,7 @@ BreakIterator_CJK::nextWord(const OUString& text, sal_Int32 anyPos,
 Boundary SAL_CALL
 BreakIterator_CJK::getWordBoundary( const OUString& text, sal_Int32 anyPos,
         const lang::Locale& nLocale, sal_Int16 wordType, sal_Bool bDirection )
-        throw(RuntimeException)
+        throw(RuntimeException, std::exception)
 {
     if (dict) {
         result = dict->getWordBoundary(text, anyPos, wordType, bDirection);
@@ -93,7 +93,7 @@ LineBreakResults SAL_CALL BreakIterator_CJK::getLineBreak(
         const OUString& Text, sal_Int32 nStartPos,
         const lang::Locale& /*rLocale*/, sal_Int32 /*nMinBreakPos*/,
         const LineBreakHyphenationOptions& /*hOptions*/,
-        const LineBreakUserOptions& bOptions ) throw(RuntimeException)
+        const LineBreakUserOptions& bOptions ) throw(RuntimeException, std::exception)
 {
     LineBreakResults lbr;
 
diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index 0c5be0663fe5..c2058904fc5c 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.cxx
@@ -54,7 +54,7 @@ BreakIterator_CTL::~BreakIterator_CTL()
 sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text,
     sal_Int32 nStartPos, const lang::Locale& rLocale,
     sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) {
         nDone = 0;
@@ -81,7 +81,7 @@ sal_Int32 SAL_CALL BreakIterator_CTL::previousCharacters( const OUString& Text,
 sal_Int32 SAL_CALL BreakIterator_CTL::nextCharacters(const OUString& Text,
     sal_Int32 nStartPos, const lang::Locale& rLocale,
     sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone)
-    throw(RuntimeException)
+    throw(RuntimeException, std::exception)
 {
     sal_Int32 len = Text.getLength();
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) {
@@ -118,7 +118,7 @@ LineBreakResults SAL_CALL BreakIterator_CTL::getLineBreak(
     const OUString& Text, sal_Int32 nStartPos,
     const lang::Locale& rLocale, sal_Int32 nMinBreakPos,
     const LineBreakHyphenationOptions& hOptions,
-    const LineBreakUserOptions& bOptions ) throw(RuntimeException)
+    const LineBreakUserOptions& bOptions ) throw(RuntimeException, std::exception)
 {
     LineBreakResults lbr = BreakIterator_Unicode::getLineBreak(Text, nStartPos,
                     rLocale, nMinBreakPos, hOptions, bOptions );
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index f0a6cb79e2d4..205ff6c9f04c 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -207,7 +207,7 @@ void SAL_CALL BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
 sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
         sal_Int32 nStartPos, const lang::Locale &rLocale,
         sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-        throw(uno::RuntimeException)
+        throw(uno::RuntimeException, std::exception)
 {
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode
         loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
@@ -226,7 +226,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::nextCharacters( const OUString& Text,
 sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Text,
         sal_Int32 nStartPos, const lang::Locale& rLocale,
         sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, sal_Int32& nDone )
-        throw(uno::RuntimeException)
+        throw(uno::RuntimeException, std::exception)
 {
     if (nCharacterIteratorMode == CharacterIteratorMode::SKIPCELL ) { // for CELL mode
         loadICUBreakIterator(rLocale, LOAD_CHARACTER_BREAKITERATOR, 0, "char", Text);
@@ -244,7 +244,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::previousCharacters( const OUString& Te
 
 
 Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int32 nStartPos,
-    const lang::Locale& rLocale, sal_Int16 rWordType ) throw(uno::RuntimeException)
+    const lang::Locale& rLocale, sal_Int16 rWordType ) throw(uno::RuntimeException, std::exception)
 {
     loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
 
@@ -266,7 +266,7 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const OUString& Text, sal_Int
 
 
 Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_Int32 nStartPos,
-        const lang::Locale& rLocale, sal_Int16 rWordType) throw(uno::RuntimeException)
+        const lang::Locale& rLocale, sal_Int16 rWordType) throw(uno::RuntimeException, std::exception)
 {
     loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
 
@@ -288,7 +288,7 @@ Boundary SAL_CALL BreakIterator_Unicode::previousWord(const OUString& Text, sal_
 
 
 Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text, sal_Int32 nPos, const lang::Locale& rLocale,
-        sal_Int16 rWordType, sal_Bool bDirection ) throw(uno::RuntimeException)
+        sal_Int16 rWordType, sal_Bool bDirection ) throw(uno::RuntimeException, std::exception)
 {
     loadICUBreakIterator(rLocale, LOAD_WORD_BREAKITERATOR, rWordType, NULL, Text);
     sal_Int32 len = Text.getLength();
@@ -321,7 +321,7 @@ Boundary SAL_CALL BreakIterator_Unicode::getWordBoundary( const OUString& Text,
 
 
 sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const lang::Locale &rLocale ) throw(uno::RuntimeException)
+        const lang::Locale &rLocale ) throw(uno::RuntimeException, std::exception)
 {
     loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text);
 
@@ -340,7 +340,7 @@ sal_Int32 SAL_CALL BreakIterator_Unicode::beginOfSentence( const OUString& Text,
 }
 
 sal_Int32 SAL_CALL BreakIterator_Unicode::endOfSentence( const OUString& Text, sal_Int32 nStartPos,
-        const lang::Locale &rLocale ) throw(uno::RuntimeException)
+        const lang::Locale &rLocale ) throw(uno::RuntimeException, std::exception)
 {
     loadICUBreakIterator(rLocale, LOAD_SENTENCE_BREAKITERATOR, 0, "sent", Text);
 
@@ -359,7 +359,7 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
         const OUString& Text, sal_Int32 nStartPos,
         const lang::Locale& rLocale, sal_Int32 nMinBreakPos,
         const LineBreakHyphenationOptions& hOptions,
-        const LineBreakUserOptions& /*rOptions*/ ) throw(uno::RuntimeException)
+        const LineBreakUserOptions& /*rOptions*/ ) throw(uno::RuntimeException, std::exception)
 {
     LineBreakResults lbr;
 
@@ -444,19 +444,19 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak(
 }
 
 OUString SAL_CALL
-BreakIterator_Unicode::getImplementationName(void) throw( uno::RuntimeException )
+BreakIterator_Unicode::getImplementationName(void) throw( uno::RuntimeException, std::exception )
 {
     return OUString::createFromAscii(cBreakIterator);
 }
 
 sal_Bool SAL_CALL
-BreakIterator_Unicode::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
+BreakIterator_Unicode::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception )
 {
     return cppu::supportsService(this, rServiceName);
 }
 
 uno::Sequence< OUString > SAL_CALL
-BreakIterator_Unicode::getSupportedServiceNames(void) throw( uno::RuntimeException )
+BreakIterator_Unicode::getSupportedServiceNames(void) throw( uno::RuntimeException, std::exception )
 {
     uno::Sequence< OUString > aRet(1);
     aRet[0] = OUString::createFromAscii(cBreakIterator);