diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
tree | d4451246461346a425ad6f796e08bf1514cdd942 /i18npool/inc | |
parent | Fixup whitespace changes, remove commented code. (diff) | |
download | core-5e21a413c788f839a66d9e4c14e745ed18058db8.tar.gz core-5e21a413c788f839a66d9e4c14e745ed18058db8.zip |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'i18npool/inc')
36 files changed, 356 insertions, 356 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 |