diff options
Diffstat (limited to 'i18npool')
86 files changed, 762 insertions, 762 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index a6d3e6517d55..07bdd69d7c1b 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.hxx @@ -52,62 +52,62 @@ public: virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, - sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); + sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, - sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); + sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException, std::exception); virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException, std::exception); virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isBeginWord( const OUString& Text, sal_Int32 nPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isEndWord( const OUString& Text, sal_Int32 nPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getWordType( const OUString& Text, sal_Int32 nPos, - const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL beginOfScript( const OUString& Text, sal_Int32 nStartPos, - sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); + sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL endOfScript( const OUString& Text, sal_Int32 nStartPos, - sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); + sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL previousScript( const OUString& Text, sal_Int32 nStartPos, - sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); + sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL nextScript( const OUString& Text, sal_Int32 nStartPos, - sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException); + sal_Int16 ScriptType ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL previousCharBlock( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 CharType ) throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar); protected: diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx index 5985c399cff4..e376571b79f6 100644 --- a/i18npool/inc/breakiterator_cjk.hxx +++ b/i18npool/inc/breakiterator_cjk.hxx @@ -33,17 +33,17 @@ public: Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); protected: xdictionary *dict; diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx index fce4a35a72d5..f3a829c6326c 100644 --- a/i18npool/inc/breakiterator_ctl.hxx +++ b/i18npool/inc/breakiterator_ctl.hxx @@ -34,14 +34,14 @@ public: ~BreakIterator_CTL(); virtual sal_Int32 SAL_CALL previousCharacters(const OUString& text, sal_Int32 start, const lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count, - sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException); + sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL nextCharacters(const OUString& text, sal_Int32 start, const lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 count, - sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException); + sal_Int32& nDone) throw(com::sun::star::uno::RuntimeException, std::exception); virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); protected: OUString cachedText; // for cell index sal_Int32* nextCellIndex; diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx index 3e37956f6c6a..4cbda1c8b7e2 100644 --- a/i18npool/inc/breakiterator_unicode.hxx +++ b/i18npool/inc/breakiterator_unicode.hxx @@ -41,35 +41,35 @@ public: virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, - sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); + sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount, - sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException); + sal_Int32& nDone ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException, std::exception); virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType) throw(com::sun::star::uno::RuntimeException, std::exception); virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos, - const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& nLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos, const com::sun::star::lang::Locale& nLocale, sal_Int32 nMinBreakPos, const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); protected: const sal_Char *cBreakIterator, *wordRule, *lineRule; diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx index 39268167208d..6da9d63bfa05 100644 --- a/i18npool/inc/calendarImpl.hxx +++ b/i18npool/inc/calendarImpl.hxx @@ -53,41 +53,41 @@ public: // Methods - virtual void SAL_CALL loadDefaultCalendar(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isValid() throw (com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); + virtual void SAL_CALL loadDefaultCalendar(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAllCalendars(const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isValid() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException, std::exception); // Methods in XExtendedCalendar - virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException, std::exception); // XCalendar3 - virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException); + virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception); private: struct lookupTableItem { diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx index 13a2686fccb2..c8a2b9f2b867 100644 --- a/i18npool/inc/calendar_gregorian.hxx +++ b/i18npool/inc/calendar_gregorian.hxx @@ -56,39 +56,39 @@ public: ~Calendar_gregorian(); // Methods in XCalendar - virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException); - virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isValid() throw (com::sun::star::uno::RuntimeException); - virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); + virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setDateTime(double nTimeInDays) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual double SAL_CALL getDateTime() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isValid() throw (com::sun::star::uno::RuntimeException, std::exception); + virtual Calendar SAL_CALL getLoadedCalendar() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getUniqueID() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException, std::exception); // Methods in XExtendedCalendar - virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException, std::exception); // XCalendar3 - virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException); + virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception); protected: const Era *eraArray; @@ -136,8 +136,8 @@ class Calendar_hanja : public Calendar_gregorian public: // Constructors Calendar_hanja(); - virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); - virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException); + virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(com::sun::star::uno::RuntimeException, std::exception); }; @@ -170,7 +170,7 @@ public: Calendar_buddhist(); // Methods in XExtendedCalendar - virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException, std::exception); }; } } } } diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx index d997843918aa..de57eaba0cb0 100644 --- a/i18npool/inc/calendar_jewish.hxx +++ b/i18npool/inc/calendar_jewish.hxx @@ -34,7 +34,7 @@ public: Calendar_jewish(); // Methods in XExtendedCalendar - virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (com::sun::star::uno::RuntimeException, std::exception); protected: void mapToGregorian() throw(com::sun::star::uno::RuntimeException); diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx index bfbbc4a7315f..a9181f6729b0 100644 --- a/i18npool/inc/cclass_unicode.hxx +++ b/i18npool/inc/cclass_unicode.hxx @@ -43,31 +43,31 @@ public: ~cclass_Unicode(); virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, - const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, - const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, - const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos, - const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos, sal_Int32 nCount, - const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, - sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); + sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, - const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException); + const OUString& userDefinedCharactersCont ) throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ); private: Transliteration_casemapping *trans; diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx index c9723563c3dd..b15b9e4432cc 100644 --- a/i18npool/inc/chaptercollator.hxx +++ b/i18npool/inc/chaptercollator.hxx @@ -36,13 +36,13 @@ public: ~ChapterCollator(); sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, - const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); - sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(com::sun::star::uno::RuntimeException); + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException, std::exception); + sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ); private : // CharacterClassification Implementation diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index e220968640b0..0b9e98329b88 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -41,43 +41,43 @@ public: virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos, sal_Int32 nCount, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text, sal_Int32 nPos, const com::sun::star::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: struct lookupTableItem { diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index b6ba6398f5df..b204c99d0e57 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.hxx @@ -48,30 +48,30 @@ public: ~CollatorImpl(); virtual sal_Int32 SAL_CALL compareSubstring(const OUString& s1, sal_Int32 off1, sal_Int32 len1, - const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL compareString( const OUString& s1, - const OUString& s2) throw(com::sun::star::uno::RuntimeException); + const OUString& s2) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale, sal_Int32 collatorOptions) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale, - sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException); + sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString& impl, const lang::Locale& rLocale, - const com::sun::star::uno::Sequence< sal_Int32 >& collatorOptions) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::uno::Sequence< sal_Int32 >& collatorOptions) throw(com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ); protected: lang::Locale nLocale; diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx index 1390d79df65c..00e4aeaf8055 100644 --- a/i18npool/inc/collator_unicode.hxx +++ b/i18npool/inc/collator_unicode.hxx @@ -42,29 +42,29 @@ public: ~Collator_Unicode(); sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, - const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException, std::exception); sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale, - sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException); + sal_Int32 collatorOptions) throw(com::sun::star::uno::RuntimeException, std::exception); // following 4 methods are implemented in collatorImpl. sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32) - throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} + throw(com::sun::star::uno::RuntimeException, std::exception) {throw com::sun::star::uno::RuntimeException();} void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&, const lang::Locale&, - const com::sun::star::uno::Sequence< sal_Int32 >&) throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} + const com::sun::star::uno::Sequence< sal_Int32 >&) throw(com::sun::star::uno::RuntimeException, std::exception) {throw com::sun::star::uno::RuntimeException();} com::sun::star::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&) - throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} + throw(com::sun::star::uno::RuntimeException, std::exception) {throw com::sun::star::uno::RuntimeException();} com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& ) - throw(com::sun::star::uno::RuntimeException) {throw com::sun::star::uno::RuntimeException();} + throw(com::sun::star::uno::RuntimeException, std::exception) {throw com::sun::star::uno::RuntimeException();} //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ); protected: const sal_Char *implementationName; diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx index 94a18f8beb5c..97ea64514c67 100644 --- a/i18npool/inc/defaultnumberingprovider.hxx +++ b/i18npool/inc/defaultnumberingprovider.hxx @@ -52,12 +52,12 @@ public: virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess > > SAL_CALL getDefaultOutlineNumberings( const com::sun::star::lang::Locale& aLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > SAL_CALL getDefaultContinuousNumberingLevels( const com::sun::star::lang::Locale& aLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); //XNumberingFormatter virtual OUString SAL_CALL makeNumberingString( @@ -65,25 +65,25 @@ public: com::sun::star::beans::PropertyValue >& aProperties, const com::sun::star::lang::Locale& aLocale ) throw(com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); //XNumberingTypeInfo virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes( ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL getNumberingType( const OUString& NumberingIdentifier ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasNumberingType( const OUString& NumberingIdentifier ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; com::sun::star::uno::Reference < com::sun::star::container::XHierarchicalNameAccess > xHierarchicalNameAccess; diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx index b15b45f57953..0a33c4257509 100644 --- a/i18npool/inc/indexentrysupplier.hxx +++ b/i18npool/inc/indexentrysupplier.hxx @@ -40,50 +40,50 @@ public: // Methods virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList( const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL loadAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& SortAlgorithm, sal_Int32 collatorOptions ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL usePhoneticEntry( const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, const OUString& IndexEntry2, const OUString& PhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getIndexCharacter( const OUString& IndexEntry, const com::sun::star::lang::Locale& rLocale, const OUString& SortAlgorithm ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: OUString aServiceName; diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx index 50cf3a1010af..9d24feef17a5 100644 --- a/i18npool/inc/indexentrysupplier_asian.hxx +++ b/i18npool/inc/indexentrysupplier_asian.hxx @@ -36,19 +36,19 @@ public: OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, const com::sun::star::lang::Locale& rLocale, const OUString& rAlgorithm ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); OUString SAL_CALL getIndexKey( const OUString& rIndexEntry, const OUString& rPhoneticEntry, const com::sun::star::lang::Locale& rLocale) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); sal_Int16 SAL_CALL compareIndexEntry( const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); OUString SAL_CALL getPhoneticCandidate( const OUString& rIndexEntry, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); #ifndef DISABLE_DYNLOADING private: oslModule hModule; diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx index df54320a4f83..18cbb07c4aa0 100644 --- a/i18npool/inc/indexentrysupplier_common.hxx +++ b/i18npool/inc/indexentrysupplier_common.hxx @@ -42,50 +42,50 @@ public: ~IndexEntrySupplier_Common(); virtual com::sun::star::uno::Sequence < com::sun::star::lang::Locale > SAL_CALL getLocaleList() - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getAlgorithmList( const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL usePhoneticEntry( const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL loadAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& SortAlgorithm, sal_Int32 collatorOptions ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, const OUString& IndexEntry2, const OUString& PhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); protected: const sal_Char *implementationName; diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx index 13865ea79cf8..5d45470bb21d 100644 --- a/i18npool/inc/indexentrysupplier_default.hxx +++ b/i18npool/inc/indexentrysupplier_default.hxx @@ -36,21 +36,21 @@ public: virtual sal_Bool SAL_CALL loadAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& SortAlgorithm, sal_Int32 collatorOptions ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1, const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1, const OUString& IndexEntry2, const OUString& PhoneticEntry2, const com::sun::star::lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry, const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); private: Index *index; diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx index bc622e34b02f..50d6d1eb84d9 100644 --- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx +++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx @@ -35,15 +35,15 @@ public: }; virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,\ const com::sun::star::lang::Locale& rLocale, const OUString& rSortAlgorithm ) \ - throw (com::sun::star::uno::RuntimeException);\ + throw (com::sun::star::uno::RuntimeException, std::exception);\ virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry, \ const OUString& PhoneticEntry, const com::sun::star::lang::Locale& rLocale )\ - throw (com::sun::star::uno::RuntimeException);\ + throw (com::sun::star::uno::RuntimeException, std::exception);\ virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,\ const OUString& PhoneticEntry1, const com::sun::star::lang::Locale& rLocale1,\ const OUString& IndexEntry2, const OUString& PhoneticEntry2,\ const com::sun::star::lang::Locale& rLocale2 )\ - throw (com::sun::star::uno::RuntimeException);\ + throw (com::sun::star::uno::RuntimeException, std::exception);\ }; #define INDEXENTRYSUPPLIER_JA_PHONETIC( algorithm ) \ @@ -55,7 +55,7 @@ public:\ virtual sal_Bool SAL_CALL loadAlgorithm(\ const com::sun::star::lang::Locale& rLocale,\ const OUString& SortAlgorithm, sal_Int32 collatorOptions ) \ - throw (com::sun::star::uno::RuntimeException);\ + throw (com::sun::star::uno::RuntimeException, std::exception);\ }; INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_syllable ) diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx index e9ad43fec324..e87c54aef3c8 100644 --- a/i18npool/inc/inputsequencechecker.hxx +++ b/i18npool/inc/inputsequencechecker.hxx @@ -44,17 +44,17 @@ public: ~InputSequenceCheckerImpl(); virtual sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private : const sal_Char *serviceName; diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx index 742b17df9784..3eb40e08e1f1 100644 --- a/i18npool/inc/inputsequencechecker_hi.hxx +++ b/i18npool/inc/inputsequencechecker_hi.hxx @@ -36,10 +36,10 @@ public: ~InputSequenceChecker_hi(); sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception); sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception); }; } } } } diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx index 09493553be14..26b30a950035 100644 --- a/i18npool/inc/inputsequencechecker_th.hxx +++ b/i18npool/inc/inputsequencechecker_th.hxx @@ -33,10 +33,10 @@ public: ~InputSequenceChecker_th(); sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception); sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException); + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception); }; } } } } diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 6de076941125..e3c50b89217a 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -82,28 +82,28 @@ public: excluding the one obtained via getFirstLocaleServiceName() */ static ::std::vector< OUString > getFallbackLocaleServiceNames( const com::sun::star::lang::Locale & rLocale ); - virtual LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual LocaleDataItem SAL_CALL getLocaleItem( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< Calendar2 > SAL_CALL getAllCalendars2( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< Calendar > SAL_CALL getAllCalendars( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< Currency > SAL_CALL getAllCurrencies( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual LocaleDataItem SAL_CALL getLocaleItem( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< Calendar2 > SAL_CALL getAllCalendars2( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< Calendar > SAL_CALL getAllCalendars( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< Currency > SAL_CALL getAllCurrencies( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getCollatorRuleByAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& algorithm ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getTransliterations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getReservedWord( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getTransliterations( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getReservedWord( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) ; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; - virtual com::sun::star::uno::Sequence< com::sun::star::lang::Locale > SAL_CALL getAllInstalledLocaleNames() throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< com::sun::star::lang::Locale > SAL_CALL getAllInstalledLocaleNames() throw(com::sun::star::uno::RuntimeException, std::exception); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSearchOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getCollationOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSearchOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getCollationOptions( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); // XLocaleData4 - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); // following methods are used by indexentry service virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); @@ -117,9 +117,9 @@ public: virtual OUString SAL_CALL getHangingCharacters( const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); //XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException ); - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ); private : friend sal_Bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2); diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx index 767b4c1f225f..326329f425d3 100644 --- a/i18npool/inc/nativenumbersupplier.hxx +++ b/i18npool/inc/nativenumbersupplier.hxx @@ -42,27 +42,27 @@ public: // Methods virtual OUString SAL_CALL getNativeNumberString( const OUString& aNumberString, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isValidNatNum( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::i18n::NativeNumberXmlAttributes SAL_CALL convertToXmlAttributes( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int16 SAL_CALL convertFromXmlAttributes( const ::com::sun::star::i18n::NativeNumberXmlAttributes& aAttr ) - throw (::com::sun::star::uno::RuntimeException); + throw (::com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); // following methods are not for XNativeNumberSupplier, they are for calling from transliterations OUString SAL_CALL getNativeNumberString( const OUString& aNumberString, diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx index 0a3ab44b034d..986089d1a55d 100644 --- a/i18npool/inc/numberformatcode.hxx +++ b/i18npool/inc/numberformatcode.hxx @@ -40,18 +40,18 @@ public: ::com::sun::star::uno::XComponentContext >& rxContext ); ~NumberFormatCodeMapper(); - virtual ::com::sun::star::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCode( sal_Int16 nFormatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCode( sal_Int16 nFormatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); private: ::com::sun::star::lang::Locale aLocale; diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx index d67a9d6a85a6..3c30c5d9845f 100644 --- a/i18npool/inc/ordinalsuffix.hxx +++ b/i18npool/inc/ordinalsuffix.hxx @@ -36,12 +36,12 @@ class OrdinalSuffix : public cppu::WeakImplHelper2 virtual ~OrdinalSuffix(); // XOrdinalSuffix - virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale ) throw(com::sun::star::uno::RuntimeException); + virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const com::sun::star::lang::Locale &rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException); - virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(com::sun::star::uno::RuntimeException, std::exception); + virtual com::sun::star::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(com::sun::star::uno::RuntimeException, std::exception); }; } } } } diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx index a6a3cf275a1b..08a2eca33bc0 100644 --- a/i18npool/inc/textToPronounce_zh.hxx +++ b/i18npool/inc/textToPronounce_zh.hxx @@ -43,22 +43,22 @@ public: OUString SAL_CALL folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 > & offset) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); - sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException); + sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException, std::exception); sal_Bool SAL_CALL equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2) - throw (com::sun::star::uno::RuntimeException); + throw (com::sun::star::uno::RuntimeException, std::exception); OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException, - com::sun::star::i18n::MultipleCharsOutputException); + com::sun::star::i18n::MultipleCharsOutputException, std::exception); }; #define TRANSLITERATION_TextToPronounce_zh( name ) \ diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index 96eb98487242..93e40c4bd804 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.hxx @@ -49,38 +49,38 @@ public: sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ) = 0; + com::sun::star::lang::NoSupportException, std::exception ) = 0; virtual OUString SAL_CALL getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ) = 0; + com::sun::star::lang::NoSupportException, std::exception ) = 0; virtual OUString SAL_CALL getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ) = 0; + com::sun::star::lang::NoSupportException, std::exception ) = 0; virtual sal_Bool SAL_CALL interactiveConversion(const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ) = 0; + com::sun::star::lang::NoSupportException, std::exception ) = 0; //XServiceInfo OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: const sal_Char* implementationName; protected : @@ -112,28 +112,28 @@ public: sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); OUString SAL_CALL getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); OUString SAL_CALL getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); sal_Bool SAL_CALL interactiveConversion(const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); private : // Hangul/Hanja system dictionary @@ -168,28 +168,28 @@ public: sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); OUString SAL_CALL getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); OUString SAL_CALL getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); sal_Bool SAL_CALL interactiveConversion(const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); private : // user defined dictionary list com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL; diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx index 5bc620bc81ea..9ebc4654ca9f 100644 --- a/i18npool/inc/textconversionImpl.hxx +++ b/i18npool/inc/textconversionImpl.hxx @@ -46,38 +46,38 @@ public: sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); OUString SAL_CALL getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); OUString SAL_CALL getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); sal_Bool SAL_CALL interactiveConversion( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, - com::sun::star::lang::NoSupportException ); + com::sun::star::lang::NoSupportException, std::exception ); //XServiceInfo OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private : com::sun::star::lang::Locale aLocale; com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedTextConversion > xTC; diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx index f927799501aa..4fd5afe0a07f 100644 --- a/i18npool/inc/transliterationImpl.hxx +++ b/i18npool/inc/transliterationImpl.hxx @@ -49,55 +49,55 @@ public: ~TransliterationImpl(); // Methods - virtual OUString SAL_CALL getName( ) throw(com::sun::star::uno::RuntimeException) ; - virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getName( ) throw(com::sun::star::uno::RuntimeException, std::exception) ; + virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException, std::exception) ; virtual void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException) ; + throw(com::sun::star::uno::RuntimeException, std::exception) ; virtual void SAL_CALL loadModuleNew( const com::sun::star::uno::Sequence< TransliterationModulesNew >& modName, - const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException) ; + const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception) ; virtual void SAL_CALL loadModuleByImplName( const OUString& implName, - const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& rLocale ) throw(com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< OUString >& modNamelist, - const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException); + const com::sun::star::lang::Locale& rLocale) throw(com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableModules( const com::sun::star::lang::Locale& rLocale, sal_Int16 sType ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException) ; + com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException, std::exception) ; virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); + com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException, std::exception); // Methods in XExtendedTransliteration virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) - throw(com::sun::star::uno::RuntimeException) ; + throw(com::sun::star::uno::RuntimeException, std::exception) ; virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar ) - throw(com::sun::star::uno::RuntimeException) ; + throw(com::sun::star::uno::RuntimeException, std::exception) ; virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) throw(com::sun::star::i18n::MultipleCharsOutputException, - com::sun::star::uno::RuntimeException) ; + com::sun::star::uno::RuntimeException, std::exception) ; virtual sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, - const OUString& str2 ) throw(com::sun::star::uno::RuntimeException) ; + const OUString& str2 ) throw(com::sun::star::uno::RuntimeException, std::exception) ; virtual sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, - const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException); + const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo - virtual OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName(void) throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); private: #define maxCascade 27 diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx index 0f5c48618869..6a37129ae92b 100644 --- a/i18npool/inc/transliteration_Ignore.hxx +++ b/i18npool/inc/transliteration_Ignore.hxx @@ -38,31 +38,31 @@ class transliteration_Ignore : public transliteration_commonclass public: virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); // This method is shared. sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); // This method is implemented in sub class if needed. Otherwise, the method implemented in this class will be used. com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); // Methods which are shared. - sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException); + sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException, std::exception); OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException, - com::sun::star::i18n::MultipleCharsOutputException); + com::sun::star::i18n::MultipleCharsOutputException, std::exception); com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 ) @@ -131,7 +131,7 @@ public:\ implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\ };\ OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \ - com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); \ + com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException, std::exception); \ }; #if defined( TRANSLITERATION_KiKuFollowedBySa_ja_JP ) || defined( TRANSLITERATION_ALL ) @@ -159,14 +159,14 @@ public:\ implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\ };\ OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \ - com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); \ + com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException, std::exception); \ using transliteration_Ignore::transliterateRange;\ com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, \ - const OUString& str2 ) throw(com::sun::star::uno::RuntimeException); \ + const OUString& str2 ) throw(com::sun::star::uno::RuntimeException, std::exception); \ sal_Unicode SAL_CALL \ transliterateChar2Char( sal_Unicode inChar) \ throw(com::sun::star::uno::RuntimeException,\ - com::sun::star::i18n::MultipleCharsOutputException);\ + com::sun::star::i18n::MultipleCharsOutputException, std::exception);\ }; #if defined( TRANSLITERATION_Kana ) || defined( TRANSLITERATION_ALL ) diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx index c9db417b7b04..5d200468641d 100644 --- a/i18npool/inc/transliteration_Numeric.hxx +++ b/i18npool/inc/transliteration_Numeric.hxx @@ -27,27 +27,27 @@ class transliteration_Numeric : public transliteration_commonclass { public: virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) throw(com::sun::star::i18n::MultipleCharsOutputException, - com::sun::star::uno::RuntimeException); + com::sun::star::uno::RuntimeException, std::exception); // Methods which are shared. - virtual sal_Int16 SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Int16 SAL_CALL getType( ) throw(::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, ::com::sun::star::uno::Sequence< sal_Int32 >& offset ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); protected: sal_Int16 nNativeNumberMode; sal_Int16 tableSize; diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx index 36504c37f699..ea9ba6528e56 100644 --- a/i18npool/inc/transliteration_OneToOne.hxx +++ b/i18npool/inc/transliteration_OneToOne.hxx @@ -31,28 +31,28 @@ class transliteration_OneToOne : public transliteration_commonclass public: OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException, - com::sun::star::i18n::MultipleCharsOutputException); + com::sun::star::i18n::MultipleCharsOutputException, std::exception); // Methods which are shared. - sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException); + sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException, std::exception); OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); protected: TransFunc func; @@ -66,11 +66,11 @@ public: \ name (); \ OUString SAL_CALL \ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) \ - throw(com::sun::star::uno::RuntimeException); \ + throw(com::sun::star::uno::RuntimeException, std::exception); \ sal_Unicode SAL_CALL \ transliterateChar2Char( sal_Unicode inChar) \ throw(com::sun::star::uno::RuntimeException, \ - com::sun::star::i18n::MultipleCharsOutputException); \ + com::sun::star::i18n::MultipleCharsOutputException, std::exception); \ }; #if defined( TRANSLITERATION_fullwidthToHalfwidth ) || defined( TRANSLITERATION_ALL ) diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx index 9fb480038aab..ec6ef01df767 100644 --- a/i18npool/inc/transliteration_body.hxx +++ b/i18npool/inc/transliteration_body.hxx @@ -30,30 +30,30 @@ public: Transliteration_body(); // Methods which are shared. - sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException); + sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException, std::exception); OUString SAL_CALL transliterate(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); + com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException, std::exception); OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar) throw(com::sun::star::uno::RuntimeException, - com::sun::star::i18n::MultipleCharsOutputException); + com::sun::star::i18n::MultipleCharsOutputException, std::exception); OUString SAL_CALL folding(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException); + com::sun::star::uno::Sequence< sal_Int32 >& offset) throw(com::sun::star::uno::RuntimeException, std::exception); sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, - const OUString& str2 ) throw(com::sun::star::uno::RuntimeException); + const OUString& str2 ) throw(com::sun::star::uno::RuntimeException, std::exception); protected: sal_uInt8 nMappingType; @@ -95,7 +95,7 @@ class Transliteration_titlecase : public Transliteration_body public: Transliteration_titlecase(); - virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException, std::exception); }; class Transliteration_sentencecase : public Transliteration_body @@ -103,7 +103,7 @@ class Transliteration_sentencecase : public Transliteration_body public: Transliteration_sentencecase(); - virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) throw(com::sun::star::uno::RuntimeException, std::exception); }; #endif diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx index bac9c614bf1e..88dc9ec87990 100644 --- a/i18npool/inc/transliteration_caseignore.hxx +++ b/i18npool/inc/transliteration_caseignore.hxx @@ -30,29 +30,29 @@ public: Transliteration_caseignore(); // Methods which are shared. - sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException); + sal_Int16 SAL_CALL getType() throw(com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, const OUString& s2, sal_Int32 off2, sal_Int32 len2) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); protected: TransliterationModules moduleLoaded; diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx index 43634578c81f..77fa9a3e6ee8 100644 --- a/i18npool/inc/transliteration_commonclass.hxx +++ b/i18npool/inc/transliteration_commonclass.hxx @@ -39,72 +39,72 @@ public: // Methods which are shared. void SAL_CALL loadModule( TransliterationModules modName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL loadModuleNew( const com::sun::star::uno::Sequence< TransliterationModulesNew >& modName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL loadModuleByImplName( const OUString& implName, const com::sun::star::lang::Locale& rLocale ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); void SAL_CALL loadModulesByImplNames(const com::sun::star::uno::Sequence< OUString >& modNamelist, const com::sun::star::lang::Locale& rLocale) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableModules( const com::sun::star::lang::Locale& rLocale, sal_Int16 sType ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); // Methods which should be implemented in each transliteration module. - virtual OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(com::sun::star::uno::RuntimeException, std::exception); - virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException) = 0; + virtual sal_Int16 SAL_CALL getType( ) throw(com::sun::star::uno::RuntimeException, std::exception) = 0; virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset ) - throw(com::sun::star::uno::RuntimeException) = 0; + throw(com::sun::star::uno::RuntimeException, std::exception) = 0; virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, com::sun::star::uno::Sequence< sal_Int32 >& offset) - throw(com::sun::star::uno::RuntimeException) = 0; + throw(com::sun::star::uno::RuntimeException, std::exception) = 0; // Methods in XExtendedTransliteration virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) throw(com::sun::star::i18n::MultipleCharsOutputException, - com::sun::star::uno::RuntimeException) = 0; + com::sun::star::uno::RuntimeException, std::exception) = 0; virtual sal_Bool SAL_CALL equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) - throw(com::sun::star::uno::RuntimeException) = 0; + throw(com::sun::star::uno::RuntimeException, std::exception) = 0; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, const OUString& str2 ) - throw(com::sun::star::uno::RuntimeException) = 0; + throw(com::sun::star::uno::RuntimeException, std::exception) = 0; virtual sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, const OUString& s2, sal_Int32 off2, sal_Int32 len2) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) - throw(com::sun::star::uno::RuntimeException); + throw(com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( com::sun::star::uno::RuntimeException ); + throw( com::sun::star::uno::RuntimeException, std::exception ); protected: com::sun::star::lang::Locale aLocale; const sal_Char* transliterationName; diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx index 78c2d02c71e5..30c8344c0456 100644 --- a/i18npool/inc/unoscripttypedetector.hxx +++ b/i18npool/inc/unoscripttypedetector.hxx @@ -35,21 +35,21 @@ class UnoScriptTypeDetector : public cppu::WeakImplHelper2 { public: // Methods - virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; #endif 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); diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index 7539d667c5f3..b0f897705eee 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -42,7 +42,7 @@ CalendarImpl::~CalendarImpl() } void SAL_CALL -CalendarImpl::loadDefaultCalendar( const Locale& rLocale ) throw(RuntimeException) +CalendarImpl::loadDefaultCalendar( const Locale& rLocale ) throw(RuntimeException, std::exception) { Sequence< Calendar2 > xC = LocaleDataImpl().getAllCalendars2(rLocale); for (sal_Int32 i = 0; i < xC.getLength(); i++) { @@ -55,7 +55,7 @@ CalendarImpl::loadDefaultCalendar( const Locale& rLocale ) throw(RuntimeExceptio } void SAL_CALL -CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) throw (RuntimeException) +CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) throw (RuntimeException, std::exception) { Reference < XCalendar3 > xOldCalendar( xCalendar ); // backup sal_Int32 i; @@ -109,7 +109,7 @@ CalendarImpl::loadCalendar(const OUString& uniqueID, const Locale& rLocale ) thr } Calendar2 SAL_CALL -CalendarImpl::getLoadedCalendar2() throw(RuntimeException) +CalendarImpl::getLoadedCalendar2() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getLoadedCalendar2(); @@ -118,7 +118,7 @@ CalendarImpl::getLoadedCalendar2() throw(RuntimeException) } Calendar SAL_CALL -CalendarImpl::getLoadedCalendar() throw(RuntimeException) +CalendarImpl::getLoadedCalendar() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getLoadedCalendar(); @@ -127,7 +127,7 @@ CalendarImpl::getLoadedCalendar() throw(RuntimeException) } Sequence< OUString > SAL_CALL -CalendarImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) +CalendarImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, std::exception) { Sequence< Calendar2 > xC = LocaleDataImpl().getAllCalendars2(rLocale); sal_Int32 nLen = xC.getLength(); @@ -138,7 +138,7 @@ CalendarImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) } void SAL_CALL -CalendarImpl::setDateTime( double timeInDays ) throw(RuntimeException) +CalendarImpl::setDateTime( double timeInDays ) throw(RuntimeException, std::exception) { if (xCalendar.is()) xCalendar->setDateTime( timeInDays ); @@ -147,7 +147,7 @@ CalendarImpl::setDateTime( double timeInDays ) throw(RuntimeException) } double SAL_CALL -CalendarImpl::getDateTime() throw(RuntimeException) +CalendarImpl::getDateTime() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getDateTime(); @@ -156,7 +156,7 @@ CalendarImpl::getDateTime() throw(RuntimeException) } OUString SAL_CALL -CalendarImpl::getUniqueID() throw(RuntimeException) +CalendarImpl::getUniqueID() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getUniqueID(); @@ -165,7 +165,7 @@ CalendarImpl::getUniqueID() throw(RuntimeException) } void SAL_CALL -CalendarImpl::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeException) +CalendarImpl::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeException, std::exception) { if (xCalendar.is()) xCalendar->setValue( fieldIndex, value ); @@ -174,7 +174,7 @@ CalendarImpl::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeExc } sal_Int16 SAL_CALL -CalendarImpl::getValue( sal_Int16 fieldIndex ) throw(RuntimeException) +CalendarImpl::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getValue( fieldIndex ); @@ -183,7 +183,7 @@ CalendarImpl::getValue( sal_Int16 fieldIndex ) throw(RuntimeException) } void SAL_CALL -CalendarImpl::addValue( sal_Int16 fieldIndex, sal_Int32 amount ) throw(RuntimeException) +CalendarImpl::addValue( sal_Int16 fieldIndex, sal_Int32 amount ) throw(RuntimeException, std::exception) { if (xCalendar.is()) xCalendar->addValue( fieldIndex, amount); @@ -192,7 +192,7 @@ CalendarImpl::addValue( sal_Int16 fieldIndex, sal_Int32 amount ) throw(RuntimeEx } sal_Int16 SAL_CALL -CalendarImpl::getFirstDayOfWeek() throw(RuntimeException) +CalendarImpl::getFirstDayOfWeek() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getFirstDayOfWeek(); @@ -202,7 +202,7 @@ CalendarImpl::getFirstDayOfWeek() throw(RuntimeException) void SAL_CALL CalendarImpl::setFirstDayOfWeek( sal_Int16 day ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { if (xCalendar.is()) xCalendar->setFirstDayOfWeek(day); @@ -211,7 +211,7 @@ throw(RuntimeException) } void SAL_CALL -CalendarImpl::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(RuntimeException) +CalendarImpl::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(RuntimeException, std::exception) { if (xCalendar.is()) xCalendar->setMinimumNumberOfDaysForFirstWeek(days); @@ -220,7 +220,7 @@ CalendarImpl::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(Runtime } sal_Int16 SAL_CALL -CalendarImpl::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException) +CalendarImpl::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getMinimumNumberOfDaysForFirstWeek(); @@ -230,7 +230,7 @@ CalendarImpl::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException) OUString SAL_CALL -CalendarImpl::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException) +CalendarImpl::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getDisplayName( displayIndex, idx, nameType ); @@ -239,7 +239,7 @@ CalendarImpl::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 n } sal_Int16 SAL_CALL -CalendarImpl::getNumberOfMonthsInYear() throw(RuntimeException) +CalendarImpl::getNumberOfMonthsInYear() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getNumberOfMonthsInYear(); @@ -249,7 +249,7 @@ CalendarImpl::getNumberOfMonthsInYear() throw(RuntimeException) sal_Int16 SAL_CALL -CalendarImpl::getNumberOfDaysInWeek() throw(RuntimeException) +CalendarImpl::getNumberOfDaysInWeek() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getNumberOfDaysInWeek(); @@ -259,7 +259,7 @@ CalendarImpl::getNumberOfDaysInWeek() throw(RuntimeException) Sequence< CalendarItem > SAL_CALL -CalendarImpl::getDays() throw(RuntimeException) +CalendarImpl::getDays() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getDays(); @@ -269,7 +269,7 @@ CalendarImpl::getDays() throw(RuntimeException) Sequence< CalendarItem > SAL_CALL -CalendarImpl::getMonths() throw(RuntimeException) +CalendarImpl::getMonths() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getMonths(); @@ -279,7 +279,7 @@ CalendarImpl::getMonths() throw(RuntimeException) Sequence< CalendarItem2 > SAL_CALL -CalendarImpl::getDays2() throw(RuntimeException) +CalendarImpl::getDays2() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getDays2(); @@ -289,7 +289,7 @@ CalendarImpl::getDays2() throw(RuntimeException) Sequence< CalendarItem2 > SAL_CALL -CalendarImpl::getMonths2() throw(RuntimeException) +CalendarImpl::getMonths2() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getMonths2(); @@ -299,7 +299,7 @@ CalendarImpl::getMonths2() throw(RuntimeException) Sequence< CalendarItem2 > SAL_CALL -CalendarImpl::getGenitiveMonths2() throw(RuntimeException) +CalendarImpl::getGenitiveMonths2() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getGenitiveMonths2(); @@ -309,7 +309,7 @@ CalendarImpl::getGenitiveMonths2() throw(RuntimeException) Sequence< CalendarItem2 > SAL_CALL -CalendarImpl::getPartitiveMonths2() throw(RuntimeException) +CalendarImpl::getPartitiveMonths2() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getPartitiveMonths2(); @@ -319,7 +319,7 @@ CalendarImpl::getPartitiveMonths2() throw(RuntimeException) sal_Bool SAL_CALL -CalendarImpl::isValid() throw(RuntimeException) +CalendarImpl::isValid() throw(RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->isValid(); @@ -329,7 +329,7 @@ CalendarImpl::isValid() throw(RuntimeException) OUString SAL_CALL CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { if (xCalendar.is()) return xCalendar->getDisplayString(nCalendarDisplayCode, nNativeNumberMode); @@ -338,19 +338,19 @@ CalendarImpl::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativ } OUString SAL_CALL -CalendarImpl::getImplementationName(void) throw( RuntimeException ) +CalendarImpl::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.CalendarImpl"); } sal_Bool SAL_CALL -CalendarImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) +CalendarImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -CalendarImpl::getSupportedServiceNames(void) throw( RuntimeException ) +CalendarImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.LocaleCalendar"; diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index cb5843a36747..f08c94affaf6 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -178,7 +178,7 @@ Calendar_hanja::Calendar_hanja() } OUString SAL_CALL -Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException) +Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException, std::exception) { if ( displayIndex == CalendarDisplayIndex::AM_PM ) { // Am/Pm string for Korean Hanja calendar will refer to Japanese locale @@ -193,7 +193,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 } void SAL_CALL -Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const com::sun::star::lang::Locale& rLocale ) throw(RuntimeException) +Calendar_hanja::loadCalendar( const OUString& /*uniqueID*/, const com::sun::star::lang::Locale& rLocale ) throw(RuntimeException, std::exception) { // Since this class could be called by service name 'hanja_yoil', we have to // rename uniqueID to get right calendar defined in locale data. @@ -231,7 +231,7 @@ Calendar_buddhist::Calendar_buddhist() : Calendar_gregorian(buddhist_eraArray) } void SAL_CALL -Calendar_gregorian::loadCalendar( const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale ) throw(RuntimeException) +Calendar_gregorian::loadCalendar( const OUString& uniqueID, const com::sun::star::lang::Locale& rLocale ) throw(RuntimeException, std::exception) { // init. fieldValue[] getValue(); @@ -264,25 +264,25 @@ Calendar_gregorian::loadCalendar( const OUString& uniqueID, const com::sun::star com::sun::star::i18n::Calendar2 SAL_CALL -Calendar_gregorian::getLoadedCalendar2() throw(RuntimeException) +Calendar_gregorian::getLoadedCalendar2() throw(RuntimeException, std::exception) { return aCalendar; } com::sun::star::i18n::Calendar SAL_CALL -Calendar_gregorian::getLoadedCalendar() throw(RuntimeException) +Calendar_gregorian::getLoadedCalendar() throw(RuntimeException, std::exception) { return LocaleDataImpl::downcastCalendar( aCalendar); } OUString SAL_CALL -Calendar_gregorian::getUniqueID() throw(RuntimeException) +Calendar_gregorian::getUniqueID() throw(RuntimeException, std::exception) { return aCalendar.Name; } void SAL_CALL -Calendar_gregorian::setDateTime( double timeInDays ) throw(RuntimeException) +Calendar_gregorian::setDateTime( double timeInDays ) throw(RuntimeException, std::exception) { // ICU handles dates in milliseconds as double values and uses floor() // to obtain integer values, which may yield a date decremented by one @@ -302,7 +302,7 @@ Calendar_gregorian::setDateTime( double timeInDays ) throw(RuntimeException) } double SAL_CALL -Calendar_gregorian::getDateTime() throw(RuntimeException) +Calendar_gregorian::getDateTime() throw(RuntimeException, std::exception) { if (fieldSet) { setValue(); @@ -385,7 +385,7 @@ static UCalendarDateFields fieldNameConverter(sal_Int16 fieldIndex) throw(Runtim } void SAL_CALL -Calendar_gregorian::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeException) +Calendar_gregorian::setValue( sal_Int16 fieldIndex, sal_Int16 value ) throw(RuntimeException, std::exception) { if (fieldIndex < 0 || FIELD_INDEX_COUNT <= fieldIndex) throw ERROR; @@ -753,7 +753,7 @@ void Calendar_gregorian::getValue() throw(RuntimeException) } sal_Int16 SAL_CALL -Calendar_gregorian::getValue( sal_Int16 fieldIndex ) throw(RuntimeException) +Calendar_gregorian::getValue( sal_Int16 fieldIndex ) throw(RuntimeException, std::exception) { if (fieldIndex < 0 || FIELD_INDEX_COUNT <= fieldIndex) throw ERROR; @@ -767,7 +767,7 @@ Calendar_gregorian::getValue( sal_Int16 fieldIndex ) throw(RuntimeException) } void SAL_CALL -Calendar_gregorian::addValue( sal_Int16 fieldIndex, sal_Int32 value ) throw(RuntimeException) +Calendar_gregorian::addValue( sal_Int16 fieldIndex, sal_Int32 value ) throw(RuntimeException, std::exception) { // since ZONE and DST could not be add, we don't need to convert value here UErrorCode status; @@ -777,7 +777,7 @@ Calendar_gregorian::addValue( sal_Int16 fieldIndex, sal_Int32 value ) throw(Runt } sal_Bool SAL_CALL -Calendar_gregorian::isValid() throw(RuntimeException) +Calendar_gregorian::isValid() throw(RuntimeException, std::exception) { if (fieldSet) { sal_Int32 tmp = fieldSet; @@ -875,7 +875,7 @@ static sal_Int32 SAL_CALL DisplayCode2FieldIndex(sal_Int32 nCalendarDisplayCode) } sal_Int16 SAL_CALL -Calendar_gregorian::getFirstDayOfWeek() throw(RuntimeException) +Calendar_gregorian::getFirstDayOfWeek() throw(RuntimeException, std::exception) { // UCAL_SUNDAY == 1, Weekdays::SUNDAY == 0 => offset -1 // Check for underflow just in case we're called "out of sync". @@ -886,83 +886,83 @@ Calendar_gregorian::getFirstDayOfWeek() throw(RuntimeException) void SAL_CALL Calendar_gregorian::setFirstDayOfWeek( sal_Int16 day ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { // Weekdays::SUNDAY == 0, UCAL_SUNDAY == 1 => offset +1 body->setFirstDayOfWeek( static_cast<UCalendarDaysOfWeek>( day + 1)); } void SAL_CALL -Calendar_gregorian::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(RuntimeException) +Calendar_gregorian::setMinimumNumberOfDaysForFirstWeek( sal_Int16 days ) throw(RuntimeException, std::exception) { aCalendar.MinimumNumberOfDaysForFirstWeek = days; body->setMinimalDaysInFirstWeek( static_cast<uint8_t>( days)); } sal_Int16 SAL_CALL -Calendar_gregorian::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException) +Calendar_gregorian::getMinimumNumberOfDaysForFirstWeek() throw(RuntimeException, std::exception) { return aCalendar.MinimumNumberOfDaysForFirstWeek; } sal_Int16 SAL_CALL -Calendar_gregorian::getNumberOfMonthsInYear() throw(RuntimeException) +Calendar_gregorian::getNumberOfMonthsInYear() throw(RuntimeException, std::exception) { return (sal_Int16) aCalendar.Months.getLength(); } sal_Int16 SAL_CALL -Calendar_gregorian::getNumberOfDaysInWeek() throw(RuntimeException) +Calendar_gregorian::getNumberOfDaysInWeek() throw(RuntimeException, std::exception) { return (sal_Int16) aCalendar.Days.getLength(); } Sequence< CalendarItem > SAL_CALL -Calendar_gregorian::getDays() throw(RuntimeException) +Calendar_gregorian::getDays() throw(RuntimeException, std::exception) { return LocaleDataImpl::downcastCalendarItems( aCalendar.Days); } Sequence< CalendarItem > SAL_CALL -Calendar_gregorian::getMonths() throw(RuntimeException) +Calendar_gregorian::getMonths() throw(RuntimeException, std::exception) { return LocaleDataImpl::downcastCalendarItems( aCalendar.Months); } Sequence< CalendarItem2 > SAL_CALL -Calendar_gregorian::getDays2() throw(RuntimeException) +Calendar_gregorian::getDays2() throw(RuntimeException, std::exception) { return aCalendar.Days; } Sequence< CalendarItem2 > SAL_CALL -Calendar_gregorian::getMonths2() throw(RuntimeException) +Calendar_gregorian::getMonths2() throw(RuntimeException, std::exception) { return aCalendar.Months; } Sequence< CalendarItem2 > SAL_CALL -Calendar_gregorian::getGenitiveMonths2() throw(RuntimeException) +Calendar_gregorian::getGenitiveMonths2() throw(RuntimeException, std::exception) { return aCalendar.GenitiveMonths; } Sequence< CalendarItem2 > SAL_CALL -Calendar_gregorian::getPartitiveMonths2() throw(RuntimeException) +Calendar_gregorian::getPartitiveMonths2() throw(RuntimeException, std::exception) { return aCalendar.PartitiveMonths; } OUString SAL_CALL -Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException) +Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_Int16 nameType ) throw(RuntimeException, std::exception) { OUString aStr; @@ -1017,7 +1017,7 @@ Calendar_gregorian::getDisplayName( sal_Int16 displayIndex, sal_Int16 idx, sal_I // Methods in XExtendedCalendar OUString SAL_CALL Calendar_gregorian::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return getDisplayStringImpl( nCalendarDisplayCode, nNativeNumberMode, false); } @@ -1150,7 +1150,7 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_In // Methods in XExtendedCalendar OUString SAL_CALL Calendar_buddhist::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { // make year and era in different order for year before and after 0. if ((nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR_AND_ERA || @@ -1167,19 +1167,19 @@ Calendar_buddhist::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 n } OUString SAL_CALL -Calendar_gregorian::getImplementationName(void) throw( RuntimeException ) +Calendar_gregorian::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString::createFromAscii(cCalendar); } sal_Bool SAL_CALL -Calendar_gregorian::supportsService(const OUString& rServiceName) throw( RuntimeException ) +Calendar_gregorian::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -Calendar_gregorian::getSupportedServiceNames(void) throw( RuntimeException ) +Calendar_gregorian::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(cCalendar); diff --git a/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx index b9356948f92f..02da34c2ddd8 100644 --- a/i18npool/source/calendar/calendar_jewish.cxx +++ b/i18npool/source/calendar/calendar_jewish.cxx @@ -281,7 +281,7 @@ void Calendar_jewish::mapToGregorian() throw(RuntimeException) // Methods in XExtendedCalendar OUString SAL_CALL Calendar_jewish::getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { nNativeNumberMode = NativeNumberMode::NATNUM2; // make Hebrew number for Jewish calendar diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index 43d2d208bc42..e58598ebd54a 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -54,7 +54,7 @@ cclass_Unicode::~cclass_Unicode() { OUString SAL_CALL -cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException) { +cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Int32 len = Text.getLength(); if (nPos >= len) return OUString(); @@ -66,7 +66,7 @@ cclass_Unicode::toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, } OUString SAL_CALL -cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException) { +cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Int32 len = Text.getLength(); if (nPos >= len) return OUString(); @@ -78,7 +78,7 @@ cclass_Unicode::toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, } OUString SAL_CALL -cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException) { +cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Int32 len = Text.getLength(); if (nPos >= len) return OUString(); @@ -103,20 +103,20 @@ cclass_Unicode::toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, } sal_Int16 SAL_CALL -cclass_Unicode::getType( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException) { +cclass_Unicode::getType( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException, std::exception) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; return (sal_Int16) u_charType(Text.iterateCodePoints(&nPos, 0)); } sal_Int16 SAL_CALL -cclass_Unicode::getCharacterDirection( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException) { +cclass_Unicode::getCharacterDirection( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException, std::exception) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; return (sal_Int16) u_charDirection(Text.iterateCodePoints(&nPos, 0)); } sal_Int16 SAL_CALL -cclass_Unicode::getScript( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException) { +cclass_Unicode::getScript( const OUString& Text, sal_Int32 nPos ) throw(RuntimeException, std::exception) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; // ICU Unicode script type UBlockCode starts from 1 for Basci Latin, // while OO.o enum UnicideScript starts from 0. @@ -191,14 +191,14 @@ cclass_Unicode::getCharType( const OUString& Text, sal_Int32* nPos, sal_Int32 in } sal_Int32 SAL_CALL -cclass_Unicode::getCharacterType( const OUString& Text, sal_Int32 nPos, const Locale& /*rLocale*/ ) throw(RuntimeException) { +cclass_Unicode::getCharacterType( const OUString& Text, sal_Int32 nPos, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; return getCharType(Text, &nPos, 0); } sal_Int32 SAL_CALL -cclass_Unicode::getStringType( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& /*rLocale*/ ) throw(RuntimeException) { +cclass_Unicode::getStringType( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount, const Locale& /*rLocale*/ ) throw(RuntimeException, std::exception) { if ( nPos < 0 || Text.getLength() <= nPos ) return 0; sal_Int32 result = 0; @@ -222,7 +222,7 @@ ParseResult SAL_CALL cclass_Unicode::parseAnyToken( const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, const OUString& userDefinedCharactersCont ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { ParseResult r; if ( Text.getLength() <= nPos ) @@ -246,7 +246,7 @@ ParseResult SAL_CALL cclass_Unicode::parsePredefinedToken( const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, const OUString& userDefinedCharactersCont ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { ParseResult r; if ( Text.getLength() <= nPos ) @@ -260,17 +260,17 @@ ParseResult SAL_CALL cclass_Unicode::parsePredefinedToken( return r; } -OUString SAL_CALL cclass_Unicode::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL cclass_Unicode::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.CharacterClassification_Unicode"); } -sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException ) +sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString("com.sun.star.i18n.CharacterClassification_Unicode"); diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 068fb0c6fce8..d2dd5be130e6 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -44,28 +44,28 @@ CharacterClassificationImpl::~CharacterClassificationImpl() { OUString SAL_CALL CharacterClassificationImpl::toUpper( const OUString& Text, sal_Int32 nPos, - sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException) + sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { return getLocaleSpecificCharacterClassification(rLocale)->toUpper(Text, nPos, nCount, rLocale); } OUString SAL_CALL CharacterClassificationImpl::toLower( const OUString& Text, sal_Int32 nPos, - sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException) + sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { return getLocaleSpecificCharacterClassification(rLocale)->toLower(Text, nPos, nCount, rLocale); } OUString SAL_CALL CharacterClassificationImpl::toTitle( const OUString& Text, sal_Int32 nPos, - sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException) + sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { return getLocaleSpecificCharacterClassification(rLocale)->toTitle(Text, nPos, nCount, rLocale); } sal_Int16 SAL_CALL CharacterClassificationImpl::getType( const OUString& Text, sal_Int32 nPos ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (xUCI.is()) return xUCI->getType(Text, nPos); @@ -74,7 +74,7 @@ CharacterClassificationImpl::getType( const OUString& Text, sal_Int32 nPos ) sal_Int16 SAL_CALL CharacterClassificationImpl::getCharacterDirection( const OUString& Text, sal_Int32 nPos ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (xUCI.is()) return xUCI->getCharacterDirection(Text, nPos); @@ -83,7 +83,7 @@ CharacterClassificationImpl::getCharacterDirection( const OUString& Text, sal_In sal_Int16 SAL_CALL CharacterClassificationImpl::getScript( const OUString& Text, sal_Int32 nPos ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (xUCI.is()) return xUCI->getScript(Text, nPos); @@ -92,14 +92,14 @@ CharacterClassificationImpl::getScript( const OUString& Text, sal_Int32 nPos ) sal_Int32 SAL_CALL CharacterClassificationImpl::getCharacterType( const OUString& Text, sal_Int32 nPos, - const Locale& rLocale ) throw(RuntimeException) + const Locale& rLocale ) throw(RuntimeException, std::exception) { return getLocaleSpecificCharacterClassification(rLocale)->getCharacterType(Text, nPos, rLocale); } sal_Int32 SAL_CALL CharacterClassificationImpl::getStringType( const OUString& Text, sal_Int32 nPos, - sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException) + sal_Int32 nCount, const Locale& rLocale ) throw(RuntimeException, std::exception) { return getLocaleSpecificCharacterClassification(rLocale)->getStringType(Text, nPos, nCount, rLocale); } @@ -108,7 +108,7 @@ ParseResult SAL_CALL CharacterClassificationImpl::parseAnyToken( const OUString& Text, sal_Int32 nPos, const Locale& rLocale, sal_Int32 startCharTokenType, const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, const OUString& userDefinedCharactersCont ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return getLocaleSpecificCharacterClassification(rLocale)->parseAnyToken(Text, nPos, rLocale, startCharTokenType,userDefinedCharactersStart, @@ -120,7 +120,7 @@ ParseResult SAL_CALL CharacterClassificationImpl::parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text, sal_Int32 nPos, const Locale& rLocale, sal_Int32 startCharTokenType, const OUString& userDefinedCharactersStart, sal_Int32 contCharTokenType, - const OUString& userDefinedCharactersCont ) throw(RuntimeException) + const OUString& userDefinedCharactersCont ) throw(RuntimeException, std::exception) { return getLocaleSpecificCharacterClassification(rLocale)->parsePredefinedToken( nTokenType, Text, nPos, rLocale, startCharTokenType, userDefinedCharactersStart, @@ -193,20 +193,20 @@ CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Loca OUString SAL_CALL CharacterClassificationImpl::getImplementationName(void) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.CharacterClassification"); } sal_Bool SAL_CALL CharacterClassificationImpl::supportsService(const OUString& rServiceName) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -CharacterClassificationImpl::getSupportedServiceNames(void) throw( RuntimeException ) +CharacterClassificationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString("com.sun.star.i18n.CharacterClassification"); diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx b/i18npool/source/characterclassification/unoscripttypedetector.cxx index 99e30d671492..c696c0ea94d9 100644 --- a/i18npool/source/characterclassification/unoscripttypedetector.cxx +++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx @@ -24,58 +24,58 @@ // class UnoScriptTypeDetector sal_Int16 SAL_CALL -UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return ScriptTypeDetector::getScriptDirection(Text, nPos, defaultScriptDirection); } // return value '-1' means either the direction on nPos is not same as scriptDirection or nPos is out of range. sal_Int32 SAL_CALL -UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return ScriptTypeDetector::beginOfScriptDirection(Text, nPos, direction); } sal_Int32 SAL_CALL -UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 direction ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return ScriptTypeDetector::endOfScriptDirection(Text, nPos, direction); } sal_Int16 SAL_CALL -UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return ScriptTypeDetector::getCTLScriptType(Text, nPos); } // Begin of Script Type is inclusive. sal_Int32 SAL_CALL -UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return ScriptTypeDetector::beginOfCTLScriptType(Text, nPos); } // End of the Script Type is exclusive, the return value pointing to the begin of next script type sal_Int32 SAL_CALL -UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException) +UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (::com::sun::star::uno::RuntimeException, std::exception) { return ScriptTypeDetector::endOfCTLScriptType(Text, nPos); } OUString SAL_CALL -UnoScriptTypeDetector::getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) +UnoScriptTypeDetector::getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.ScriptTypeDetector"); } sal_Bool SAL_CALL -UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException ) +UnoScriptTypeDetector::supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } ::com::sun::star::uno::Sequence< OUString > SAL_CALL -UnoScriptTypeDetector::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ) +UnoScriptTypeDetector::getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Sequence< OUString > aRet(1); aRet[0] = OUString("com.sun.star.i18n.ScriptTypeDetector"); diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx index dd2f9ca49d7e..2eb4e146c395 100644 --- a/i18npool/source/collator/chaptercollator.cxx +++ b/i18npool/source/collator/chaptercollator.cxx @@ -41,7 +41,7 @@ ChapterCollator::~ChapterCollator() } sal_Int32 SAL_CALL -ChapterCollator::compareString( const OUString& s1, const OUString& s2) throw(RuntimeException) +ChapterCollator::compareString( const OUString& s1, const OUString& s2) throw(RuntimeException, std::exception) { return compareSubstring(s1, 0, s1.getLength(), s2, 0, s2.getLength()); } @@ -50,7 +50,7 @@ ChapterCollator::compareString( const OUString& s1, const OUString& s2) throw(Ru sal_Int32 SAL_CALL ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, - const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException) + const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException, std::exception) { if( len1 <= 1 || len2 <= 1 || ! cclass.is() ) return CollatorImpl::compareSubstring( str1, off1, len1, str2, off2, len2 ); @@ -77,19 +77,19 @@ ChapterCollator::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int const sal_Char *cChapCollator = "com.sun.star.i18n.ChapterCollator"; OUString SAL_CALL -ChapterCollator::getImplementationName() throw( RuntimeException ) +ChapterCollator::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii(cChapCollator); } sal_Bool SAL_CALL -ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeException ) +ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -ChapterCollator::getSupportedServiceNames() throw( RuntimeException ) +ChapterCollator::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(cChapCollator); diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx index a928b0b7ccbf..f0a56497d159 100644 --- a/i18npool/source/collator/collatorImpl.cxx +++ b/i18npool/source/collator/collatorImpl.cxx @@ -47,7 +47,7 @@ CollatorImpl::~CollatorImpl() sal_Int32 SAL_CALL CollatorImpl::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, - const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException) + const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException, std::exception) { if (cachedItem) return cachedItem->xC->compareSubstring(str1, off1, len1, str2, off2, len2); @@ -61,7 +61,7 @@ CollatorImpl::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 } sal_Int32 SAL_CALL -CollatorImpl::compareString( const OUString& in_str1, const OUString& in_str2) throw(RuntimeException) +CollatorImpl::compareString( const OUString& in_str1, const OUString& in_str2) throw(RuntimeException, std::exception) { if (cachedItem) return cachedItem->xC->compareString(in_str1, in_str2); @@ -71,7 +71,7 @@ CollatorImpl::compareString( const OUString& in_str1, const OUString& in_str2) t sal_Int32 SAL_CALL -CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException) +CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collatorOptions) throw(RuntimeException, std::exception) { const Sequence< Implementation > &imp = mxLocaleData->getCollatorImplementations(rLocale); for (sal_Int16 i = 0; i < imp.getLength(); i++) @@ -84,7 +84,7 @@ CollatorImpl::loadDefaultCollator(const lang::Locale& rLocale, sal_Int32 collato sal_Int32 SAL_CALL CollatorImpl::loadCollatorAlgorithm(const OUString& impl, const lang::Locale& rLocale, sal_Int32 collatorOptions) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (! cachedItem || ! cachedItem->equals(rLocale, impl)) loadCachedCollator(rLocale, impl); @@ -99,7 +99,7 @@ CollatorImpl::loadCollatorAlgorithm(const OUString& impl, const lang::Locale& rL void SAL_CALL CollatorImpl::loadCollatorAlgorithmWithEndUserOption(const OUString& impl, const lang::Locale& rLocale, - const Sequence< sal_Int32 >& collatorOptions) throw(RuntimeException) + const Sequence< sal_Int32 >& collatorOptions) throw(RuntimeException, std::exception) { sal_Int32 options = 0; for (sal_Int32 i = 0; i < collatorOptions.getLength(); i++) @@ -108,7 +108,7 @@ CollatorImpl::loadCollatorAlgorithmWithEndUserOption(const OUString& impl, const } Sequence< OUString > SAL_CALL -CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException) +CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(RuntimeException, std::exception) { nLocale = rLocale; const Sequence< Implementation > &imp = mxLocaleData->getCollatorImplementations(rLocale); @@ -127,7 +127,7 @@ CollatorImpl::listCollatorAlgorithms( const lang::Locale& rLocale ) throw(Runtim } Sequence< sal_Int32 > SAL_CALL -CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) throw(RuntimeException) +CollatorImpl::listCollatorOptions( const OUString& /*collatorAlgorithmName*/ ) throw(RuntimeException, std::exception) { Sequence< OUString > option_str = mxLocaleData->getCollationOptions(nLocale); Sequence< sal_Int32 > option_int(option_str.getLength()); @@ -212,19 +212,19 @@ CollatorImpl::loadCachedCollator(const lang::Locale& rLocale, const OUString& rS } } -OUString SAL_CALL CollatorImpl::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL CollatorImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.Collator"); } sal_Bool SAL_CALL CollatorImpl::supportsService(const OUString& rServiceName) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -CollatorImpl::getSupportedServiceNames() throw( RuntimeException ) +CollatorImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString("com.sun.star.i18n.Collator"); diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 8da25cb34c98..f6fcbe75d9ce 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -91,13 +91,13 @@ const sal_uInt8* get_collator_data_zh_zhuyin(); sal_Int32 SAL_CALL Collator_Unicode::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, - const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException) + const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(RuntimeException, std::exception) { return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()) + off1, len1, reinterpret_cast<const UChar *>(str2.getStr()) + off2, len2); // UChar != sal_Unicode in MinGW } sal_Int32 SAL_CALL -Collator_Unicode::compareString( const OUString& str1, const OUString& str2) throw(RuntimeException) +Collator_Unicode::compareString( const OUString& str1, const OUString& str2) throw(RuntimeException, std::exception) { return collator->compare(reinterpret_cast<const UChar *>(str1.getStr()), reinterpret_cast<const UChar *>(str2.getStr())); // UChar != sal_Unicode in MinGW } @@ -110,7 +110,7 @@ extern "C" { static void SAL_CALL thisModule() {} } sal_Int32 SAL_CALL Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang::Locale& rLocale, sal_Int32 options) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (!collator) { UErrorCode status = U_ZERO_ERROR; @@ -243,19 +243,19 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString& rAlgorithm, const lang:: OUString SAL_CALL -Collator_Unicode::getImplementationName() throw( RuntimeException ) +Collator_Unicode::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii(implementationName); } sal_Bool SAL_CALL -Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException ) +Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -Collator_Unicode::getSupportedServiceNames() throw( RuntimeException ) +Collator_Unicode::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(implementationName); diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx index d4738197fce2..e58afe75efc0 100644 --- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx +++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx @@ -276,13 +276,13 @@ void DefaultNumberingProvider::impl_loadTranslit() } Sequence< Reference<container::XIndexAccess> > -DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale ) throw(RuntimeException) +DefaultNumberingProvider::getDefaultOutlineNumberings(const Locale& rLocale ) throw(RuntimeException, std::exception) { return LocaleDataImpl().getOutlineNumberingLevels( rLocale ); } Sequence< Sequence<beans::PropertyValue> > -DefaultNumberingProvider::getDefaultContinuousNumberingLevels( const Locale& rLocale ) throw(RuntimeException) +DefaultNumberingProvider::getDefaultContinuousNumberingLevels( const Locale& rLocale ) throw(RuntimeException, std::exception) { return LocaleDataImpl().getContinuousNumberingLevels( rLocale ); } @@ -543,7 +543,7 @@ Any getPropertyByName( const Sequence<beans::PropertyValue>& aProperties, OUString DefaultNumberingProvider::makeNumberingString( const Sequence<beans::PropertyValue>& aProperties, const Locale& aLocale ) - throw( IllegalArgumentException, RuntimeException ) + throw( IllegalArgumentException, RuntimeException, std::exception ) { // the Sequence of PropertyValues is expected to have at least 4 elements: // elt Name Type purpose @@ -997,7 +997,7 @@ DefaultNumberingProvider::isScriptFlagEnabled(const OUString& aName) throw(Runti } Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { Sequence< sal_Int16 > aRet(nSupported_NumberingTypes ); sal_Int16* pArray = aRet.getArray(); @@ -1015,7 +1015,7 @@ Sequence< sal_Int16 > DefaultNumberingProvider::getSupportedNumberingTypes( ) } sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumberingIdentifier ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) if(rNumberingIdentifier.equals(makeNumberingIdentifier(i))) @@ -1024,7 +1024,7 @@ sal_Int16 DefaultNumberingProvider::getNumberingType( const OUString& rNumbering } sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingIdentifier ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) if(rNumberingIdentifier.equals(makeNumberingIdentifier(i))) @@ -1033,7 +1033,7 @@ sal_Bool DefaultNumberingProvider::hasNumberingType( const OUString& rNumberingI } OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingType ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { for(sal_Int16 i = 0; i < nSupported_NumberingTypes; i++) if(nNumberingType == aSupportedTypes[i].nType) @@ -1042,19 +1042,19 @@ OUString DefaultNumberingProvider::getNumberingIdentifier( sal_Int16 nNumberingT } OUString DefaultNumberingProvider::getImplementationName(void) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return OUString("com.sun.star.text.DefaultNumberingProvider"); } sal_Bool DefaultNumberingProvider::supportsService(const OUString& rServiceName) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > DefaultNumberingProvider::getSupportedServiceNames(void) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString("com.sun.star.text.DefaultNumberingProvider"); diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index 2e9f70b421f5..8da071164869 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -32,18 +32,18 @@ IndexEntrySupplier::IndexEntrySupplier( const Reference < XComponentContext >& r { } -Sequence < Locale > SAL_CALL IndexEntrySupplier::getLocaleList() throw (RuntimeException) +Sequence < Locale > SAL_CALL IndexEntrySupplier::getLocaleList() throw (RuntimeException, std::exception) { return LocaleDataImpl().getAllInstalledLocaleNames(); } -Sequence < OUString > SAL_CALL IndexEntrySupplier::getAlgorithmList( const Locale& rLocale ) throw (RuntimeException) +Sequence < OUString > SAL_CALL IndexEntrySupplier::getAlgorithmList( const Locale& rLocale ) throw (RuntimeException, std::exception) { return LocaleDataImpl().getIndexAlgorithm(rLocale); } sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, const OUString& SortAlgorithm, - sal_Int32 collatorOptions ) throw (RuntimeException) + sal_Int32 collatorOptions ) throw (RuntimeException, std::exception) { Sequence < OUString > algorithmList = getAlgorithmList( rLocale ); for (sal_Int32 i = 0; i < algorithmList.getLength(); i++) { @@ -55,13 +55,13 @@ sal_Bool SAL_CALL IndexEntrySupplier::loadAlgorithm( const Locale& rLocale, cons return sal_False; } -sal_Bool SAL_CALL IndexEntrySupplier::usePhoneticEntry( const Locale& rLocale ) throw (RuntimeException) +sal_Bool SAL_CALL IndexEntrySupplier::usePhoneticEntry( const Locale& rLocale ) throw (RuntimeException, std::exception) { return LocaleDataImpl().hasPhonetic(rLocale); } OUString SAL_CALL IndexEntrySupplier::getPhoneticCandidate( const OUString& rIndexEntry, - const Locale& rLocale ) throw (RuntimeException) + const Locale& rLocale ) throw (RuntimeException, std::exception) { if (getLocaleSpecificIndexEntrySupplier(rLocale, OUString()).is()) return xIES->getPhoneticCandidate(rIndexEntry, rLocale); @@ -70,7 +70,7 @@ OUString SAL_CALL IndexEntrySupplier::getPhoneticCandidate( const OUString& rInd } OUString SAL_CALL IndexEntrySupplier::getIndexKey( const OUString& rIndexEntry, - const OUString& rPhoneticEntry, const Locale& rLocale ) throw (RuntimeException) + const OUString& rPhoneticEntry, const Locale& rLocale ) throw (RuntimeException, std::exception) { if (xIES.is()) return xIES->getIndexKey(rIndexEntry, rPhoneticEntry, rLocale); @@ -81,7 +81,7 @@ OUString SAL_CALL IndexEntrySupplier::getIndexKey( const OUString& rIndexEntry, sal_Int16 SAL_CALL IndexEntrySupplier::compareIndexEntry( const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const Locale& rLocale1, const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const Locale& rLocale2 ) -throw (com::sun::star::uno::RuntimeException) +throw (com::sun::star::uno::RuntimeException, std::exception) { if (xIES.is()) return xIES->compareIndexEntry(rIndexEntry1, rPhoneticEntry1, rLocale1, @@ -92,7 +92,7 @@ throw (com::sun::star::uno::RuntimeException) OUString SAL_CALL IndexEntrySupplier::getIndexCharacter( const OUString& rIndexEntry, const Locale& rLocale, const OUString& rSortAlgorithm ) -throw (RuntimeException) +throw (RuntimeException, std::exception) { return getLocaleSpecificIndexEntrySupplier(rLocale, rSortAlgorithm)-> getIndexCharacter( rIndexEntry, rLocale, rSortAlgorithm ); @@ -165,7 +165,7 @@ IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, c } OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePages, - const Locale& rLocale ) throw (RuntimeException) + const Locale& rLocale ) throw (RuntimeException, std::exception) { Sequence< OUString > aFollowPageWords = LocaleDataImpl().getFollowPageWords(rLocale); @@ -177,19 +177,19 @@ OUString SAL_CALL IndexEntrySupplier::getIndexFollowPageWord( sal_Bool bMorePage #define implementationName "com.sun.star.i18n.IndexEntrySupplier" OUString SAL_CALL -IndexEntrySupplier::getImplementationName() throw( RuntimeException ) +IndexEntrySupplier::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii( implementationName ); } sal_Bool SAL_CALL -IndexEntrySupplier::supportsService(const OUString& rServiceName) throw( RuntimeException ) +IndexEntrySupplier::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -IndexEntrySupplier::getSupportedServiceNames() throw( RuntimeException ) +IndexEntrySupplier::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii( implementationName ); diff --git a/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx index 4df4d24c309f..ba59c47d92bb 100644 --- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_asian.cxx @@ -78,7 +78,7 @@ sal_uInt16** get_zh_zhuyin(sal_Int16*); OUString SAL_CALL IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry, - const Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException) + const Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException, std::exception) { sal_Int32 i=0; sal_uInt32 ch = rIndexEntry.iterateCodePoints(&i, 0); @@ -133,7 +133,7 @@ IndexEntrySupplier_asian::getIndexCharacter( const OUString& rIndexEntry, OUString SAL_CALL IndexEntrySupplier_asian::getIndexKey( const OUString& rIndexEntry, - const OUString& rPhoneticEntry, const Locale& rLocale) throw (RuntimeException) + const OUString& rPhoneticEntry, const Locale& rLocale) throw (RuntimeException, std::exception) { return getIndexCharacter(getEntry(rIndexEntry, rPhoneticEntry, rLocale), rLocale, aAlgorithm); } @@ -142,7 +142,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_asian::compareIndexEntry( const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const Locale& rLocale1, const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const Locale& rLocale2 ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int32 result = collator->compareString(getEntry(rIndexEntry1, rPhoneticEntry1, rLocale1), getEntry(rIndexEntry2, rPhoneticEntry2, rLocale2)); @@ -158,7 +158,7 @@ IndexEntrySupplier_asian::compareIndexEntry( OUString SAL_CALL IndexEntrySupplier_asian::getPhoneticCandidate( const OUString& rIndexEntry, - const Locale& rLocale ) throw (RuntimeException) + const Locale& rLocale ) throw (RuntimeException, std::exception) { sal_uInt16 **(*func)(sal_Int16*)=NULL; #ifndef DISABLE_DYNLOADING diff --git a/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx index fc8cc8ddbcca..c330ed582e0c 100644 --- a/i18npool/source/indexentry/indexentrysupplier_common.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_common.cxx @@ -40,29 +40,29 @@ IndexEntrySupplier_Common::~IndexEntrySupplier_Common() delete collator; } -Sequence < lang::Locale > SAL_CALL IndexEntrySupplier_Common::getLocaleList() throw (RuntimeException) +Sequence < lang::Locale > SAL_CALL IndexEntrySupplier_Common::getLocaleList() throw (RuntimeException, std::exception) { throw RuntimeException(); } -Sequence < OUString > SAL_CALL IndexEntrySupplier_Common::getAlgorithmList( const lang::Locale& ) throw (RuntimeException) +Sequence < OUString > SAL_CALL IndexEntrySupplier_Common::getAlgorithmList( const lang::Locale& ) throw (RuntimeException, std::exception) { throw RuntimeException(); } OUString SAL_CALL IndexEntrySupplier_Common::getPhoneticCandidate( const OUString&, - const lang::Locale& ) throw (RuntimeException) + const lang::Locale& ) throw (RuntimeException, std::exception) { return OUString(); } -sal_Bool SAL_CALL IndexEntrySupplier_Common::usePhoneticEntry( const lang::Locale& ) throw (RuntimeException) +sal_Bool SAL_CALL IndexEntrySupplier_Common::usePhoneticEntry( const lang::Locale& ) throw (RuntimeException, std::exception) { throw RuntimeException(); } sal_Bool SAL_CALL IndexEntrySupplier_Common::loadAlgorithm( const lang::Locale& rLocale, - const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException) + const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException, std::exception) { usePhonetic = LocaleDataImpl().isPhonetic(rLocale, rAlgorithm); collator->loadCollatorAlgorithm(rAlgorithm, rLocale, collatorOptions); @@ -72,7 +72,7 @@ sal_Bool SAL_CALL IndexEntrySupplier_Common::loadAlgorithm( const lang::Locale& } OUString SAL_CALL IndexEntrySupplier_Common::getIndexKey( const OUString& rIndexEntry, - const OUString&, const lang::Locale& ) throw (RuntimeException) + const OUString&, const lang::Locale& ) throw (RuntimeException, std::exception) { sal_Int32 nPos=0; sal_uInt32 indexChar=rIndexEntry.iterateCodePoints(&nPos, 0); @@ -82,7 +82,7 @@ OUString SAL_CALL IndexEntrySupplier_Common::getIndexKey( const OUString& rIndex sal_Int16 SAL_CALL IndexEntrySupplier_Common::compareIndexEntry( const OUString& rIndexEntry1, const OUString&, const lang::Locale&, const OUString& rIndexEntry2, const OUString&, const lang::Locale& ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return sal::static_int_cast< sal_Int16 >( collator->compareString(rIndexEntry1, rIndexEntry2)); @@ -90,13 +90,13 @@ sal_Int16 SAL_CALL IndexEntrySupplier_Common::compareIndexEntry( } OUString SAL_CALL IndexEntrySupplier_Common::getIndexCharacter( const OUString& rIndexEntry, - const lang::Locale& rLocale, const OUString& ) throw (RuntimeException) + const lang::Locale& rLocale, const OUString& ) throw (RuntimeException, std::exception) { return getIndexKey(rIndexEntry, rIndexEntry, rLocale); } OUString SAL_CALL IndexEntrySupplier_Common::getIndexFollowPageWord( sal_Bool, - const lang::Locale& ) throw (RuntimeException) + const lang::Locale& ) throw (RuntimeException, std::exception) { throw RuntimeException(); } @@ -118,19 +118,19 @@ IndexEntrySupplier_Common::getEntry( const OUString& IndexEntry, } OUString SAL_CALL -IndexEntrySupplier_Common::getImplementationName() throw( RuntimeException ) +IndexEntrySupplier_Common::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii( implementationName ); } sal_Bool SAL_CALL -IndexEntrySupplier_Common::supportsService(const OUString& rServiceName) throw( RuntimeException ) +IndexEntrySupplier_Common::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -IndexEntrySupplier_Common::getSupportedServiceNames() throw( RuntimeException ) +IndexEntrySupplier_Common::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii( implementationName ); diff --git a/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx index 8edd4b29f557..0986857e9d84 100644 --- a/i18npool/source/indexentry/indexentrysupplier_default.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_default.cxx @@ -42,14 +42,14 @@ IndexEntrySupplier_Unicode::~IndexEntrySupplier_Unicode() } sal_Bool SAL_CALL IndexEntrySupplier_Unicode::loadAlgorithm( const lang::Locale& rLocale, - const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException) + const OUString& rAlgorithm, sal_Int32 collatorOptions ) throw (RuntimeException, std::exception) { index->init(rLocale, rAlgorithm); return IndexEntrySupplier_Common::loadAlgorithm(rLocale, rAlgorithm, collatorOptions); } OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexKey( const OUString& rIndexEntry, - const OUString& rPhoneticEntry, const lang::Locale& rLocale ) throw (RuntimeException) + const OUString& rPhoneticEntry, const lang::Locale& rLocale ) throw (RuntimeException, std::exception) { return index->getIndexDescription(getEntry(rIndexEntry, rPhoneticEntry, rLocale)); } @@ -57,7 +57,7 @@ OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexKey( const OUString& rInde sal_Int16 SAL_CALL IndexEntrySupplier_Unicode::compareIndexEntry( const OUString& rIndexEntry1, const OUString& rPhoneticEntry1, const lang::Locale& rLocale1, const OUString& rIndexEntry2, const OUString& rPhoneticEntry2, const lang::Locale& rLocale2 ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int16 result = index->getIndexWeight(getEntry(rIndexEntry1, rPhoneticEntry1, rLocale1)) - @@ -70,7 +70,7 @@ sal_Int16 SAL_CALL IndexEntrySupplier_Unicode::compareIndexEntry( } OUString SAL_CALL IndexEntrySupplier_Unicode::getIndexCharacter( const OUString& rIndexEntry, - const lang::Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException) { + const lang::Locale& rLocale, const OUString& rAlgorithm ) throw (RuntimeException, std::exception) { if (loadAlgorithm( rLocale, rAlgorithm, CollatorOptions::CollatorOptions_IGNORE_CASE_ACCENT)) return index->getIndexDescription(rIndexEntry); diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx index 6a2f6622fef2..39ce0ee685a5 100644 --- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx +++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx @@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUString& rIndexEntry, const lang::Locale& /*rLocale*/, const OUString& /*rSortAlgorithm*/ ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { sal_Unicode ch=rIndexEntry.toChar(); sal_uInt16 first = idx[ ch >> 8 ]; @@ -44,7 +44,7 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexCharacter( const OUStr OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& IndexEntry, const OUString& PhoneticEntry, const lang::Locale& rLocale ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { return getIndexCharacter( PhoneticEntry.isEmpty() ? IndexEntry : PhoneticEntry , rLocale, OUString()); } @@ -52,7 +52,7 @@ OUString SAL_CALL IndexEntrySupplier_ja_phonetic::getIndexKey( const OUString& I sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( const OUString& IndexEntry1, const OUString& PhoneticEntry1, const lang::Locale& rLocale1, const OUString& IndexEntry2, const OUString& PhoneticEntry2, const lang::Locale& rLocale2 ) - throw (com::sun::star::uno::RuntimeException) + throw (com::sun::star::uno::RuntimeException, std::exception) { sal_Int16 result = sal::static_int_cast<sal_Int16>( collator->compareString( IndexEntrySupplier_ja_phonetic::getIndexKey(IndexEntry1, PhoneticEntry1, rLocale1), @@ -68,13 +68,13 @@ sal_Int16 SAL_CALL IndexEntrySupplier_ja_phonetic::compareIndexEntry( static const sal_Char first[] = "ja_phonetic (alphanumeric first)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable::loadAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException) + sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException, std::exception) { return collator->loadCollatorAlgorithm(OUString::createFromAscii(first), rLocale, collatorOptions) == 0; } sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant::loadAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException) + sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException, std::exception) { return collator->loadCollatorAlgorithm(OUString::createFromAscii(first), rLocale, collatorOptions) == 0; } @@ -82,13 +82,13 @@ sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant static const sal_Char last[] = "ja_phonetic (alphanumeric last)"; sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable::loadAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException) + sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException, std::exception) { return collator->loadCollatorAlgorithm(OUString::createFromAscii(last), rLocale, collatorOptions) == 0; } sal_Bool SAL_CALL IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_consonant::loadAlgorithm( const com::sun::star::lang::Locale& rLocale, const OUString& /*SortAlgorithm*/, - sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException) + sal_Int32 collatorOptions ) throw (com::sun::star::uno::RuntimeException, std::exception) { return collator->loadCollatorAlgorithm(OUString::createFromAscii(last), rLocale, collatorOptions) == 0; } diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index 496c06cc68d0..ed0b5ccf410a 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -51,7 +51,7 @@ InputSequenceCheckerImpl::~InputSequenceCheckerImpl() sal_Bool SAL_CALL InputSequenceCheckerImpl::checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException) + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException, std::exception) { if (inputCheckMode == InputSequenceCheckMode::PASSTHROUGH) return sal_True; @@ -66,7 +66,7 @@ InputSequenceCheckerImpl::checkInputSequence(const OUString& Text, sal_Int32 nSt sal_Int32 SAL_CALL InputSequenceCheckerImpl::correctInputSequence(OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException) + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(RuntimeException, std::exception) { if (inputCheckMode != InputSequenceCheckMode::PASSTHROUGH) { sal_Char* language = getLanguageByScripType(Text[nStartPos], inputChar); @@ -134,19 +134,19 @@ InputSequenceCheckerImpl::getInputSequenceChecker(sal_Char* rLanguage) throw (Ru } OUString SAL_CALL -InputSequenceCheckerImpl::getImplementationName(void) throw( RuntimeException ) +InputSequenceCheckerImpl::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString::createFromAscii(serviceName); } sal_Bool SAL_CALL -InputSequenceCheckerImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) +InputSequenceCheckerImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -InputSequenceCheckerImpl::getSupportedServiceNames(void) throw( RuntimeException ) +InputSequenceCheckerImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(serviceName); diff --git a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx index 6b68e53433b3..1a29210361e4 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx @@ -112,7 +112,7 @@ InputSequenceChecker_hi::checkInputSequence(const OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { sal_Unicode currentChar = Text[nStartPos]; sal_uInt16 ch1 = getCharType(inputChar); @@ -126,7 +126,7 @@ InputSequenceChecker_hi::correctInputSequence(OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { if (checkInputSequence(Text, nStartPos, inputChar, inputCheckMode)) Text = Text.replaceAt(++nStartPos, 0, OUString(inputChar)); diff --git a/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx index fb90630e28f6..64b1e930d5a6 100644 --- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker_th.cxx @@ -78,7 +78,7 @@ static sal_Bool SAL_CALL check(sal_Unicode ch1, sal_Unicode ch2, sal_Int16 input sal_Bool SAL_CALL InputSequenceChecker_th::checkInputSequence(const OUString& Text, sal_Int32 nStartPos, - sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException) + sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(com::sun::star::uno::RuntimeException, std::exception) { return check(Text[nStartPos], inputChar, inputCheckMode); } @@ -88,7 +88,7 @@ InputSequenceChecker_th::correctInputSequence(OUString& Text, sal_Int32 nStartPos, sal_Unicode inputChar, sal_Int16 inputCheckMode) - throw(com::sun::star::uno::RuntimeException) + throw(com::sun::star::uno::RuntimeException, std::exception) { /* 9 rules for input sequence correction, see issue i42661 for detail, diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx index f443141eb729..8024625d240d 100644 --- a/i18npool/source/localedata/localedata.cxx +++ b/i18npool/source/localedata/localedata.cxx @@ -354,7 +354,7 @@ LocaleDataImpl::~LocaleDataImpl() LocaleDataItem SAL_CALL -LocaleDataImpl::getLocaleItem( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getLocaleItem( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **dataItem = NULL; @@ -684,7 +684,7 @@ Sequence< CalendarItem2 > LocaleDataImpl::getCalendarItems( Sequence< Calendar2 > SAL_CALL -LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode const * const * allCalendars = NULL; @@ -730,7 +730,7 @@ LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException Sequence< Calendar > SAL_CALL -LocaleDataImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException, std::exception) { const Sequence< Calendar2 > aCal2( getAllCalendars2( rLocale)); sal_Int32 nLen = aCal2.getLength(); @@ -746,7 +746,7 @@ LocaleDataImpl::getAllCalendars( const Locale& rLocale ) throw(RuntimeException) Sequence< Currency2 > SAL_CALL -LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **allCurrencies = NULL; @@ -780,7 +780,7 @@ LocaleDataImpl::getAllCurrencies2( const Locale& rLocale ) throw(RuntimeExceptio Sequence< Currency > SAL_CALL -LocaleDataImpl::getAllCurrencies( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllCurrencies( const Locale& rLocale ) throw(RuntimeException, std::exception) { Sequence< Currency2 > aCur2( getAllCurrencies2( rLocale)); sal_Int32 nLen = aCur2.getLength(); @@ -830,7 +830,7 @@ static const sal_Unicode * replace( sal_Unicode const * const formatCode, sal_Un } Sequence< FormatElement > SAL_CALL -LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException, std::exception) { const int SECTIONS = 2; struct FormatSection @@ -881,7 +881,7 @@ LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException) Sequence< OUString > SAL_CALL -LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getDateAcceptancePatterns( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **patternsArray = NULL; @@ -927,7 +927,7 @@ LocaleDataImpl::getCollatorRuleByAlgorithm( const Locale& rLocale, const OUStrin Sequence< Implementation > SAL_CALL -LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **collatorArray = NULL; @@ -952,7 +952,7 @@ LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) throw(Runtim } Sequence< OUString > SAL_CALL -LocaleDataImpl::getCollationOptions( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getCollationOptions( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **optionsArray = NULL; @@ -974,7 +974,7 @@ LocaleDataImpl::getCollationOptions( const Locale& rLocale ) throw(RuntimeExcept } Sequence< OUString > SAL_CALL -LocaleDataImpl::getSearchOptions( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getSearchOptions( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **optionsArray = NULL; @@ -1134,7 +1134,7 @@ LocaleDataImpl::getFollowPageWords( const Locale& rLocale ) throw(RuntimeExcepti } Sequence< OUString > SAL_CALL -LocaleDataImpl::getTransliterations( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getTransliterations( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **transliterationsArray = NULL; @@ -1162,7 +1162,7 @@ LocaleDataImpl::getTransliterations( const Locale& rLocale ) throw(RuntimeExcept LanguageCountryInfo SAL_CALL -LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **LCInfoArray = NULL; @@ -1188,7 +1188,7 @@ LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale ) throw(RuntimeExc ForbiddenCharacters SAL_CALL -LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getForbiddenCharacters( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **LCForbiddenCharactersArray = NULL; @@ -1247,7 +1247,7 @@ LocaleDataImpl::getBreakIteratorRules( const Locale& rLocale ) throw(RuntimeExc Sequence< OUString > SAL_CALL -LocaleDataImpl::getReservedWord( const Locale& rLocale ) throw(RuntimeException) +LocaleDataImpl::getReservedWord( const Locale& rLocale ) throw(RuntimeException, std::exception) { sal_Unicode **LCReservedWordsArray = NULL; @@ -1373,13 +1373,13 @@ public: ~OutlineNumbering(); //XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException); + virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception); virtual Any SAL_CALL getByIndex( sal_Int32 Index ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException); + throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception); //XElementAccess - virtual Type SAL_CALL getElementType( ) throw(RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException); + virtual Type SAL_CALL getElementType( ) throw(RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException, std::exception); }; static sal_Char* U2C( OUString str ) @@ -1516,7 +1516,7 @@ oslGenericFunction SAL_CALL LocaleDataImpl::getFunctionSymbol( const Locale& rLo } Sequence< Locale > SAL_CALL -LocaleDataImpl::getAllInstalledLocaleNames() throw(RuntimeException) +LocaleDataImpl::getAllInstalledLocaleNames() throw(RuntimeException, std::exception) { Sequence< lang::Locale > seq( nbOfLocales ); sal_Int16 nInstalled = 0; @@ -1559,13 +1559,13 @@ OutlineNumbering::~OutlineNumbering() delete [] m_pOutlineLevels; } -sal_Int32 OutlineNumbering::getCount( ) throw(RuntimeException) +sal_Int32 OutlineNumbering::getCount( ) throw(RuntimeException, std::exception) { return m_nCount; } Any OutlineNumbering::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) + throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { if(nIndex < 0 || nIndex >= m_nCount) throw IndexOutOfBoundsException(); @@ -1603,30 +1603,30 @@ Any OutlineNumbering::getByIndex( sal_Int32 nIndex ) return aRet; } -Type OutlineNumbering::getElementType( ) throw(RuntimeException) +Type OutlineNumbering::getElementType( ) throw(RuntimeException, std::exception) { return ::getCppuType((Sequence<PropertyValue>*)0); } -sal_Bool OutlineNumbering::hasElements( ) throw(RuntimeException) +sal_Bool OutlineNumbering::hasElements( ) throw(RuntimeException, std::exception) { return m_nCount > 0; } OUString SAL_CALL -LocaleDataImpl::getImplementationName() throw( RuntimeException ) +LocaleDataImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.LocaleDataImpl"); } sal_Bool SAL_CALL LocaleDataImpl::supportsService(const OUString& rServiceName) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -LocaleDataImpl::getSupportedServiceNames() throw( RuntimeException ) +LocaleDataImpl::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.LocaleData"; diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx index 2997d312f1e7..7c0bebccfa2a 100644 --- a/i18npool/source/localedata/saxparser.cxx +++ b/i18npool/source/localedata/saxparser.cxx @@ -70,7 +70,7 @@ public: public: virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { nBytesToRead = (nBytesToRead > m_seq.getLength() - nPos ) ? m_seq.getLength() - nPos : @@ -82,22 +82,22 @@ public: virtual sal_Int32 SAL_CALL readSomeBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { return readBytes( aData, nMaxBytesToRead ); } virtual void SAL_CALL skipBytes( sal_Int32 /*nBytesToSkip*/ ) - throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException) + throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { // not implemented } virtual sal_Int32 SAL_CALL available( ) - throw(NotConnectedException, IOException, RuntimeException) + throw(NotConnectedException, IOException, RuntimeException, std::exception) { return m_seq.getLength() - nPos; } virtual void SAL_CALL closeInput( ) - throw(NotConnectedException, IOException, RuntimeException) + throw(NotConnectedException, IOException, RuntimeException, std::exception) { // not needed } @@ -174,7 +174,7 @@ public: public: // Error handler - virtual void SAL_CALL error(const Any& aSAXParseException) throw (SAXException, RuntimeException) + virtual void SAL_CALL error(const Any& aSAXParseException) throw (SAXException, RuntimeException, std::exception) { ++nError; printf( "Error !\n" ); @@ -183,12 +183,12 @@ public: // Error handler Reference < XInterface >() , aSAXParseException ); } - virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException) + virtual void SAL_CALL fatalError(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) { ++nError; printf( "Fatal Error !\n" ); } - virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException) + virtual void SAL_CALL warning(const Any& /*aSAXParseException*/) throw (SAXException, RuntimeException, std::exception) { printf( "Warning !\n" ); } @@ -201,7 +201,7 @@ public: // ExtendedDocumentHandler stack<LocaleNode *> currentNode ; LocaleNode * rootNode; - virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL startDocument(void) throw (SAXException, RuntimeException, std::exception) { printf( "parsing document %s started\n", theLocale); of.writeAsciiString("#include <sal/types.h>\n\n\n"); @@ -209,7 +209,7 @@ public: // ExtendedDocumentHandler of.writeAsciiString("extern \"C\" {\n\n"); } - virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException) + virtual void SAL_CALL endDocument(void) throw (SAXException, RuntimeException, std::exception) { if (rootNode) { @@ -234,7 +234,7 @@ public: // ExtendedDocumentHandler virtual void SAL_CALL startElement(const OUString& aName, const Reference< XAttributeList > & xAttribs) - throw (SAXException,RuntimeException) + throw (SAXException,RuntimeException, std::exception) { LocaleNode * l = LocaleNode::createNode (aName, xAttribs); @@ -248,29 +248,29 @@ public: // ExtendedDocumentHandler } - virtual void SAL_CALL endElement(const OUString& /*aName*/) throw (SAXException,RuntimeException) + virtual void SAL_CALL endElement(const OUString& /*aName*/) throw (SAXException,RuntimeException, std::exception) { currentNode.pop(); } - virtual void SAL_CALL characters(const OUString& aChars) throw (SAXException,RuntimeException) + virtual void SAL_CALL characters(const OUString& aChars) throw (SAXException,RuntimeException, std::exception) { LocaleNode * l = currentNode.top(); l->setValue (aChars); } - virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (SAXException,RuntimeException) + virtual void SAL_CALL ignorableWhitespace(const OUString& /*aWhitespaces*/) throw (SAXException,RuntimeException, std::exception) { } - virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (SAXException,RuntimeException) + virtual void SAL_CALL processingInstruction(const OUString& /*aTarget*/, const OUString& /*aData*/) throw (SAXException,RuntimeException, std::exception) { // ignored } virtual void SAL_CALL setDocumentLocator(const Reference< XLocator> & /*xLocator*/) - throw (SAXException,RuntimeException) + throw (SAXException,RuntimeException, std::exception) { // ignored } @@ -278,7 +278,7 @@ public: // ExtendedDocumentHandler virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, const OUString& sSystemId) - throw (RuntimeException) + throw (RuntimeException, std::exception) { InputSource source; source.sSystemId = sSystemId; @@ -290,20 +290,20 @@ public: // ExtendedDocumentHandler return source; } - virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException) + virtual void SAL_CALL startCDATA(void) throw (SAXException,RuntimeException, std::exception) { } - virtual void SAL_CALL endCDATA(void) throw (RuntimeException) + virtual void SAL_CALL endCDATA(void) throw (RuntimeException, std::exception) { } - virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException) + virtual void SAL_CALL comment(const OUString& /*sComment*/) throw (SAXException,RuntimeException, std::exception) { } - virtual void SAL_CALL unknown(const OUString& /*sString*/) throw (SAXException,RuntimeException) + virtual void SAL_CALL unknown(const OUString& /*sString*/) throw (SAXException,RuntimeException, std::exception) { } - virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException ) + virtual void SAL_CALL allowLineBreak( void) throw (SAXException, RuntimeException, std::exception ) { } 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 ); diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index 70cbaf1275c3..3b39bfc8ccb9 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -39,7 +39,7 @@ NumberFormatCodeMapper::~NumberFormatCodeMapper() ::com::sun::star::i18n::NumberFormatCode SAL_CALL -NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException) +NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) { OUString elementType = mapElementTypeShortToString(formatType); @@ -67,7 +67,7 @@ NumberFormatCodeMapper::getDefault( sal_Int16 formatType, sal_Int16 formatUsage, ::com::sun::star::i18n::NumberFormatCode SAL_CALL -NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException) +NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) { getFormats( rLocale ); @@ -91,7 +91,7 @@ NumberFormatCodeMapper::getFormatCode( sal_Int16 formatIndex, const ::com::sun:: ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL -NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException) +NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) { getFormats( rLocale ); @@ -124,7 +124,7 @@ NumberFormatCodeMapper::getAllFormatCode( sal_Int16 formatUsage, const ::com::su ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode > SAL_CALL -NumberFormatCodeMapper::getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException) +NumberFormatCodeMapper::getAllFormatCodes( const ::com::sun::star::lang::Locale& rLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception) { getFormats( rLocale ); @@ -262,19 +262,19 @@ NumberFormatCodeMapper::createLocaleDataObject() { OUString SAL_CALL NumberFormatCodeMapper::getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.NumberFormatCodeMapper"); } sal_Bool SAL_CALL NumberFormatCodeMapper::supportsService(const OUString& rServiceName) - throw( ::com::sun::star::uno::RuntimeException ) + throw( ::com::sun::star::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } ::com::sun::star::uno::Sequence< OUString > SAL_CALL -NumberFormatCodeMapper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) +NumberFormatCodeMapper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) { ::com::sun::star::uno::Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.NumberFormatMapper"; diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index 5cc1a1b43711..dafc783ab2b9 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -66,7 +66,7 @@ namespace * than english ones, ICU 4.2+ has to be used. */ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nNumber, - const lang::Locale &rLocale ) throw( RuntimeException ) + const lang::Locale &rLocale ) throw( RuntimeException, std::exception ) { uno::Sequence< OUString > retValue; @@ -135,17 +135,17 @@ uno::Sequence< OUString > SAL_CALL OrdinalSuffix::getOrdinalSuffix( sal_Int32 nN const sal_Char cOrdinalSuffix[] = "com.sun.star.i18n.OrdinalSuffix"; -OUString SAL_CALL OrdinalSuffix::getImplementationName(void) throw( RuntimeException ) +OUString SAL_CALL OrdinalSuffix::getImplementationName(void) throw( RuntimeException, std::exception ) { return OUString::createFromAscii(cOrdinalSuffix); } -sal_Bool SAL_CALL OrdinalSuffix::supportsService( const OUString& rServiceName) throw( RuntimeException ) +sal_Bool SAL_CALL OrdinalSuffix::supportsService( const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL OrdinalSuffix::getSupportedServiceNames(void) throw( RuntimeException ) +Sequence< OUString > SAL_CALL OrdinalSuffix::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString::createFromAscii(cOrdinalSuffix); diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx index c5ac12add07b..b6f02d285ce7 100644 --- a/i18npool/source/search/textsearch.cxx +++ b/i18npool/source/search/textsearch.cxx @@ -100,7 +100,7 @@ TextSearch::~TextSearch() delete pJumpTable2; } -void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeException ) +void TextSearch::setOptions( const SearchOptions& rOptions ) throw( RuntimeException, std::exception ) { aSrchPara = rOptions; @@ -227,7 +227,7 @@ sal_Bool TextSearch::isCellStart(const OUString& searchStr, sal_Int32 nPos) } SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { SearchResult sres; @@ -326,7 +326,7 @@ SearchResult TextSearch::searchForward( const OUString& searchStr, sal_Int32 sta } SearchResult TextSearch::searchBackward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { SearchResult sres; @@ -1042,19 +1042,19 @@ static OUString getImplementationName_Static() OUString SAL_CALL TextSearch::getImplementationName() - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return getImplementationName_Static(); } sal_Bool SAL_CALL TextSearch::supportsService(const OUString& rServiceName) - throw( RuntimeException ) + throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -TextSearch::getSupportedServiceNames(void) throw( RuntimeException ) +TextSearch::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = getServiceName_Static(); diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx index cebda5090a93..6ba31d7e9035 100644 --- a/i18npool/source/search/textsearch.hxx +++ b/i18npool/source/search/textsearch.hxx @@ -124,23 +124,23 @@ public: // Methods virtual void SAL_CALL setOptions( const ::com::sun::star::util::SearchOptions& options ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::util::SearchResult SAL_CALL searchForward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::util::SearchResult SAL_CALL searchBackward( const OUString& searchStr, sal_Int32 startPos, sal_Int32 endPos ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); //XServiceInfo virtual OUString SAL_CALL getImplementationName(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) - throw( ::com::sun::star::uno::RuntimeException ); + throw( ::com::sun::star::uno::RuntimeException, std::exception ); }; #endif 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; } diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx index 22036446535f..f1c3c2202ae0 100644 --- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx +++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx @@ -48,7 +48,7 @@ fullwidthToHalfwidth::fullwidthToHalfwidth() */ OUString SAL_CALL fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // Decomposition: GA --> KA + voice-mark const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); @@ -62,7 +62,7 @@ fullwidthToHalfwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Unicode SAL_CALL fullwidthToHalfwidth::transliterateChar2Char( sal_Unicode inChar) - throw(RuntimeException, MultipleCharsOutputException) + throw(RuntimeException, MultipleCharsOutputException, std::exception) { sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar); if (newChar == 0xFFFF) @@ -83,7 +83,7 @@ fullwidthKatakanaToHalfwidthKatakana::fullwidthKatakanaToHalfwidthKatakana() */ OUString SAL_CALL fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // Decomposition: GA --> KA + voice-mark const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); @@ -97,7 +97,7 @@ fullwidthKatakanaToHalfwidthKatakana::transliterate( const OUString& inStr, sal_ sal_Unicode SAL_CALL fullwidthKatakanaToHalfwidthKatakana::transliterateChar2Char( sal_Unicode inChar ) - throw(RuntimeException, MultipleCharsOutputException) + throw(RuntimeException, MultipleCharsOutputException, std::exception) { sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar); if (newChar == 0xFFFF) @@ -118,7 +118,7 @@ fullwidthToHalfwidthLikeASC::fullwidthToHalfwidthLikeASC() */ OUString SAL_CALL fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // Decomposition: GA --> KA + voice-mark const OUString& newStr = widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, nCount, offset, useOffset); @@ -133,7 +133,7 @@ fullwidthToHalfwidthLikeASC::transliterate( const OUString& inStr, sal_Int32 sta sal_Unicode SAL_CALL fullwidthToHalfwidthLikeASC::transliterateChar2Char( sal_Unicode inChar ) - throw(RuntimeException, MultipleCharsOutputException) + throw(RuntimeException, MultipleCharsOutputException, std::exception) { sal_Unicode newChar = widthfolding::decompose_ja_voiced_sound_marksChar2Char (inChar); if (newChar == 0xFFFF) diff --git a/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx index 911164ae3e43..72857f67ad44 100644 --- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx +++ b/i18npool/source/transliteration/halfwidthToFullwidth.cxx @@ -43,7 +43,7 @@ halfwidthToFullwidth::halfwidthToFullwidth() OUString SAL_CALL halfwidthToFullwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Bool _useOffset = useOffset; // One to One mapping @@ -57,7 +57,7 @@ halfwidthToFullwidth::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Unicode SAL_CALL halfwidthToFullwidth::transliterateChar2Char( sal_Unicode inChar) - throw(RuntimeException, MultipleCharsOutputException) + throw(RuntimeException, MultipleCharsOutputException, std::exception) { return transliteration_OneToOne::transliterateChar2Char(inChar); } @@ -73,7 +73,7 @@ halfwidthKatakanaToFullwidthKatakana::halfwidthKatakanaToFullwidthKatakana() OUString SAL_CALL halfwidthKatakanaToFullwidthKatakana::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Bool _useOffset = useOffset; // One to One mapping @@ -87,7 +87,7 @@ halfwidthKatakanaToFullwidthKatakana::transliterate( const OUString& inStr, sal_ sal_Unicode SAL_CALL halfwidthKatakanaToFullwidthKatakana::transliterateChar2Char( sal_Unicode inChar) - throw(RuntimeException, MultipleCharsOutputException) + throw(RuntimeException, MultipleCharsOutputException, std::exception) { return transliteration_OneToOne::transliterateChar2Char(inChar); } @@ -103,7 +103,7 @@ halfwidthToFullwidthLikeJIS::halfwidthToFullwidthLikeJIS() OUString SAL_CALL halfwidthToFullwidthLikeJIS::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Bool _useOffset = useOffset; // One to One mapping @@ -117,7 +117,7 @@ halfwidthToFullwidthLikeJIS::transliterate( const OUString& inStr, sal_Int32 sta sal_Unicode SAL_CALL halfwidthToFullwidthLikeJIS::transliterateChar2Char( sal_Unicode inChar) - throw(RuntimeException, MultipleCharsOutputException) + throw(RuntimeException, MultipleCharsOutputException, std::exception) { return transliteration_OneToOne::transliterateChar2Char(inChar); } diff --git a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx index 95f0928ff4cb..8f0668154b7d 100644 --- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx @@ -71,7 +71,7 @@ OneToOneMappingTable_t IandE[] = { OUString SAL_CALL ignoreIandEfollowedByYa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. diff --git a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx index 85b5468f0ff8..4388bebe5e92 100644 --- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx @@ -84,7 +84,7 @@ OneToOneMappingTable_t ignoreIterationMark_ja_JP_mappingTable[] = { OUString SAL_CALL ignoreIterationMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { oneToOneMapping aTable(ignoreIterationMark_ja_JP_mappingTable, sizeof(ignoreIterationMark_ja_JP_mappingTable)); diff --git a/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx index d051c664bf4b..64652d2acb34 100644 --- a/i18npool/source/transliteration/ignoreKana.cxx +++ b/i18npool/source/transliteration/ignoreKana.cxx @@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL ignoreKana::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { hiraganaToKatakana t1; return t1.transliterate(inStr, startPos, nCount, offset); @@ -45,7 +45,7 @@ ignoreKana::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount Sequence< OUString > SAL_CALL ignoreKana::transliterateRange( const OUString& str1, const OUString& str2 ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { hiraganaToKatakana t1; katakanaToHiragana t2; @@ -54,7 +54,7 @@ ignoreKana::transliterateRange( const OUString& str1, const OUString& str2 ) } sal_Unicode SAL_CALL -ignoreKana::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException) +ignoreKana::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) { hiraganaToKatakana t1; return t1.transliterateChar2Char(inChar); diff --git a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx index a3ce767357e3..0ccb8f9b85aa 100644 --- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL ignoreKiKuFollowedBySa_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. diff --git a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx index e86367ed4334..82ab46676f66 100644 --- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx @@ -293,7 +293,7 @@ static const sal_Unicode table_halfwidth[] = { OUString SAL_CALL ignoreProlongedSoundMark_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. diff --git a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx index 76cb444aead5..fb56bd54fc87 100644 --- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx +++ b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx @@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL ignoreSize_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { smallToLarge_ja_JP t1; return t1.transliterate(inStr, startPos, nCount, offset); @@ -44,7 +44,7 @@ ignoreSize_ja_JP::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 Sequence< OUString > SAL_CALL ignoreSize_ja_JP::transliterateRange( const OUString& str1, const OUString& str2 ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { smallToLarge_ja_JP t1; largeToSmall_ja_JP t2; @@ -53,7 +53,7 @@ ignoreSize_ja_JP::transliterateRange( const OUString& str1, const OUString& str2 } sal_Unicode SAL_CALL -ignoreSize_ja_JP::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException) +ignoreSize_ja_JP::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) { smallToLarge_ja_JP t1; return t1.transliterateChar2Char(inChar); diff --git a/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx index d0c5c93e1c99..489ac75935f3 100644 --- a/i18npool/source/transliteration/ignoreWidth.cxx +++ b/i18npool/source/transliteration/ignoreWidth.cxx @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace i18n { OUString SAL_CALL ignoreWidth::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { fullwidthToHalfwidth t1; return t1.transliterate(inStr, startPos, nCount, offset); @@ -44,7 +44,7 @@ ignoreWidth::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCoun Sequence< OUString > SAL_CALL ignoreWidth::transliterateRange( const OUString& str1, const OUString& str2 ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { fullwidthToHalfwidth t1; halfwidthToFullwidth t2; @@ -53,7 +53,7 @@ ignoreWidth::transliterateRange( const OUString& str1, const OUString& str2 ) } sal_Unicode SAL_CALL -ignoreWidth::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException) +ignoreWidth::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) { fullwidthToHalfwidth t1; return t1.transliterateChar2Char(inChar); diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx index 7d1898e703e0..8fecdcb92e4b 100644 --- a/i18npool/source/transliteration/textToPronounce_zh.cxx +++ b/i18npool/source/transliteration/textToPronounce_zh.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star::uno; namespace com { namespace sun { namespace star { namespace i18n { -sal_Int16 SAL_CALL TextToPronounce_zh::getType() throw (RuntimeException) +sal_Int16 SAL_CALL TextToPronounce_zh::getType() throw (RuntimeException, std::exception) { return TransliterationType::ONE_TO_ONE| TransliterationType::IGNORE; } @@ -50,7 +50,7 @@ TextToPronounce_zh::getPronounce(const sal_Unicode ch) OUString SAL_CALL TextToPronounce_zh::folding(const OUString & inStr, sal_Int32 startPos, - sal_Int32 nCount, Sequence< sal_Int32 > & offset) throw (RuntimeException) + sal_Int32 nCount, Sequence< sal_Int32 > & offset) throw (RuntimeException, std::exception) { OUStringBuffer sb; const sal_Unicode * chArr = inStr.getStr() + startPos; @@ -73,13 +73,13 @@ TextToPronounce_zh::folding(const OUString & inStr, sal_Int32 startPos, } OUString SAL_CALL -TextToPronounce_zh::transliterateChar2String( sal_Unicode inChar) throw(RuntimeException) +TextToPronounce_zh::transliterateChar2String( sal_Unicode inChar) throw(RuntimeException, std::exception) { return OUString(getPronounce(inChar)); } sal_Unicode SAL_CALL -TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException) +TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) { const sal_Unicode* pron=getPronounce(inChar); if (!pron || !pron[0]) @@ -92,7 +92,7 @@ TextToPronounce_zh::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeExc sal_Bool SAL_CALL TextToPronounce_zh::equals( const OUString & str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32 & nMatch1, const OUString & str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32 & nMatch2) - throw (RuntimeException) + throw (RuntimeException, std::exception) { sal_Int32 realCount; int i; // loop variable diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index c8d0f96db037..85014b6a3092 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -155,7 +155,7 @@ TransliterationImpl::~TransliterationImpl() // Methods OUString SAL_CALL -TransliterationImpl::getName() throw(RuntimeException) +TransliterationImpl::getName() throw(RuntimeException, std::exception) { if (numCascade == 1 && bodyCascade[0].is()) return bodyCascade[0]->getName(); @@ -165,7 +165,7 @@ TransliterationImpl::getName() throw(RuntimeException) } sal_Int16 SAL_CALL -TransliterationImpl::getType() throw(RuntimeException) +TransliterationImpl::getType() throw(RuntimeException, std::exception) { if (numCascade > 1) return (TransliterationType::CASCADE|TransliterationType::IGNORE); @@ -176,7 +176,7 @@ TransliterationImpl::getType() throw(RuntimeException) void SAL_CALL TransliterationImpl::loadModule( TransliterationModules modType, const Locale& rLocale ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { clear(); if (modType&TransliterationModules_IGNORE_MASK && modType&TransliterationModules_NON_IGNORE_MASK) { @@ -212,7 +212,7 @@ TransliterationImpl::loadModule( TransliterationModules modType, const Locale& r void SAL_CALL TransliterationImpl::loadModuleNew( const Sequence < TransliterationModulesNew > & modType, const Locale& rLocale ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { clear(); sal_Int32 mask = 0, count = modType.getLength(); @@ -237,7 +237,7 @@ TransliterationImpl::loadModuleNew( const Sequence < TransliterationModulesNew > void SAL_CALL TransliterationImpl::loadModuleByImplName(const OUString& implName, const Locale& rLocale) - throw(RuntimeException) + throw(RuntimeException, std::exception) { clear(); if (loadModuleByName(implName, bodyCascade[numCascade], rLocale)) @@ -246,7 +246,7 @@ TransliterationImpl::loadModuleByImplName(const OUString& implName, const Locale void SAL_CALL -TransliterationImpl::loadModulesByImplNames(const Sequence< OUString >& implNameList, const Locale& rLocale ) throw(RuntimeException) +TransliterationImpl::loadModulesByImplNames(const Sequence< OUString >& implNameList, const Locale& rLocale ) throw(RuntimeException, std::exception) { if (implNameList.getLength() > maxCascade || implNameList.getLength() <= 0) throw ERROR; @@ -259,7 +259,7 @@ TransliterationImpl::loadModulesByImplNames(const Sequence< OUString >& implName Sequence<OUString> SAL_CALL -TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException) +TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType ) throw(RuntimeException, std::exception) { const Sequence<OUString> &translist = mxLocaledata->getTransliterations(rLocale); Sequence<OUString> r(translist.getLength()); @@ -280,7 +280,7 @@ TransliterationImpl::getAvailableModules( const Locale& rLocale, sal_Int16 sType OUString SAL_CALL TransliterationImpl::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset ) throw(RuntimeException) + Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) { if (numCascade == 0) return inStr; @@ -335,7 +335,7 @@ TransliterationImpl::transliterate( const OUString& inStr, sal_Int32 startPos, s OUString SAL_CALL TransliterationImpl::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset ) throw(RuntimeException) + Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) { if (numCascade == 0) return inStr; @@ -386,7 +386,7 @@ TransliterationImpl::folding( const OUString& inStr, sal_Int32 startPos, sal_Int } OUString SAL_CALL -TransliterationImpl::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(RuntimeException) +TransliterationImpl::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(RuntimeException, std::exception) { if (numCascade == 0) return inStr; @@ -402,7 +402,7 @@ TransliterationImpl::transliterateString2String( const OUString& inStr, sal_Int3 } OUString SAL_CALL -TransliterationImpl::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException) +TransliterationImpl::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException, std::exception) { if (numCascade == 0) return OUString(&inChar, 1); @@ -418,7 +418,7 @@ TransliterationImpl::transliterateChar2String( sal_Unicode inChar ) throw(Runtim } sal_Unicode SAL_CALL -TransliterationImpl::transliterateChar2Char( sal_Unicode inChar ) throw(MultipleCharsOutputException, RuntimeException) +TransliterationImpl::transliterateChar2Char( sal_Unicode inChar ) throw(MultipleCharsOutputException, RuntimeException, std::exception) { sal_Unicode tmpChar = inChar; for (sal_Int32 i = 0; i < numCascade; i++) @@ -431,7 +431,7 @@ sal_Bool SAL_CALL TransliterationImpl::equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // since this is an API function make it user fail safe if ( nCount1 < 0 ) { @@ -515,7 +515,7 @@ TransliterationImpl::getRange(const Sequence< OUString > &inStrs, Sequence< OUString > SAL_CALL TransliterationImpl::transliterateRange( const OUString& str1, const OUString& str2 ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { if (numCascade == 1) return bodyCascade[0]->transliterateRange(str1, str2); @@ -532,7 +532,7 @@ sal_Int32 SAL_CALL TransliterationImpl::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, const OUString& str2, sal_Int32 off2, sal_Int32 len2) - throw(RuntimeException) + throw(RuntimeException, std::exception) { if (caseignoreOnly && caseignore.is()) return caseignore->compareSubstring(str1, off1, len1, str2, off2, len2); @@ -557,7 +557,7 @@ TransliterationImpl::compareSubstring( sal_Int32 SAL_CALL -TransliterationImpl::compareString(const OUString& str1, const OUString& str2 ) throw (RuntimeException) +TransliterationImpl::compareString(const OUString& str1, const OUString& str2 ) throw (RuntimeException, std::exception) { if (caseignoreOnly && caseignore.is()) return caseignore->compareString(str1, str2); @@ -633,19 +633,19 @@ TransliterationImpl::loadModuleByName( const OUString& implName, } OUString SAL_CALL -TransliterationImpl::getImplementationName() throw( RuntimeException ) +TransliterationImpl::getImplementationName() throw( RuntimeException, std::exception ) { return OUString("com.sun.star.i18n.Transliteration"); } sal_Bool SAL_CALL -TransliterationImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) +TransliterationImpl::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL -TransliterationImpl::getSupportedServiceNames(void) throw( RuntimeException ) +TransliterationImpl::getSupportedServiceNames(void) throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = OUString("com.sun.star.i18n.Transliteration"); diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx index 711571d7f10c..f4633d1b6f25 100644 --- a/i18npool/source/transliteration/transliteration_Ignore.cxx +++ b/i18npool/source/transliteration/transliteration_Ignore.cxx @@ -30,7 +30,7 @@ inline sal_Int32 Min( sal_Int32 a, sal_Int32 b ) { return a > b ? b : a; } sal_Bool SAL_CALL transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, - const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(RuntimeException) + const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) throw(RuntimeException, std::exception) { Sequence< sal_Int32 > offset1; Sequence< sal_Int32 > offset2; @@ -62,7 +62,7 @@ transliteration_Ignore::equals(const OUString& str1, sal_Int32 pos1, sal_Int32 n Sequence< OUString > SAL_CALL -transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2 ) throw(RuntimeException) +transliteration_Ignore::transliterateRange( const OUString& str1, const OUString& str2 ) throw(RuntimeException, std::exception) { if (str1.isEmpty() || str2.isEmpty()) throw RuntimeException(); @@ -75,7 +75,7 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString sal_Int16 SAL_CALL -transliteration_Ignore::getType() throw(RuntimeException) +transliteration_Ignore::getType() throw(RuntimeException, std::exception) { // The type is also defined in com/sun/star/util/TransliterationType.hdl return TransliterationType::IGNORE; @@ -84,7 +84,7 @@ transliteration_Ignore::getType() throw(RuntimeException) OUString SAL_CALL transliteration_Ignore::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset ) throw(RuntimeException) + Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) { // The method folding is defined in a sub class. return this->folding( inStr, startPos, nCount, offset); @@ -121,7 +121,7 @@ transliteration_Ignore::transliterateRange( const OUString& str1, const OUString OUString SAL_CALL transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. @@ -200,7 +200,7 @@ transliteration_Ignore::folding( const OUString& inStr, sal_Int32 startPos, } sal_Unicode SAL_CALL -transliteration_Ignore::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException) +transliteration_Ignore::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) { return func ? func( inChar) : table ? (*table)[ inChar ] : inChar; } diff --git a/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx index 8129e62452f3..78d33e3feec8 100644 --- a/i18npool/source/transliteration/transliteration_Numeric.cxx +++ b/i18npool/source/transliteration/transliteration_Numeric.cxx @@ -28,28 +28,28 @@ using namespace com::sun::star::uno; namespace com { namespace sun { namespace star { namespace i18n { -sal_Int16 SAL_CALL transliteration_Numeric::getType() throw(RuntimeException) +sal_Int16 SAL_CALL transliteration_Numeric::getType() throw(RuntimeException, std::exception) { return TransliterationType::NUMERIC; } OUString SAL_CALL transliteration_Numeric::folding( const OUString& /*inStr*/, sal_Int32 /*startPos*/, sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/ ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { throw RuntimeException(); } sal_Bool SAL_CALL transliteration_Numeric::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/ ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { throw RuntimeException(); } Sequence< OUString > SAL_CALL transliteration_Numeric::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { throw RuntimeException(); } @@ -114,7 +114,7 @@ transliteration_Numeric::transliterateBullet( const OUString& inStr, sal_Int32 s OUString SAL_CALL transliteration_Numeric::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset ) throw(RuntimeException) + Sequence< sal_Int32 >& offset ) throw(RuntimeException, std::exception) { if (tableSize) return transliterateBullet( inStr, startPos, nCount, offset); @@ -123,7 +123,7 @@ transliteration_Numeric::transliterate( const OUString& inStr, sal_Int32 startPo } sal_Unicode SAL_CALL -transliteration_Numeric::transliterateChar2Char( sal_Unicode inChar ) throw(RuntimeException, MultipleCharsOutputException) +transliteration_Numeric::transliterateChar2Char( sal_Unicode inChar ) throw(RuntimeException, MultipleCharsOutputException, std::exception) { if (tableSize) { if (isNumber(inChar)) { diff --git a/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx index eb2dc0efaf18..394a20c2b251 100644 --- a/i18npool/source/transliteration/transliteration_OneToOne.cxx +++ b/i18npool/source/transliteration/transliteration_OneToOne.cxx @@ -27,7 +27,7 @@ using namespace com::sun::star::uno; namespace com { namespace sun { namespace star { namespace i18n { -sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException) +sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException, std::exception) { // This type is also defined in com/sun/star/util/TransliterationType.hdl return TransliterationType::ONE_TO_ONE; @@ -35,7 +35,7 @@ sal_Int16 SAL_CALL transliteration_OneToOne::getType() throw(RuntimeException) OUString SAL_CALL transliteration_OneToOne::folding( const OUString& /*inStr*/, sal_Int32 /*startPos*/, - sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/) throw(RuntimeException) + sal_Int32 /*nCount*/, Sequence< sal_Int32 >& /*offset*/) throw(RuntimeException, std::exception) { throw RuntimeException(); } @@ -43,14 +43,14 @@ transliteration_OneToOne::folding( const OUString& /*inStr*/, sal_Int32 /*startP sal_Bool SAL_CALL transliteration_OneToOne::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/ ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { throw RuntimeException(); } Sequence< OUString > SAL_CALL transliteration_OneToOne::transliterateRange( const OUString& /*str1*/, const OUString& /*str2*/ ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { throw RuntimeException(); } @@ -58,7 +58,7 @@ transliteration_OneToOne::transliterateRange( const OUString& /*str1*/, const OU OUString SAL_CALL transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset) - throw(RuntimeException) + throw(RuntimeException, std::exception) { // Create a string buffer which can hold nCount + 1 characters. // The reference count is 1 now. @@ -88,7 +88,7 @@ transliteration_OneToOne::transliterate( const OUString& inStr, sal_Int32 startP } sal_Unicode SAL_CALL -transliteration_OneToOne::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException) +transliteration_OneToOne::transliterateChar2Char( sal_Unicode inChar) throw(RuntimeException, MultipleCharsOutputException, std::exception) { return func ? func( inChar) : (*table)[ inChar ]; } diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx index 28e440927cf4..f17fbafdbac9 100644 --- a/i18npool/source/transliteration/transliteration_body.cxx +++ b/i18npool/source/transliteration/transliteration_body.cxx @@ -46,7 +46,7 @@ Transliteration_body::Transliteration_body() implementationName = "com.sun.star.i18n.Transliteration.Transliteration_body"; } -sal_Int16 SAL_CALL Transliteration_body::getType() throw(RuntimeException) +sal_Int16 SAL_CALL Transliteration_body::getType() throw(RuntimeException, std::exception) { return TransliterationType::ONE_TO_ONE; } @@ -54,14 +54,14 @@ sal_Int16 SAL_CALL Transliteration_body::getType() throw(RuntimeException) sal_Bool SAL_CALL Transliteration_body::equals( const OUString& /*str1*/, sal_Int32 /*pos1*/, sal_Int32 /*nCount1*/, sal_Int32& /*nMatch1*/, const OUString& /*str2*/, sal_Int32 /*pos2*/, sal_Int32 /*nCount2*/, sal_Int32& /*nMatch2*/) - throw(RuntimeException) + throw(RuntimeException, std::exception) { throw RuntimeException(); } Sequence< OUString > SAL_CALL Transliteration_body::transliterateRange( const OUString& str1, const OUString& str2 ) - throw( RuntimeException) + throw( RuntimeException, std::exception) { Sequence< OUString > ostr(2); ostr[0] = str1; @@ -95,7 +95,7 @@ OUString SAL_CALL Transliteration_body::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset) - throw(RuntimeException) + throw(RuntimeException, std::exception) { const sal_Unicode *in = inStr.getStr() + startPos; @@ -181,7 +181,7 @@ Transliteration_body::transliterate( } OUString SAL_CALL -Transliteration_body::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException) +Transliteration_body::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException, std::exception) { const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType); rtl_uString* pStr = rtl_uString_alloc(map.nmap); @@ -196,7 +196,7 @@ Transliteration_body::transliterateChar2String( sal_Unicode inChar ) throw(Runti } sal_Unicode SAL_CALL -Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) throw(MultipleCharsOutputException, RuntimeException) +Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) throw(MultipleCharsOutputException, RuntimeException, std::exception) { const Mapping &map = casefolding::getValue(&inChar, 0, 1, aLocale, nMappingType); if (map.nmap > 1) @@ -206,7 +206,7 @@ Transliteration_body::transliterateChar2Char( sal_Unicode inChar ) throw(Multipl OUString SAL_CALL Transliteration_body::folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, - Sequence< sal_Int32 >& offset) throw(RuntimeException) + Sequence< sal_Int32 >& offset) throw(RuntimeException, std::exception) { return this->transliterate(inStr, startPos, nCount, offset); } @@ -314,7 +314,7 @@ static OUString transliterate_titlecase_Impl( OUString SAL_CALL Transliteration_titlecase::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset ); } @@ -331,7 +331,7 @@ Transliteration_sentencecase::Transliteration_sentencecase() OUString SAL_CALL Transliteration_sentencecase::transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, Sequence< sal_Int32 >& offset ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return transliterate_titlecase_Impl( inStr, startPos, nCount, aLocale, offset ); } diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx index a26021d39cf2..e537e3fe9294 100644 --- a/i18npool/source/transliteration/transliteration_caseignore.cxx +++ b/i18npool/source/transliteration/transliteration_caseignore.cxx @@ -43,13 +43,13 @@ Transliteration_caseignore::Transliteration_caseignore() void SAL_CALL Transliteration_caseignore::loadModule( TransliterationModules modName, const Locale& rLocale ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { moduleLoaded = (TransliterationModules) (moduleLoaded|modName); aLocale = rLocale; } -sal_Int16 SAL_CALL Transliteration_caseignore::getType() throw(RuntimeException) +sal_Int16 SAL_CALL Transliteration_caseignore::getType() throw(RuntimeException, std::exception) { // It's NOT TransliterationType::ONE_TO_ONE because it's using casefolding return TransliterationType::IGNORE; @@ -58,7 +58,7 @@ sal_Int16 SAL_CALL Transliteration_caseignore::getType() throw(RuntimeException) Sequence< OUString > SAL_CALL Transliteration_caseignore::transliterateRange( const OUString& str1, const OUString& str2 ) - throw( RuntimeException) + throw( RuntimeException, std::exception) { if (str1.getLength() != 1 || str2.getLength() != 1) throw RuntimeException(); @@ -93,7 +93,7 @@ sal_Bool SAL_CALL Transliteration_caseignore::equals( const OUString& str1, sal_Int32 pos1, sal_Int32 nCount1, sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) - throw(::com::sun::star::uno::RuntimeException) + throw(::com::sun::star::uno::RuntimeException, std::exception) { return (compare(str1, pos1, nCount1, nMatch1, str2, pos2, nCount2, nMatch2) == 0); } @@ -102,7 +102,7 @@ sal_Int32 SAL_CALL Transliteration_caseignore::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, const OUString& str2, sal_Int32 off2, sal_Int32 len2) - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Int32 nMatch1, nMatch2; return compare(str1, off1, len1, nMatch1, str2, off2, len2, nMatch2); @@ -113,7 +113,7 @@ sal_Int32 SAL_CALL Transliteration_caseignore::compareString( const OUString& str1, const OUString& str2) - throw(RuntimeException) + throw(RuntimeException, std::exception) { sal_Int32 nMatch1, nMatch2; return compare(str1, 0, str1.getLength(), nMatch1, str2, 0, str2.getLength(), nMatch2); diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx b/i18npool/source/transliteration/transliteration_commonclass.cxx index 521ed30dd0e8..5b87f7df4313 100644 --- a/i18npool/source/transliteration/transliteration_commonclass.cxx +++ b/i18npool/source/transliteration/transliteration_commonclass.cxx @@ -34,13 +34,13 @@ transliteration_commonclass::transliteration_commonclass() useOffset = sal_True; } -OUString SAL_CALL transliteration_commonclass::getName() throw(RuntimeException) +OUString SAL_CALL transliteration_commonclass::getName() throw(RuntimeException, std::exception) { return OUString::createFromAscii(transliterationName); } void SAL_CALL transliteration_commonclass::loadModule( TransliterationModules /*modName*/, const Locale& rLocale ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { aLocale = rLocale; } @@ -48,7 +48,7 @@ throw(RuntimeException) void SAL_CALL transliteration_commonclass::loadModuleNew( const Sequence < TransliterationModulesNew >& /*modName*/, const Locale& /*rLocale*/ ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { throw RuntimeException(); } @@ -56,21 +56,21 @@ throw(RuntimeException) void SAL_CALL transliteration_commonclass::loadModuleByImplName( const OUString& /*implName*/, const Locale& /*rLocale*/ ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { throw RuntimeException(); } void SAL_CALL transliteration_commonclass::loadModulesByImplNames(const Sequence< OUString >& /*modNamelist*/, const Locale& /*rLocale*/) -throw(RuntimeException) +throw(RuntimeException, std::exception) { throw RuntimeException(); } Sequence< OUString > SAL_CALL transliteration_commonclass::getAvailableModules( const Locale& /*rLocale*/, sal_Int16 /*sType*/ ) -throw(RuntimeException) +throw(RuntimeException, std::exception) { throw RuntimeException(); } @@ -79,7 +79,7 @@ sal_Int32 SAL_CALL transliteration_commonclass::compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, const OUString& str2, sal_Int32 off2, sal_Int32 len2) -throw(RuntimeException) +throw(RuntimeException, std::exception) { const sal_Unicode* unistr1 = NULL; const sal_Unicode* unistr2 = NULL; @@ -111,13 +111,13 @@ throw(RuntimeException) } sal_Int32 SAL_CALL -transliteration_commonclass::compareString( const OUString& str1, const OUString& str2 ) throw ( RuntimeException) +transliteration_commonclass::compareString( const OUString& str1, const OUString& str2 ) throw ( RuntimeException, std::exception) { return( this->compareSubstring(str1, 0, str1.getLength(), str2, 0, str2.getLength())); } OUString SAL_CALL -transliteration_commonclass::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(RuntimeException) +transliteration_commonclass::transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) throw(RuntimeException, std::exception) { Sequence < sal_Int32 > dummy_offset; useOffset = sal_False; @@ -127,22 +127,22 @@ transliteration_commonclass::transliterateString2String( const OUString& inStr, } OUString SAL_CALL -transliteration_commonclass::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException) +transliteration_commonclass::transliterateChar2String( sal_Unicode inChar ) throw(RuntimeException, std::exception) { return transliteration_commonclass::transliterateString2String(OUString(&inChar, 1), 0, 1); } -OUString SAL_CALL transliteration_commonclass::getImplementationName() throw( RuntimeException ) +OUString SAL_CALL transliteration_commonclass::getImplementationName() throw( RuntimeException, std::exception ) { return OUString::createFromAscii(implementationName); } -sal_Bool SAL_CALL transliteration_commonclass::supportsService(const OUString& rServiceName) throw( RuntimeException ) +sal_Bool SAL_CALL transliteration_commonclass::supportsService(const OUString& rServiceName) throw( RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > SAL_CALL transliteration_commonclass::getSupportedServiceNames() throw( RuntimeException ) +Sequence< OUString > SAL_CALL transliteration_commonclass::getSupportedServiceNames() throw( RuntimeException, std::exception ) { Sequence< OUString > aRet(1); aRet[0] = "com.sun.star.i18n.Transliteration.l10n"; |