summaryrefslogtreecommitdiff
path: root/i18npool/inc
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /i18npool/inc
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'i18npool/inc')
-rw-r--r--i18npool/inc/breakiteratorImpl.hxx57
-rw-r--r--i18npool/inc/breakiterator_cjk.hxx12
-rw-r--r--i18npool/inc/breakiterator_ctl.hxx9
-rw-r--r--i18npool/inc/breakiterator_th.hxx2
-rw-r--r--i18npool/inc/breakiterator_unicode.hxx28
-rw-r--r--i18npool/inc/calendarImpl.hxx62
-rw-r--r--i18npool/inc/calendar_gregorian.hxx76
-rw-r--r--i18npool/inc/calendar_hijri.hxx4
-rw-r--r--i18npool/inc/calendar_jewish.hxx6
-rw-r--r--i18npool/inc/cclass_unicode.hxx27
-rw-r--r--i18npool/inc/chaptercollator.hxx10
-rw-r--r--i18npool/inc/characterclassificationImpl.hxx42
-rw-r--r--i18npool/inc/collatorImpl.hxx28
-rw-r--r--i18npool/inc/collator_unicode.hxx24
-rw-r--r--i18npool/inc/defaultnumberingprovider.hxx37
-rw-r--r--i18npool/inc/indexentrysupplier.hxx40
-rw-r--r--i18npool/inc/indexentrysupplier_asian.hxx12
-rw-r--r--i18npool/inc/indexentrysupplier_common.hxx39
-rw-r--r--i18npool/inc/indexentrysupplier_default.hxx16
-rw-r--r--i18npool/inc/indexentrysupplier_ja_phonetic.hxx12
-rw-r--r--i18npool/inc/inputsequencechecker.hxx15
-rw-r--r--i18npool/inc/inputsequencechecker_hi.hxx4
-rw-r--r--i18npool/inc/inputsequencechecker_th.hxx4
-rw-r--r--i18npool/inc/localedata.hxx69
-rw-r--r--i18npool/inc/nativenumbersupplier.hxx27
-rw-r--r--i18npool/inc/numberformatcode.hxx17
-rw-r--r--i18npool/inc/ordinalsuffix.hxx8
-rw-r--r--i18npool/inc/textToPronounce_zh.hxx15
-rw-r--r--i18npool/inc/textconversion.hxx69
-rw-r--r--i18npool/inc/textconversionImpl.hxx32
-rw-r--r--i18npool/inc/transliterationImpl.hxx57
-rw-r--r--i18npool/inc/transliteration_Ignore.hxx37
-rw-r--r--i18npool/inc/transliteration_Numeric.hxx21
-rw-r--r--i18npool/inc/transliteration_OneToOne.hxx32
-rw-r--r--i18npool/inc/transliteration_body.hxx22
-rw-r--r--i18npool/inc/transliteration_caseignore.hxx20
-rw-r--r--i18npool/inc/transliteration_commonclass.hxx56
-rw-r--r--i18npool/inc/unoscripttypedetector.hxx21
38 files changed, 416 insertions, 653 deletions
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 5168b9ae1a1b..499a4930684a 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.hxx
@@ -52,62 +52,57 @@ public:
virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
- sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32& nDone ) override;
virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
- sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32& nDone ) override;
virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType) override;
virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType) override;
virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) override;
virtual sal_Bool SAL_CALL isBeginWord( const OUString& Text, sal_Int32 nPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType ) override;
virtual sal_Bool SAL_CALL isEndWord( const OUString& Text, sal_Int32 nPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType ) override;
virtual sal_Int16 SAL_CALL getWordType( const OUString& Text, sal_Int32 nPos,
- const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale ) override;
virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale ) override;
virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale ) override;
virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
- const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
- throw(css::uno::RuntimeException, std::exception) override;
+ const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
- virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getScriptType( const OUString& Text, sal_Int32 nPos ) override;
virtual sal_Int32 SAL_CALL beginOfScript( const OUString& Text, sal_Int32 nStartPos,
- sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 ScriptType ) override;
virtual sal_Int32 SAL_CALL endOfScript( const OUString& Text, sal_Int32 nStartPos,
- sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 ScriptType ) override;
virtual sal_Int32 SAL_CALL previousScript( const OUString& Text, sal_Int32 nStartPos,
- sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 ScriptType ) override;
virtual sal_Int32 SAL_CALL nextScript( const OUString& Text, sal_Int32 nStartPos,
- sal_Int16 ScriptType ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 ScriptType ) override;
virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 CharType ) override;
virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 CharType ) override;
virtual sal_Int32 SAL_CALL previousCharBlock( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 CharType ) override;
virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 CharType ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 CharType ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
static sal_Int16 SAL_CALL getScriptClass(sal_uInt32 currentChar);
protected:
@@ -126,11 +121,9 @@ private:
css::uno::Reference < css::uno::XComponentContext > m_xContext;
/// @throws css::uno::RuntimeException
- bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName )
- throw( css::uno::RuntimeException );
+ bool SAL_CALL createLocaleSpecificBreakIterator( const OUString& aLocaleName );
/// @throws css::uno::RuntimeException
- css::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const css::lang::Locale& rLocale )
- throw( css::uno::RuntimeException );
+ css::uno::Reference < XBreakIterator > SAL_CALL getLocaleSpecificBreakIterator( const css::lang::Locale& rLocale );
};
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index 9429176cd72e..1ec97dc7fae8 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.hxx
@@ -34,18 +34,14 @@ public:
BreakIterator_CJK();
Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType)
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType) override;
Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType)
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType) override;
Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) override;
LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
- const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
- throw(css::uno::RuntimeException, std::exception) override;
+ const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
protected:
std::unique_ptr<xdictionary> m_xDict;
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index a9d3207f3d8b..24fec512af72 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.hxx
@@ -34,14 +34,13 @@ public:
virtual ~BreakIterator_CTL() override;
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(css::uno::RuntimeException, std::exception) override;
+ sal_Int32& nDone) override;
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(css::uno::RuntimeException, std::exception) override;
+ sal_Int32& nDone) override;
virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
- const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
- throw(css::uno::RuntimeException, std::exception) override;
+ const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
protected:
OUString cachedText; // for cell index
sal_Int32* nextCellIndex;
@@ -49,7 +48,7 @@ protected:
sal_Int32 cellIndexSize;
/// @throws css::uno::RuntimeException
- virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(css::uno::RuntimeException);
+ virtual void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos);
};
} } } }
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index 943c8f33cabb..5e2eddca019c 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.hxx
@@ -32,7 +32,7 @@ public:
virtual ~BreakIterator_th() override;
protected:
- void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) throw(css::uno::RuntimeException) override;
+ void SAL_CALL makeIndex(const OUString& text, sal_Int32 pos) override;
};
} } } }
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index a7581b5c577d..42dcb305777a 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.hxx
@@ -41,35 +41,31 @@ public:
virtual sal_Int32 SAL_CALL previousCharacters( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& nLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
- sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32& nDone ) override;
virtual sal_Int32 SAL_CALL nextCharacters( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& rLocale, sal_Int16 nCharacterIteratorMode, sal_Int32 nCount,
- sal_Int32& nDone ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32& nDone ) override;
virtual Boundary SAL_CALL previousWord( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType) override;
virtual Boundary SAL_CALL nextWord( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType) override;
virtual Boundary SAL_CALL getWordBoundary( const OUString& Text, sal_Int32 nPos,
- const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale, sal_Int16 WordType, sal_Bool bDirection ) override;
virtual sal_Int32 SAL_CALL beginOfSentence( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale ) override;
virtual sal_Int32 SAL_CALL endOfSentence( const OUString& Text, sal_Int32 nStartPos,
- const css::lang::Locale& nLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& nLocale ) override;
virtual LineBreakResults SAL_CALL getLineBreak( const OUString& Text, sal_Int32 nStartPos,
const css::lang::Locale& nLocale, sal_Int32 nMinBreakPos,
- const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions )
- throw(css::uno::RuntimeException, std::exception) override;
+ const LineBreakHyphenationOptions& hOptions, const LineBreakUserOptions& bOptions ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
protected:
const sal_Char *cBreakIterator, *lineRule;
@@ -94,7 +90,7 @@ protected:
/// @throws css::uno::RuntimeException
void SAL_CALL loadICUBreakIterator(const css::lang::Locale& rLocale,
- sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText) throw(css::uno::RuntimeException);
+ sal_Int16 rBreakType, sal_Int16 rWordType, const sal_Char* name, const OUString& rText);
};
} } } }
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 8cca72220ff7..06fe9be6aaca 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.hxx
@@ -53,45 +53,45 @@ public:
// Methods
- virtual void SAL_CALL loadDefaultCalendar(const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
- virtual Calendar SAL_CALL getLoadedCalendar() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < OUString > SAL_CALL getAllCalendars(const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getUniqueID() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDateTime(double fTimeInDays) throw(css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getDateTime() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL loadDefaultCalendar(const css::lang::Locale& rLocale) override;
+ virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) override;
+ virtual Calendar SAL_CALL getLoadedCalendar() override;
+ virtual css::uno::Sequence < OUString > SAL_CALL getAllCalendars(const css::lang::Locale& rLocale) override;
+ virtual OUString SAL_CALL getUniqueID() override;
+ virtual void SAL_CALL setDateTime(double fTimeInDays) override;
+ virtual double SAL_CALL getDateTime() override;
+ virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) override;
+ virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) override;
+ virtual sal_Bool SAL_CALL isValid() override;
+ virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) override;
+ virtual sal_Int16 SAL_CALL getFirstDayOfWeek() override;
+ virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) override;
+ virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) override;
+ virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() override;
+ virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() override;
+ virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() override;
+ virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() override;
+ virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() override;
+ virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) override;
// Methods in XExtendedCalendar
- virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override;
// XCalendar3
- virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(css::uno::RuntimeException, std::exception) override;
+ virtual Calendar2 SAL_CALL getLoadedCalendar2() override;
+ virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() override;
+ virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() override;
+ virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() override;
+ virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() override;
// XCalendar4
- virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getLocalDateTime() throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setLocalDateTime(double TimeInDays) override;
+ virtual double SAL_CALL getLocalDateTime() override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() override;
private:
struct lookupTableItem {
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index bd036eccbdf8..a62f93da542b 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.hxx
@@ -59,43 +59,43 @@ public:
virtual ~Calendar_gregorian() override;
// Methods in XCalendar
- virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDateTime(double fTimeInDays) throw(css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getDateTime() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override;
- virtual Calendar SAL_CALL getLoadedCalendar() throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getUniqueID() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getFirstDayOfWeek() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) override;
+ virtual void SAL_CALL setDateTime(double fTimeInDays) override;
+ virtual double SAL_CALL getDateTime() override;
+ virtual void SAL_CALL setValue( sal_Int16 nFieldIndex, sal_Int16 nValue ) override;
+ virtual sal_Int16 SAL_CALL getValue(sal_Int16 nFieldIndex) override;
+ virtual void SAL_CALL addValue(sal_Int16 nFieldIndex, sal_Int32 nAmount) override;
+ virtual sal_Bool SAL_CALL isValid() override;
+ virtual Calendar SAL_CALL getLoadedCalendar() override;
+ virtual OUString SAL_CALL getUniqueID() override;
+ virtual sal_Int16 SAL_CALL getFirstDayOfWeek() override;
+ virtual void SAL_CALL setFirstDayOfWeek(sal_Int16 nDay) override;
+ virtual void SAL_CALL setMinimumNumberOfDaysForFirstWeek(sal_Int16 nDays) override;
+ virtual sal_Int16 SAL_CALL getMinimumNumberOfDaysForFirstWeek() override;
+ virtual sal_Int16 SAL_CALL getNumberOfMonthsInYear() override;
+ virtual sal_Int16 SAL_CALL getNumberOfDaysInWeek() override;
+ virtual css::uno::Sequence < CalendarItem > SAL_CALL getMonths() override;
+ virtual css::uno::Sequence < CalendarItem > SAL_CALL getDays() override;
+ virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) override;
// Methods in XExtendedCalendar
- virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override;
// XCalendar3
- virtual Calendar2 SAL_CALL getLoadedCalendar2() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() throw(css::uno::RuntimeException, std::exception) override;
+ virtual Calendar2 SAL_CALL getLoadedCalendar2() override;
+ virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getDays2() override;
+ virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getMonths2() override;
+ virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getGenitiveMonths2() override;
+ virtual css::uno::Sequence < CalendarItem2 > SAL_CALL getPartitiveMonths2() override;
// XCalendar4
- virtual void SAL_CALL setLocalDateTime(double TimeInDays) throw(css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getLocalDateTime() throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setLocalDateTime(double TimeInDays) override;
+ virtual double SAL_CALL getLocalDateTime() override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() override;
protected:
const Era *eraArray;
@@ -108,14 +108,14 @@ protected:
sal_Int16 fieldSetValue[FIELD_INDEX_COUNT];
/// @throws css::uno::RuntimeException
- virtual void mapToGregorian() throw(css::uno::RuntimeException);
+ virtual void mapToGregorian();
/// @throws css::uno::RuntimeException
- virtual void mapFromGregorian() throw(css::uno::RuntimeException);
+ virtual void mapFromGregorian();
/// @throws css::uno::RuntimeException
- void getValue() throw(css::uno::RuntimeException);
+ void getValue();
/// @throws css::uno::RuntimeException
- OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode ) throw (css::uno::RuntimeException);
+ OUString getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, bool bEraMode );
private:
Calendar2 aCalendar;
@@ -124,12 +124,12 @@ private:
@throws css::uno::RuntimeException
*/
- void submitFields() throw(css::uno::RuntimeException);
+ void submitFields();
/** Set fields internally.
@throws css::uno::RuntimeException
*/
- void setValue() throw(css::uno::RuntimeException);
+ void setValue();
/** Obtain combined field values for timezone offset (minutes+secondmillis)
in milliseconds and whether fields were set. */
bool getZoneOffset( sal_Int32 & o_nOffset ) const;
@@ -150,8 +150,8 @@ class Calendar_hanja : public Calendar_gregorian
public:
// Constructors
Calendar_hanja();
- virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL loadCalendar(const OUString& uniqueID, const css::lang::Locale& rLocale) override;
+ virtual OUString SAL_CALL getDisplayName(sal_Int16 nCalendarDisplayIndex, sal_Int16 nIdx, sal_Int16 nNameType) override;
};
@@ -184,7 +184,7 @@ public:
Calendar_buddhist();
// Methods in XExtendedCalendar
- virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override;
};
} } } }
diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index b9bb93b1497a..71f96767c089 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.hxx
@@ -35,8 +35,8 @@ public:
Calendar_hijri();
protected:
- void mapToGregorian() throw(css::uno::RuntimeException) override;
- void mapFromGregorian() throw(css::uno::RuntimeException) override;
+ void mapToGregorian() override;
+ void mapFromGregorian() override;
// radians per degree (pi/180)
static const double RadPerDeg;
diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index a4242c296f13..db2ec2b1a8aa 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.hxx
@@ -34,11 +34,11 @@ public:
Calendar_jewish();
// Methods in XExtendedCalendar
- virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getDisplayString( sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode ) override;
protected:
- void mapToGregorian() throw(css::uno::RuntimeException) override;
- void mapFromGregorian() throw(css::uno::RuntimeException) override;
+ void mapToGregorian() override;
+ void mapFromGregorian() override;
};
} } } }
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 122e1ee7136b..811e92b0ff05 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.hxx
@@ -42,31 +42,30 @@ public:
virtual ~cclass_Unicode() override;
virtual OUString SAL_CALL toUpper( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
- const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual OUString SAL_CALL toLower( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
- const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos, sal_Int32 nCount,
- const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
+ virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) override;
+ virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) override;
+ virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) override;
virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos,
- const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos, sal_Int32 nCount,
- const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
- sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) override;
virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType, const OUString& Text,
sal_Int32 nPos, const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
- const OUString& userDefinedCharactersCont ) throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& userDefinedCharactersCont ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
Transliteration_casemapping *trans;
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index 863e408598e0..ba890d5d3b6a 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.hxx
@@ -36,13 +36,13 @@ public:
virtual ~ChapterCollator() override;
sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
- const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override;
- sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
+ sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
// CharacterClassification Implementation
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 6533e792b1d6..2102c82dd7af 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.hxx
@@ -40,44 +40,31 @@ public:
virtual ~CharacterClassificationImpl() override;
virtual OUString SAL_CALL toUpper( const OUString& Text,
- sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale ) override;
virtual OUString SAL_CALL toLower( const OUString& Text,
- sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nPos, sal_Int32 nCount, const css::lang::Locale& rLocale ) override;
virtual OUString SAL_CALL toTitle( const OUString& Text, sal_Int32 nPos,
- sal_Int32 nCount, const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos )
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nCount, const css::lang::Locale& rLocale ) override;
+ virtual sal_Int16 SAL_CALL getType( const OUString& Text, sal_Int32 nPos ) override;
+ virtual sal_Int16 SAL_CALL getCharacterDirection( const OUString& Text, sal_Int32 nPos ) override;
+ virtual sal_Int16 SAL_CALL getScript( const OUString& Text, sal_Int32 nPos ) override;
virtual sal_Int32 SAL_CALL getCharacterType( const OUString& text, sal_Int32 nPos,
- const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual sal_Int32 SAL_CALL getStringType( const OUString& text, sal_Int32 nPos,
- sal_Int32 nCount, const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nCount, const css::lang::Locale& rLocale ) override;
virtual ParseResult SAL_CALL parseAnyToken( const OUString& Text, sal_Int32 nPos,
const css::lang::Locale& rLocale, sal_Int32 nStartCharFlags,
const OUString& userDefinedCharactersStart, sal_Int32 nContCharFlags,
- const OUString& userDefinedCharactersCont )
- throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& userDefinedCharactersCont ) override;
virtual ParseResult SAL_CALL parsePredefinedToken( sal_Int32 nTokenType,
const OUString& Text, sal_Int32 nPos, const css::lang::Locale& rLocale,
sal_Int32 nStartCharFlags, const OUString& userDefinedCharactersStart,
- sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont )
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nContCharFlags, const OUString& userDefinedCharactersCont ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
struct lookupTableItem {
@@ -100,8 +87,7 @@ private:
css::uno::Reference < XCharacterClassification > xUCI;
/// @throws css::uno::RuntimeException
- css::uno::Reference < XCharacterClassification > const & SAL_CALL getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale)
- throw(css::uno::RuntimeException);
+ css::uno::Reference < XCharacterClassification > const & SAL_CALL getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale);
bool SAL_CALL createLocaleSpecificCharacterClassification(const OUString& serviceName, const css::lang::Locale& rLocale);
};
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 9650ef479dc1..34ddfc70c565 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.hxx
@@ -48,30 +48,27 @@ public:
virtual ~CollatorImpl() override;
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(css::uno::RuntimeException, std::exception) override;
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
virtual sal_Int32 SAL_CALL compareString( const OUString& s1,
- const OUString& s2) throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& s2) override;
- virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale, sal_Int32 collatorOptions)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale& rLocale, sal_Int32 collatorOptions) override;
virtual sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale,
- sal_Int32 collatorOptions) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 collatorOptions) override;
virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString& impl, const lang::Locale& rLocale,
- const css::uno::Sequence< sal_Int32 >& collatorOptions) throw(css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< sal_Int32 >& collatorOptions) override;
- virtual css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale& rLocale ) override;
- virtual css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& collatorAlgorithmName ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
protected:
lang::Locale nLocale;
@@ -100,10 +97,9 @@ private:
/// @throws css::uno::RuntimeException
bool SAL_CALL createCollator(const lang::Locale& rLocale, const OUString& serviceName,
- const OUString& rSortAlgorithm) throw(css::uno::RuntimeException);
+ const OUString& rSortAlgorithm);
/// @throws css::uno::RuntimeException
- void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm)
- throw(css::uno::RuntimeException);
+ void SAL_CALL loadCachedCollator(const lang::Locale& rLocale, const OUString& rSortAlgorithm);
};
} } } }
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index ac76c215295a..3487b44b7600 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.hxx
@@ -41,29 +41,25 @@ public:
virtual ~Collator_Unicode() override;
sal_Int32 SAL_CALL compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1,
- const OUString& s2, sal_Int32 off2, sal_Int32 len2) throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
- sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2)
- throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) override;
sal_Int32 SAL_CALL loadCollatorAlgorithm( const OUString& impl, const lang::Locale& rLocale,
- sal_Int32 collatorOptions) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int32 collatorOptions) override;
// following 4 methods are implemented in collatorImpl.
- sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32)
- throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();}
+ sal_Int32 SAL_CALL loadDefaultCollator( const lang::Locale&, sal_Int32) override {throw css::uno::RuntimeException();}
void SAL_CALL loadCollatorAlgorithmWithEndUserOption( const OUString&, const lang::Locale&,
- const css::uno::Sequence< sal_Int32 >&) throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();}
- css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&)
- throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();}
- css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& )
- throw(css::uno::RuntimeException, std::exception) override {throw css::uno::RuntimeException();}
+ const css::uno::Sequence< sal_Int32 >&) override {throw css::uno::RuntimeException();}
+ css::uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms( const lang::Locale&) override {throw css::uno::RuntimeException();}
+ css::uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions( const OUString& ) override {throw css::uno::RuntimeException();}
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
protected:
const sal_Char *implementationName;
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 3d06b6af1111..0fe3ae4b6a5e 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.hxx
@@ -49,49 +49,36 @@ public:
//XDefaultNumberingProvider
virtual css::uno::Sequence< css::uno::Reference<
css::container::XIndexAccess > > SAL_CALL
- getDefaultOutlineNumberings( const css::lang::Locale& aLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ getDefaultOutlineNumberings( const css::lang::Locale& aLocale ) override;
virtual css::uno::Sequence< css::uno::Sequence<
css::beans::PropertyValue > > SAL_CALL
- getDefaultContinuousNumberingLevels( const css::lang::Locale& aLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ getDefaultContinuousNumberingLevels( const css::lang::Locale& aLocale ) override;
//XNumberingFormatter
virtual OUString SAL_CALL makeNumberingString(
const css::uno::Sequence<
css::beans::PropertyValue >& aProperties,
- const css::lang::Locale& aLocale )
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& aLocale ) override;
//XNumberingTypeInfo
- virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes( )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getNumberingType( const OUString& NumberingIdentifier )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasNumberingType( const OUString& NumberingIdentifier )
- throw(css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType )
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedNumberingTypes( ) override;
+ virtual sal_Int16 SAL_CALL getNumberingType( const OUString& NumberingIdentifier ) override;
+ virtual sal_Bool SAL_CALL hasNumberingType( const OUString& NumberingIdentifier ) override;
+ virtual OUString SAL_CALL getNumberingIdentifier( sal_Int16 NumberingType ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
css::uno::Reference < css::uno::XComponentContext > m_xContext;
css::uno::Reference < css::container::XHierarchicalNameAccess > xHierarchicalNameAccess;
std::unique_ptr<TransliterationImpl> translit;
/// @throws css::uno::RuntimeException
- OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index )
- throw(css::uno::RuntimeException, std::exception);
+ OUString SAL_CALL makeNumberingIdentifier( sal_Int16 index );
/// @throws css::uno::RuntimeException
- bool SAL_CALL isScriptFlagEnabled(const OUString& aName )
- throw(css::uno::RuntimeException);
+ bool SAL_CALL isScriptFlagEnabled(const OUString& aName );
};
} } } }
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index b2501415b1c1..006b9fa47e87 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.hxx
@@ -39,60 +39,48 @@ public:
IndexEntrySupplier( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
// Methods
- virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList() override;
virtual css::uno::Sequence < OUString > SAL_CALL getAlgorithmList(
- const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual sal_Bool SAL_CALL loadAlgorithm(
const css::lang::Locale& rLocale,
- const OUString& SortAlgorithm, sal_Int32 collatorOptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& SortAlgorithm, sal_Int32 collatorOptions ) override;
virtual sal_Bool SAL_CALL usePhoneticEntry(
- const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry,
- const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
- const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) override;
virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,
const OUString& IndexEntry2, const OUString& PhoneticEntry2,
- const css::lang::Locale& rLocale2 )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale2 ) override;
virtual OUString SAL_CALL getIndexCharacter( const OUString& IndexEntry,
- const css::lang::Locale& rLocale, const OUString& SortAlgorithm )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale, const OUString& SortAlgorithm ) override;
virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
- const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > xIES;
css::uno::Reference < css::uno::XComponentContext > m_xContext;
/// @throws css::uno::RuntimeException
- bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( css::uno::RuntimeException );
+ bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name);
/// @throws css::uno::RuntimeException
css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL getLocaleSpecificIndexEntrySupplier(
- const css::lang::Locale& rLocale, const OUString& rSortAlgorithm) throw (css::uno::RuntimeException);
+ const css::lang::Locale& rLocale, const OUString& rSortAlgorithm);
protected:
css::lang::Locale aLocale;
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index 1ae075046314..15194ac7a62c 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -35,20 +35,16 @@ public:
virtual ~IndexEntrySupplier_asian() override;
OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
- const css::lang::Locale& rLocale, const OUString& rAlgorithm )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale, const OUString& rAlgorithm ) override;
OUString SAL_CALL getIndexKey( const OUString& rIndexEntry,
- const OUString& rPhoneticEntry, const css::lang::Locale& rLocale)
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& rPhoneticEntry, const css::lang::Locale& rLocale) override;
sal_Int16 SAL_CALL compareIndexEntry(
const OUString& rIndexEntry1, const OUString& rPhoneticEntry1,
const css::lang::Locale& rLocale1,
const OUString& rIndexEntry2, const OUString& rPhoneticEntry2,
- const css::lang::Locale& rLocale2 )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale2 ) override;
OUString SAL_CALL getPhoneticCandidate( const OUString& rIndexEntry,
- const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
#ifndef DISABLE_DYNLOADING
private:
oslModule hModule;
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index fa5c87eeb22a..74983cb3708d 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -43,51 +43,39 @@ public:
IndexEntrySupplier_Common( const css::uno::Reference < css::uno::XComponentContext >& rxContext );
virtual ~IndexEntrySupplier_Common() override;
- virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence < css::lang::Locale > SAL_CALL getLocaleList() override;
virtual css::uno::Sequence < OUString > SAL_CALL getAlgorithmList(
- const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual sal_Bool SAL_CALL usePhoneticEntry(
- const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual OUString SAL_CALL getPhoneticCandidate( const OUString& IndexEntry,
- const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual sal_Bool SAL_CALL loadAlgorithm(
const css::lang::Locale& rLocale,
- const OUString& SortAlgorithm, sal_Int32 collatorOptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& SortAlgorithm, sal_Int32 collatorOptions ) override;
virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
- const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) override;
virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,
const OUString& IndexEntry2, const OUString& PhoneticEntry2,
- const css::lang::Locale& rLocale2 )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale2 ) override;
virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
- const css::lang::Locale& rLocale, const OUString& rSortAlgorithm )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) override;
virtual OUString SAL_CALL getIndexFollowPageWord( sal_Bool MorePages,
- const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
protected:
const sal_Char * implementationName;
@@ -99,8 +87,7 @@ protected:
/// @throws css::uno::RuntimeException
const OUString& SAL_CALL getEntry( const OUString& IndexEntry,
- const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException);
+ const OUString& PhoneticEntry, const css::lang::Locale& rLocale );
};
} } } }
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index ebdbcecacfac..e2a6be7fe7f7 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.hxx
@@ -37,22 +37,18 @@ public:
virtual sal_Bool SAL_CALL loadAlgorithm(
const css::lang::Locale& rLocale,
- const OUString& SortAlgorithm, sal_Int32 collatorOptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& SortAlgorithm, sal_Int32 collatorOptions ) override;
virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
- const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) override;
virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,
const OUString& IndexEntry2, const OUString& PhoneticEntry2,
- const css::lang::Locale& rLocale2 )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale2 ) override;
virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
- const css::lang::Locale& rLocale, const OUString& rSortAlgorithm )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) override;
private:
std::unique_ptr<Index> index;
@@ -87,10 +83,10 @@ public:
~Index();
/// @throws css::uno::RuntimeException
- void init(const css::lang::Locale& rLocale, const OUString& algorithm) throw (css::uno::RuntimeException, std::exception);
+ void init(const css::lang::Locale& rLocale, const OUString& algorithm);
/// @throws css::uno::RuntimeException
- void makeIndexKeys(const css::lang::Locale &rLocale, const OUString &algorithm) throw (css::uno::RuntimeException, std::exception);
+ void makeIndexKeys(const css::lang::Locale &rLocale, const OUString &algorithm);
sal_Int16 getIndexWeight(const OUString& rIndexEntry);
OUString getIndexDescription(const OUString& rIndexEntry);
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index 9d8956e77b8e..7749c867253f 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -34,16 +34,13 @@ public:
implementationName = "com.sun.star.i18n.IndexEntrySupplier_ja_phonetic";
};
virtual OUString SAL_CALL getIndexCharacter( const OUString& rIndexEntry,
- const css::lang::Locale& rLocale, const OUString& rSortAlgorithm )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale, const OUString& rSortAlgorithm ) override;
virtual OUString SAL_CALL getIndexKey( const OUString& IndexEntry,
- const OUString& PhoneticEntry, const css::lang::Locale& rLocale )
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& PhoneticEntry, const css::lang::Locale& rLocale ) override;
virtual sal_Int16 SAL_CALL compareIndexEntry( const OUString& IndexEntry1,
const OUString& PhoneticEntry1, const css::lang::Locale& rLocale1,
const OUString& IndexEntry2, const OUString& PhoneticEntry2,
- const css::lang::Locale& rLocale2 )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale2 ) override;
};
#define INDEXENTRYSUPPLIER_JA_PHONETIC( algorithm ) \
@@ -54,8 +51,7 @@ public:\
};\
virtual sal_Bool SAL_CALL loadAlgorithm(\
const css::lang::Locale& rLocale,\
- const OUString& SortAlgorithm, sal_Int32 collatorOptions ) \
- throw (css::uno::RuntimeException, std::exception) override;\
+ const OUString& SortAlgorithm, sal_Int32 collatorOptions ) override;\
};
INDEXENTRYSUPPLIER_JA_PHONETIC( ja_phonetic_alphanumeric_first_by_syllable )
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index cd2748ac8ab3..c92f10b927b7 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.hxx
@@ -44,17 +44,15 @@ public:
virtual ~InputSequenceCheckerImpl() override;
virtual sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
- sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
virtual sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
- sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
const sal_Char *serviceName;
@@ -71,8 +69,7 @@ private:
css::uno::Reference < css::uno::XComponentContext > m_xContext;
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char* rLanguage)
- throw (css::uno::RuntimeException);
+ css::uno::Reference< css::i18n::XExtendedInputSequenceChecker >& SAL_CALL getInputSequenceChecker(sal_Char* rLanguage);
static sal_Char* SAL_CALL getLanguageByScripType(sal_Unicode cChar, sal_Unicode nChar);
};
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index dbbe12129a4d..19918857498b 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.hxx
@@ -36,10 +36,10 @@ public:
virtual ~InputSequenceChecker_hi() override;
sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
- sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
- sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
};
} } } }
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index 8c288ec511f8..e0ae2a9d689c 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.hxx
@@ -33,10 +33,10 @@ public:
virtual ~InputSequenceChecker_th() override;
sal_Bool SAL_CALL checkInputSequence(const OUString& Text, sal_Int32 nStartPos,
- sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
sal_Int32 SAL_CALL correctInputSequence(OUString& Text, sal_Int32 nStartPos,
- sal_Unicode inputChar, sal_Int16 inputCheckMode) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Unicode inputChar, sal_Int16 inputCheckMode) override;
};
} } } }
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index fb4f9f274805..c89710cc49b3 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.hxx
@@ -81,57 +81,57 @@ public:
excluding the one obtained via getFirstLocaleServiceName() */
static ::std::vector< OUString > getFallbackLocaleServiceNames( const css::lang::Locale & rLocale );
- virtual LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual LocaleDataItem SAL_CALL getLocaleItem( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< Calendar2 > SAL_CALL getAllCalendars2( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< Calendar > SAL_CALL getAllCalendars( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< Currency > SAL_CALL getAllCurrencies( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual LanguageCountryInfo SAL_CALL getLanguageCountryInfo( const css::lang::Locale& rLocale ) override;
+ virtual LocaleDataItem SAL_CALL getLocaleItem( const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< Calendar2 > SAL_CALL getAllCalendars2( const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< Calendar > SAL_CALL getAllCalendars( const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< Currency > SAL_CALL getAllCurrencies( const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< Currency2 > SAL_CALL getAllCurrencies2( const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< FormatElement > SAL_CALL getAllFormats( const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< Implementation > SAL_CALL getCollatorImplementations( const css::lang::Locale& rLocale ) override;
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException, std::exception);
- virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override ;
+ OUString SAL_CALL getCollatorRuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
+ virtual css::uno::Sequence< OUString > SAL_CALL getTransliterations( const css::lang::Locale& rLocale ) override;
+ virtual ForbiddenCharacters SAL_CALL getForbiddenCharacters( const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getReservedWord( const css::lang::Locale& rLocale ) override ;
/// @throws css::uno::RuntimeException
- css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) ;
- virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAllInstalledLocaleNames() throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< OUString > SAL_CALL getBreakIteratorRules( const css::lang::Locale& rLocale ) ;
+ virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAllInstalledLocaleNames() override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSearchOptions( const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getCollationOptions( const css::lang::Locale& rLocale ) override;
/// @throws css::uno::RuntimeException
- css::uno::Sequence< css::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+ css::uno::Sequence< css::uno::Sequence< beans::PropertyValue > > SAL_CALL getContinuousNumberingLevels( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- css::uno::Sequence< css::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+ css::uno::Sequence< css::uno::Reference< container::XIndexAccess > > SAL_CALL getOutlineNumberingLevels( const css::lang::Locale& rLocale );
// XLocaleData4
- virtual css::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getDateAcceptancePatterns( const css::lang::Locale& rLocale ) override;
// following methods are used by indexentry service
/// @throws css::uno::RuntimeException
- css::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException);
+ css::uno::Sequence< OUString > SAL_CALL getIndexAlgorithm( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getDefaultIndexAlgorithm( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException);
+ OUString SAL_CALL getDefaultIndexAlgorithm( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException);
+ OUString SAL_CALL getIndexKeysByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException);
+ OUString SAL_CALL getIndexModuleByAlgorithm( const css::lang::Locale& rLocale, const OUString& algorithm );
/// @throws css::uno::RuntimeException
- css::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+ css::uno::Sequence< UnicodeScript > SAL_CALL getUnicodeScripts( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+ css::uno::Sequence< OUString > SAL_CALL getFollowPageWords( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException);
+ bool SAL_CALL hasPhonetic( const css::lang::Locale& rLocale );
/// @throws css::uno::RuntimeException
- bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm ) throw(css::uno::RuntimeException);
+ bool SAL_CALL isPhonetic( const css::lang::Locale& rLocale, const OUString& algorithm );
/// @throws css::uno::RuntimeException
- OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception);
+ OUString SAL_CALL getHangingCharacters( const css::lang::Locale& rLocale );
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
::std::unique_ptr< LocaleDataLookupTableItem > cachedItem;
@@ -139,7 +139,7 @@ private:
OUString ref_name;
/// @throws css::uno::RuntimeException
- oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction ) throw( css::uno::RuntimeException, std::exception );
+ oslGenericFunction SAL_CALL getFunctionSymbol( const css::lang::Locale& rLocale, const sal_Char* pFunction );
sal_Unicode ** SAL_CALL getIndexArray(const css::lang::Locale& rLocale, sal_Int16& indexCount);
sal_Unicode ** SAL_CALL getIndexArrayForAlgorithm(const css::lang::Locale& rLocale, const OUString& rAlgorithm);
/// @throws css::uno::RuntimeException
@@ -147,7 +147,7 @@ private:
getCalendarItemByName(const OUString& name,
const css::lang::Locale& rLocale,
const css::uno::Sequence< css::i18n::Calendar2 >& calendarsSeq,
- sal_Int16 item) throw( css::uno::RuntimeException, std::exception );
+ sal_Int16 item);
/// Helper to obtain a sequence of days, months, gmonths or eras.
///
@@ -158,8 +158,7 @@ private:
const sal_Int16 nWhichItem,
const sal_Int16 nCalendar,
const css::lang::Locale & rLocale,
- const css::uno::Sequence< css::i18n::Calendar2 > & calendarsSeq )
- throw( css::uno::RuntimeException, std::exception );
+ const css::uno::Sequence< css::i18n::Calendar2 > & calendarsSeq );
};
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index 9ec559a3b220..b162c284bb0c 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.hxx
@@ -41,39 +41,30 @@ public:
// Methods
virtual OUString SAL_CALL getNativeNumberString( const OUString& aNumberString,
- const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) override;
virtual sal_Bool SAL_CALL isValidNatNum( const css::lang::Locale& aLocale,
- sal_Int16 nNativeNumberMode )
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Int16 nNativeNumberMode ) override;
virtual css::i18n::NativeNumberXmlAttributes SAL_CALL convertToXmlAttributes(
- const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) override;
virtual sal_Int16 SAL_CALL convertFromXmlAttributes(
- const css::i18n::NativeNumberXmlAttributes& aAttr )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::i18n::NativeNumberXmlAttributes& aAttr ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// following methods are not for XNativeNumberSupplier, they are for calling from transliterations
/// @throws css::uno::RuntimeException
OUString SAL_CALL getNativeNumberString( const OUString& aNumberString,
const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode,
- css::uno::Sequence< sal_Int32 >& offset )
- throw (css::uno::RuntimeException);
+ css::uno::Sequence< sal_Int32 >& offset );
/// @throws css::uno::RuntimeException
sal_Unicode SAL_CALL getNativeNumberChar( const sal_Unicode inChar,
- const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode )
- throw(css::uno::RuntimeException) ;
+ const css::lang::Locale& aLocale, sal_Int16 nNativeNumberMode ) ;
private:
css::lang::Locale aLocale;
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index 765fa90abbaf..d74231fc1560 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -43,18 +43,15 @@ public:
css::uno::XComponentContext >& rxContext );
virtual ~NumberFormatCodeMapper() override;
- virtual css::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCode( sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::i18n::NumberFormatCode SAL_CALL getDefault( sal_Int16 nFormatType, sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) override;
+ virtual css::i18n::NumberFormatCode SAL_CALL getFormatCode( sal_Int16 nFormatIndex, const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCode( sal_Int16 nFormatUsage, const css::lang::Locale& rLocale ) override;
+ virtual css::uno::Sequence< css::i18n::NumberFormatCode > SAL_CALL getAllFormatCodes( const css::lang::Locale& rLocale ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
osl::Mutex maMutex;
diff --git a/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index a62c28bef6d6..a7758911c375 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.hxx
@@ -39,12 +39,12 @@ class OrdinalSuffixService : public cppu::WeakImplHelper
virtual ~OrdinalSuffixService() override;
// XOrdinalSuffix
- virtual css::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const css::lang::Locale &rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getOrdinalSuffix( sal_Int32 nNumber, const css::lang::Locale &rLocale ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence < OUString > SAL_CALL getSupportedServiceNames() override;
};
} } } }
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index ed33fad20e51..fd880bc6e8d3 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.hxx
@@ -42,23 +42,18 @@ public:
virtual ~TextToPronounce_zh() override;
OUString SAL_CALL
- folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 > & offset)
- throw (css::uno::RuntimeException, std::exception) override;
+ folding(const OUString & inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 > & offset) override;
- sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 SAL_CALL getType() override;
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 (css::uno::RuntimeException, std::exception) override;
+ 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) override;
OUString SAL_CALL
- transliterateChar2String( sal_Unicode inChar)
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterateChar2String( sal_Unicode inChar) override;
sal_Unicode SAL_CALL
- transliterateChar2Char( sal_Unicode inChar)
- throw(css::uno::RuntimeException,
- css::i18n::MultipleCharsOutputException, std::exception) override;
+ transliterateChar2Char( sal_Unicode inChar) override;
};
#define TRANSLITERATION_TextToPronounce_zh( name ) \
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 5b1670b03c15..cca19aec5ca3 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -46,41 +46,26 @@ public:
virtual css::i18n::TextConversionResult SAL_CALL
getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override = 0;
+ sal_Int32 nTextConversionOptions ) override = 0;
virtual OUString SAL_CALL
getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override = 0;
+ sal_Int32 nTextConversionOptions ) override = 0;
virtual OUString SAL_CALL
getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override = 0;
+ sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) override = 0;
virtual sal_Bool SAL_CALL
interactiveConversion(const css::lang::Locale& aLocale,
- sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override = 0;
+ sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) override = 0;
//XServiceInfo
OUString SAL_CALL
- getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationName() override;
sal_Bool SAL_CALL
- supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
+ supportsService(const OUString& ServiceName) override;
css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getSupportedServiceNames() override;
private:
const sal_Char* implementationName;
protected:
@@ -109,31 +94,19 @@ public:
css::i18n::TextConversionResult SAL_CALL
getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions ) override;
OUString SAL_CALL
getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions ) override;
OUString SAL_CALL
getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) override;
sal_Bool SAL_CALL
interactiveConversion(const css::lang::Locale& aLocale,
sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions ) override;
private:
// Hangul/Hanja system dictionary
@@ -164,31 +137,19 @@ public:
css::i18n::TextConversionResult SAL_CALL
getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions ) override;
OUString SAL_CALL
getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions ) override;
OUString SAL_CALL
getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) override;
sal_Bool SAL_CALL
interactiveConversion(const css::lang::Locale& aLocale,
sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions ) override;
private:
// user defined dictionary list
css::uno::Reference < css::linguistic2::XConversionDictionaryList > xCDL;
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index 3284a9f7b655..b34429d6c253 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.hxx
@@ -43,49 +43,33 @@ public:
css::i18n::TextConversionResult SAL_CALL
getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions ) override;
OUString SAL_CALL
getConversion( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions ) override;
OUString SAL_CALL
getConversionWithOffset( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength,
const css::lang::Locale& aLocale, sal_Int16 nTextConversionType,
- sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int32 nTextConversionOptions, css::uno::Sequence< sal_Int32 >& offset ) override;
sal_Bool SAL_CALL
interactiveConversion( const css::lang::Locale& aLocale,
- sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions )
- throw( css::uno::RuntimeException,
- css::lang::IllegalArgumentException,
- css::lang::NoSupportException, std::exception ) override;
+ sal_Int16 nTextConversionType, sal_Int32 nTextConversionOptions ) override;
//XServiceInfo
OUString SAL_CALL
- getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getImplementationName() override;
sal_Bool SAL_CALL
- supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
+ supportsService(const OUString& ServiceName) override;
css::uno::Sequence< OUString > SAL_CALL
- getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ getSupportedServiceNames() override;
private:
css::lang::Locale aLocale;
css::uno::Reference < css::i18n::XExtendedTextConversion > xTC;
css::uno::Reference < css::uno::XComponentContext > m_xContext;
/// @throws css::lang::NoSupportException
- void SAL_CALL getLocaleSpecificTextConversion( const css::lang::Locale& rLocale )
- throw( css::lang::NoSupportException );
+ void SAL_CALL getLocaleSpecificTextConversion( const css::lang::Locale& rLocale );
};
} // i18n
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index 2bdfd43b901d..e9990d1d8142 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.hxx
@@ -41,55 +41,45 @@ public:
virtual ~TransliterationImpl() override;
// Methods
- virtual OUString SAL_CALL getName( ) throw(css::uno::RuntimeException, std::exception) override ;
- virtual sal_Int16 SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override ;
+ virtual OUString SAL_CALL getName( ) override ;
+ virtual sal_Int16 SAL_CALL getType( ) override ;
- virtual void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override ;
+ virtual void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) override ;
virtual void SAL_CALL loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName,
- const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override ;
+ const css::lang::Locale& rLocale ) override ;
virtual void SAL_CALL loadModuleByImplName( const OUString& implName,
- const css::lang::Locale& rLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale ) override;
virtual void SAL_CALL loadModulesByImplNames(const css::uno::Sequence< OUString >& modNamelist,
- const css::lang::Locale& rLocale) throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale) override;
virtual css::uno::Sequence< OUString > SAL_CALL getAvailableModules(
- const css::lang::Locale& rLocale, sal_Int16 sType )
- throw(css::uno::RuntimeException, std::exception) override;
+ const css::lang::Locale& rLocale, sal_Int16 sType ) override;
virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
- css::uno::Sequence< sal_Int32 >& offset ) throw(css::uno::RuntimeException, std::exception) override ;
+ css::uno::Sequence< sal_Int32 >& offset ) override ;
virtual OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
- css::uno::Sequence< sal_Int32 >& offset ) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int32 >& offset ) override;
// Methods in XExtendedTransliteration
- virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
- throw(css::uno::RuntimeException, std::exception) override ;
- virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar )
- throw(css::uno::RuntimeException, std::exception) override ;
- virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar )
- throw(css::i18n::MultipleCharsOutputException,
- css::uno::RuntimeException, std::exception) override ;
+ virtual OUString SAL_CALL transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) override ;
+ virtual OUString SAL_CALL transliterateChar2String( sal_Unicode inChar ) override ;
+ virtual sal_Unicode SAL_CALL transliterateChar2Char( sal_Unicode inChar ) override ;
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(css::uno::RuntimeException, std::exception) override;
+ sal_Int32& nMatch1, const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override;
virtual css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1,
- const OUString& str2 ) throw(css::uno::RuntimeException, std::exception) override ;
+ const OUString& str2 ) override ;
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(css::uno::RuntimeException, std::exception) override;
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
- virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2)
- throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL compareString( const OUString& s1, const OUString& s2) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
private:
#define maxCascade 27
@@ -102,21 +92,18 @@ private:
/// @throws css::uno::RuntimeException
bool SAL_CALL loadModuleByName( const OUString& implName,
- css::uno::Reference<css::i18n::XExtendedTransliteration> & body, const css::lang::Locale& rLocale)
- throw(css::uno::RuntimeException);
+ css::uno::Reference<css::i18n::XExtendedTransliteration> & body, const css::lang::Locale& rLocale);
void clear();
/// @throws css::uno::RuntimeException
void loadBody( OUString &implName,
- css::uno::Reference< css::i18n::XExtendedTransliteration >& body )
- throw (css::uno::RuntimeException);
+ css::uno::Reference< css::i18n::XExtendedTransliteration >& body );
/// @throws css::uno::RuntimeException
css::uno::Sequence< OUString > SAL_CALL getRange(
const css::uno::Sequence< OUString > &inStrs,
- sal_Int32 length, const sal_Int16 _nCascade)
- throw(css::uno::RuntimeException);
+ sal_Int32 length, const sal_Int16 _nCascade);
};
} } } }
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index 24f147ac3fe4..28929c746c06 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.hxx
@@ -31,37 +31,30 @@ class transliteration_Ignore : public transliteration_commonclass
{
public:
virtual OUString SAL_CALL
- folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset)
- throw(css::uno::RuntimeException, std::exception) override;
+ folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) override;
// 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(css::uno::RuntimeException, std::exception) override;
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override;
// This method is implemented in sub class if needed. Otherwise, the method implemented in this class will be used.
css::uno::Sequence< OUString > SAL_CALL
- transliterateRange( const OUString& str1, const OUString& str2 )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterateRange( const OUString& str1, const OUString& str2 ) override;
// Methods which are shared.
- sal_Int16 SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 SAL_CALL getType( ) override;
OUString SAL_CALL
- transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
virtual sal_Unicode SAL_CALL
- transliterateChar2Char( sal_Unicode inChar)
- throw(css::uno::RuntimeException,
- css::i18n::MultipleCharsOutputException, std::exception) override;
+ transliterateChar2Char( sal_Unicode inChar) override;
/// @throws css::uno::RuntimeException
static css::uno::Sequence< OUString > SAL_CALL
- transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 )
- throw(css::uno::RuntimeException);
+ transliterateRange( const OUString& str1, const OUString& str2, XTransliteration& t1, XTransliteration& t2 );
struct Mapping {
sal_Unicode previousChar;
@@ -103,13 +96,10 @@ public:
ignoreDiacritics_CTL();
OUString SAL_CALL
- folding(const OUString& rInStr, sal_Int32 nStartPos, sal_Int32 nCount, css::uno::Sequence<sal_Int32>& rOffset)
- throw(css::uno::RuntimeException, std::exception) override;
+ folding(const OUString& rInStr, sal_Int32 nStartPos, sal_Int32 nCount, css::uno::Sequence<sal_Int32>& rOffset) override;
sal_Unicode SAL_CALL
- transliterateChar2Char(sal_Unicode nInChar)
- throw(css::uno::RuntimeException,
- css::i18n::MultipleCharsOutputException, std::exception) override;
+ transliterateChar2Char(sal_Unicode nInChar) override;
};
#undef TRANSLITERATION_IGNORE
@@ -125,7 +115,7 @@ public:\
implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
};\
OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
- css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override; \
+ css::uno::Sequence< sal_Int32 >& offset) override; \
};
TRANSLITERATION_IGNORE(KiKuFollowedBySa_ja_JP)
@@ -146,14 +136,13 @@ public:\
implementationName = "com.sun.star.i18n.Transliteration.ignore"#name;\
};\
OUString SAL_CALL folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, \
- css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override; \
+ css::uno::Sequence< sal_Int32 >& offset) override; \
using transliteration_Ignore::transliterateRange;\
css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1, \
- const OUString& str2 ) throw(css::uno::RuntimeException, std::exception) override; \
+ const OUString& str2 ) override; \
sal_Unicode SAL_CALL \
transliterateChar2Char( sal_Unicode inChar) \
- throw(css::uno::RuntimeException,\
- css::i18n::MultipleCharsOutputException, std::exception) override;\
+ override;\
};
TRANSLITERATION_IGNORE(Kana)
diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index 4032478215a3..d8ae49cb3a7c 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.hxx
@@ -26,28 +26,22 @@ namespace com { namespace sun { namespace star { namespace i18n {
class transliteration_Numeric : public transliteration_commonclass {
public:
virtual OUString SAL_CALL
- transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
virtual sal_Unicode SAL_CALL
- transliterateChar2Char( sal_Unicode inChar)
- throw(css::i18n::MultipleCharsOutputException,
- css::uno::RuntimeException, std::exception) override;
+ transliterateChar2Char( sal_Unicode inChar) override;
// Methods which are shared.
- virtual sal_Int16 SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getType( ) override;
virtual OUString SAL_CALL
- folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
- throw(css::uno::RuntimeException, std::exception) override;
+ folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
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(css::uno::RuntimeException, std::exception) override;
+ 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 ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- transliterateRange( const OUString& str1, const OUString& str2 )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterateRange( const OUString& str1, const OUString& str2 ) override;
protected:
sal_Int16 nNativeNumberMode;
sal_Int16 tableSize;
@@ -57,8 +51,7 @@ private:
/// @throws css::uno::RuntimeException
OUString SAL_CALL
transliterateBullet( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
- css::uno::Sequence< sal_Int32 >& offset )
- throw(css::uno::RuntimeException);
+ css::uno::Sequence< sal_Int32 >& offset );
};
} } } }
diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx
index 98b380aa8a14..dce55fb6ef8d 100644
--- a/i18npool/inc/transliteration_OneToOne.hxx
+++ b/i18npool/inc/transliteration_OneToOne.hxx
@@ -30,29 +30,23 @@ class transliteration_OneToOne : public transliteration_commonclass
{
public:
OUString SAL_CALL
- transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
sal_Unicode SAL_CALL
- transliterateChar2Char( sal_Unicode inChar)
- throw(css::uno::RuntimeException,
- css::i18n::MultipleCharsOutputException, std::exception) override;
+ transliterateChar2Char( sal_Unicode inChar) override;
// Methods which are shared.
- sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 SAL_CALL getType() override;
OUString SAL_CALL
- folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset)
- throw(css::uno::RuntimeException, std::exception) override;
+ folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) override;
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(css::uno::RuntimeException, std::exception) override;
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override;
css::uno::Sequence< OUString > SAL_CALL
- transliterateRange( const OUString& str1, const OUString& str2 )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterateRange( const OUString& str1, const OUString& str2 ) override;
protected:
TransFunc func;
@@ -66,11 +60,10 @@ public: \
name (); \
OUString SAL_CALL \
transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) \
- throw(css::uno::RuntimeException, std::exception) override; \
+ override; \
sal_Unicode SAL_CALL \
transliterateChar2Char( sal_Unicode inChar) \
- throw(css::uno::RuntimeException, \
- css::i18n::MultipleCharsOutputException, std::exception) override; \
+ override; \
};
TRANSLITERATION_ONETOONE( fullwidthToHalfwidth )
@@ -82,24 +75,21 @@ class halfwidthToFullwidth : public transliteration_OneToOne
public:
halfwidthToFullwidth();
OUString SAL_CALL
- transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
};
class halfwidthKatakanaToFullwidthKatakana : public transliteration_OneToOne
{
public:
halfwidthKatakanaToFullwidthKatakana();
OUString SAL_CALL
- transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
};
class halfwidthToFullwidthLikeJIS : public transliteration_OneToOne
{
public:
halfwidthToFullwidthLikeJIS();
OUString SAL_CALL
- transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
};
#undef TRANSLITERATION_ONETOONE
diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index 55616997cdeb..c39ff58db308 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.hxx
@@ -30,30 +30,26 @@ public:
Transliteration_body();
// Methods which are shared.
- sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 SAL_CALL getType() override;
OUString SAL_CALL transliterate(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
- css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int32 >& offset) override;
OUString SAL_CALL
- transliterateChar2String( sal_Unicode inChar)
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterateChar2String( sal_Unicode inChar) override;
virtual sal_Unicode SAL_CALL
- transliterateChar2Char( sal_Unicode inChar)
- throw(css::uno::RuntimeException,
- css::i18n::MultipleCharsOutputException, std::exception) override;
+ transliterateChar2Char( sal_Unicode inChar) override;
OUString SAL_CALL folding(const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
- css::uno::Sequence< sal_Int32 >& offset) throw(css::uno::RuntimeException, std::exception) override;
+ css::uno::Sequence< sal_Int32 >& offset) override;
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(css::uno::RuntimeException, std::exception) override;
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2 ) override;
css::uno::Sequence< OUString > SAL_CALL transliterateRange( const OUString& str1,
- const OUString& str2 ) throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& str2 ) override;
protected:
MappingType nMappingType;
@@ -89,7 +85,7 @@ class Transliteration_titlecase : public Transliteration_body
public:
Transliteration_titlecase();
- virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
};
class Transliteration_sentencecase : public Transliteration_body
@@ -97,7 +93,7 @@ class Transliteration_sentencecase : public Transliteration_body
public:
Transliteration_sentencecase();
- virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override;
};
} } } }
diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx
index e2f82514c3e1..93c91ea05703 100644
--- a/i18npool/inc/transliteration_caseignore.hxx
+++ b/i18npool/inc/transliteration_caseignore.hxx
@@ -29,29 +29,24 @@ public:
Transliteration_caseignore();
// Methods which are shared.
- sal_Int16 SAL_CALL getType() throw(css::uno::RuntimeException, std::exception) override;
+ sal_Int16 SAL_CALL getType() override;
- void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ void SAL_CALL loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) override;
css::uno::Sequence< OUString > SAL_CALL transliterateRange(
- const OUString& str1, const OUString& str2 )
- throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& str1, const OUString& str2 ) override;
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(css::uno::RuntimeException, std::exception) override;
+ const OUString& src2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2) override;
sal_Int32 SAL_CALL compareSubstring(
const OUString& s1, sal_Int32 off1, sal_Int32 len1,
- const OUString& s2, sal_Int32 off2, sal_Int32 len2)
- throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
sal_Int32 SAL_CALL compareString(
const OUString& s1,
- const OUString& s2)
- throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& s2) override;
protected:
TransliterationModules moduleLoaded;
@@ -59,8 +54,7 @@ private:
/// @throws css::uno::RuntimeException
sal_Int32 SAL_CALL compare(
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(css::uno::RuntimeException);
+ const OUString& str2, sal_Int32 pos2, sal_Int32 nCount2, sal_Int32& nMatch2);
};
} } } }
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index 1b2d1eed39fa..0a6249b33714 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.hxx
@@ -38,73 +38,55 @@ public:
// Methods which are shared.
void SAL_CALL
- loadModule( TransliterationModules modName, const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ loadModule( TransliterationModules modName, const css::lang::Locale& rLocale ) override;
void SAL_CALL
- loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName, const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ loadModuleNew( const css::uno::Sequence< TransliterationModulesNew >& modName, const css::lang::Locale& rLocale ) override;
void SAL_CALL
- loadModuleByImplName( const OUString& implName, const css::lang::Locale& rLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ loadModuleByImplName( const OUString& implName, const css::lang::Locale& rLocale ) override;
void SAL_CALL
- loadModulesByImplNames(const css::uno::Sequence< OUString >& modNamelist, const css::lang::Locale& rLocale)
- throw(css::uno::RuntimeException, std::exception) override;
+ loadModulesByImplNames(const css::uno::Sequence< OUString >& modNamelist, const css::lang::Locale& rLocale) override;
css::uno::Sequence< OUString > SAL_CALL
- getAvailableModules( const css::lang::Locale& rLocale, sal_Int16 sType )
- throw(css::uno::RuntimeException, std::exception) override;
+ getAvailableModules( const css::lang::Locale& rLocale, sal_Int16 sType ) override;
// Methods which should be implemented in each transliteration module.
- virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getName() override;
- virtual sal_Int16 SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override = 0;
+ virtual sal_Int16 SAL_CALL getType( ) override = 0;
virtual OUString SAL_CALL
- transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset )
- throw(css::uno::RuntimeException, std::exception) override = 0;
+ transliterate( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset ) override = 0;
virtual OUString SAL_CALL
- folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset)
- throw(css::uno::RuntimeException, std::exception) override = 0;
+ folding( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount, css::uno::Sequence< sal_Int32 >& offset) override = 0;
// Methods in XExtendedTransliteration
virtual OUString SAL_CALL
- transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount )
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterateString2String( const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount ) override;
virtual OUString SAL_CALL
- transliterateChar2String( sal_Unicode inChar)
- throw(css::uno::RuntimeException, std::exception) override;
+ transliterateChar2String( sal_Unicode inChar) override;
virtual sal_Unicode SAL_CALL
- transliterateChar2Char( sal_Unicode inChar )
- throw(css::i18n::MultipleCharsOutputException,
- css::uno::RuntimeException, std::exception) override = 0;
+ transliterateChar2Char( sal_Unicode inChar ) override = 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(css::uno::RuntimeException, std::exception) override = 0;
+ 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 ) override = 0;
virtual css::uno::Sequence< OUString > SAL_CALL
- transliterateRange( const OUString& str1, const OUString& str2 )
- throw(css::uno::RuntimeException, std::exception) override = 0;
+ transliterateRange( const OUString& str1, const OUString& str2 ) override = 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(css::uno::RuntimeException, std::exception) override;
+ compareSubstring( const OUString& s1, sal_Int32 off1, sal_Int32 len1, const OUString& s2, sal_Int32 off2, sal_Int32 len2) override;
virtual sal_Int32 SAL_CALL
- compareString( const OUString& s1, const OUString& s2)
- throw(css::uno::RuntimeException, std::exception) override;
+ compareString( const OUString& s1, const OUString& s2) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
protected:
css::lang::Locale aLocale;
const sal_Char* transliterationName;
diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx
index effbb23acdd3..099552fcf09d 100644
--- a/i18npool/inc/unoscripttypedetector.hxx
+++ b/i18npool/inc/unoscripttypedetector.hxx
@@ -35,21 +35,18 @@ class UnoScriptTypeDetector : public cppu::WeakImplHelper
{
public:
// Methods
- virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL beginOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) override;
+ virtual sal_Int32 SAL_CALL endOfScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 scriptDirection ) override;
+ virtual sal_Int16 SAL_CALL getScriptDirection( const OUString& Text, sal_Int32 nPos, sal_Int16 defaultScriptDirection ) override;
+ virtual sal_Int32 SAL_CALL beginOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) override;
+ virtual sal_Int32 SAL_CALL endOfCTLScriptType( const OUString& Text, sal_Int32 nPos ) override;
+ virtual sal_Int16 SAL_CALL getCTLScriptType( const OUString& Text, sal_Int32 nPos ) override;
//XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName)
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
#endif