diff options
Diffstat (limited to 'lingucomponent/source/hyphenator/hyphen')
-rw-r--r-- | lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx | 16 | ||||
-rw-r--r-- | lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx | 30 |
2 files changed, 15 insertions, 31 deletions
diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx index c363f3fd5170..4b1358392133 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx @@ -108,7 +108,6 @@ PropertyHelper_Hyphenation& Hyphenator::GetPropHelper_Impl() } Sequence< Locale > SAL_CALL Hyphenator::getLocales() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -228,7 +227,6 @@ Sequence< Locale > SAL_CALL Hyphenator::getLocales() } sal_Bool SAL_CALL Hyphenator::hasLocale(const Locale& rLocale) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -253,7 +251,6 @@ Reference< XHyphenatedWord > SAL_CALL Hyphenator::hyphenate( const OUString& aWo const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) - throw (css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception) { int k = 0; @@ -499,7 +496,6 @@ Reference < XHyphenatedWord > SAL_CALL Hyphenator::queryAlternativeSpelling( const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { // Firstly we allow only one plus character before the hyphen to avoid to miss the right break point: for (int extrachar = 1; extrachar <= 2; extrachar++) @@ -537,7 +533,6 @@ static OString Win_GetShortPathName( const OUString &rLongPathName ) Reference< XPossibleHyphens > SAL_CALL Hyphenator::createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) - throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { PropertyHelper_Hyphenation& rHelper = GetPropHelper(); rHelper.SetTmpPropVals(aProperties); @@ -743,7 +738,6 @@ OUString SAL_CALL Hyphenator::makeInitCap(const OUString& aTerm, CharClass * pCC /// @throws Exception Reference< XInterface > SAL_CALL Hyphenator_CreateInstance( const Reference< XMultiServiceFactory > & /*rSMgr*/ ) - throw(Exception) { Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new Hyphenator); return xService; @@ -751,7 +745,6 @@ Reference< XInterface > SAL_CALL Hyphenator_CreateInstance( sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -765,7 +758,6 @@ sal_Bool SAL_CALL Hyphenator::addLinguServiceEventListener( sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -778,14 +770,12 @@ sal_Bool SAL_CALL Hyphenator::removeLinguServiceEventListener( } OUString SAL_CALL Hyphenator::getServiceDisplayName( const Locale& /*rLocale*/ ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return OUString( "Libhyphen Hyphenator" ); } void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments ) - throw(Exception, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -812,7 +802,6 @@ void SAL_CALL Hyphenator::initialize( const Sequence< Any >& rArguments ) } void SAL_CALL Hyphenator::dispose() - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -831,7 +820,6 @@ void SAL_CALL Hyphenator::dispose() } void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -840,7 +828,6 @@ void SAL_CALL Hyphenator::addEventListener( const Reference< XEventListener >& r } void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -850,19 +837,16 @@ void SAL_CALL Hyphenator::removeEventListener( const Reference< XEventListener > // Service specific part OUString SAL_CALL Hyphenator::getImplementationName() - throw(RuntimeException, std::exception) { return getImplementationName_Static(); } sal_Bool SAL_CALL Hyphenator::supportsService( const OUString& ServiceName ) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL Hyphenator::getSupportedServiceNames() - throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } diff --git a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx index a8d680a91400..94f6db85011d 100644 --- a/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx +++ b/lingucomponent/source/hyphenator/hyphen/hyphenimp.hxx @@ -88,33 +88,33 @@ public: virtual ~Hyphenator() override; // XSupportedLocales (for XHyphenator) - virtual Sequence< Locale > SAL_CALL getLocales() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) throw(RuntimeException, std::exception) override; + virtual Sequence< Locale > SAL_CALL getLocales() override; + virtual sal_Bool SAL_CALL hasLocale( const Locale& rLocale ) override; // XHyphenator - virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL hyphenate( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nMaxLeading, const css::beans::PropertyValues& aProperties ) override; + virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, const css::lang::Locale& aLocale, sal_Int16 nIndex, const css::beans::PropertyValues& aProperties ) override; + virtual css::uno::Reference< css::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override; // XLinguServiceEventBroadcaster - virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) throw(RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override; + virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxLstnr ) override; // XServiceDisplayName - virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceDisplayName( const Locale& rLocale ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) throw(Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& rArguments ) override; // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& rxListener ) override; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& rxListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; static inline OUString getImplementationName_Static() throw(); static Sequence< OUString > getSupportedServiceNames_Static() throw(); |