diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-25 21:31:58 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-26 18:22:20 +0100 |
| commit | 5e21a413c788f839a66d9e4c14e745ed18058db8 (patch) | |
| tree | d4451246461346a425ad6f796e08bf1514cdd942 /linguistic | |
| parent | 6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff) | |
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'linguistic')
30 files changed, 375 insertions, 375 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx index 806d09c6879b..b7d0fde8eaf9 100644 --- a/linguistic/inc/iprcache.hxx +++ b/linguistic/inc/iprcache.hxx @@ -77,13 +77,13 @@ public: void SetPropSet( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguProperties > &rPS ); //XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XDictionaryListEventListener - virtual void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processDictionaryListEvent( const ::com::sun::star::linguistic2::DictionaryListEvent& rDicListEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL propertyChange( const ::com::sun::star::beans::PropertyChangeEvent& rEvt ) throw(::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 62ab0f0c5137..beee73245465 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -345,7 +345,7 @@ void ConvDic::RemoveEntry( const OUString &rLeftText, const OUString &rRightText OUString SAL_CALL ConvDic::getName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aName; @@ -353,7 +353,7 @@ OUString SAL_CALL ConvDic::getName( ) Locale SAL_CALL ConvDic::getLocale( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return LanguageTag::convertToLocale( nLanguage ); @@ -361,7 +361,7 @@ Locale SAL_CALL ConvDic::getLocale( ) sal_Int16 SAL_CALL ConvDic::getConversionType( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return nConversionType; @@ -369,7 +369,7 @@ sal_Int16 SAL_CALL ConvDic::getConversionType( ) void SAL_CALL ConvDic::setActive( sal_Bool bActivate ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); bIsActive = bActivate; @@ -377,7 +377,7 @@ void SAL_CALL ConvDic::setActive( sal_Bool bActivate ) sal_Bool SAL_CALL ConvDic::isActive( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return bIsActive; @@ -385,7 +385,7 @@ sal_Bool SAL_CALL ConvDic::isActive( ) void SAL_CALL ConvDic::clear( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); aFromLeft .clear(); @@ -405,7 +405,7 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversions( sal_Int32 nLength, ConversionDirection eDirection, sal_Int32 /*nTextConversionOptions*/ ) - throw (IllegalArgumentException, RuntimeException) + throw (IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -456,7 +456,7 @@ static sal_Bool lcl_SeqHasEntry( uno::Sequence< OUString > SAL_CALL ConvDic::getConversionEntries( ConversionDirection eDirection ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -492,7 +492,7 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversionEntries( void SAL_CALL ConvDic::addEntry( const OUString& aLeftText, const OUString& aRightText ) - throw (IllegalArgumentException, container::ElementExistException, RuntimeException) + throw (IllegalArgumentException, container::ElementExistException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (bNeedEntries) @@ -506,7 +506,7 @@ void SAL_CALL ConvDic::addEntry( void SAL_CALL ConvDic::removeEntry( const OUString& aLeftText, const OUString& aRightText ) - throw (container::NoSuchElementException, RuntimeException) + throw (container::NoSuchElementException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (bNeedEntries) @@ -518,7 +518,7 @@ void SAL_CALL ConvDic::removeEntry( sal_Int16 SAL_CALL ConvDic::getMaxCharCount( ConversionDirection eDirection ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -569,7 +569,7 @@ void SAL_CALL ConvDic::setPropertyType( const OUString& rLeftText, const OUString& rRightText, sal_Int16 nPropertyType ) - throw (container::NoSuchElementException, IllegalArgumentException, RuntimeException) + throw (container::NoSuchElementException, IllegalArgumentException, RuntimeException, std::exception) { sal_Bool bHasElement = HasEntry( rLeftText, rRightText); if (!bHasElement) @@ -586,7 +586,7 @@ void SAL_CALL ConvDic::setPropertyType( sal_Int16 SAL_CALL ConvDic::getPropertyType( const OUString& rLeftText, const OUString& rRightText ) - throw (container::NoSuchElementException, RuntimeException) + throw (container::NoSuchElementException, RuntimeException, std::exception) { sal_Bool bHasElement = HasEntry( rLeftText, rRightText); if (!bHasElement) @@ -606,7 +606,7 @@ sal_Int16 SAL_CALL ConvDic::getPropertyType( void SAL_CALL ConvDic::flush( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -630,7 +630,7 @@ void SAL_CALL ConvDic::flush( ) void SAL_CALL ConvDic::addFlushListener( const uno::Reference< util::XFlushListener >& rxListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (rxListener.is()) @@ -640,7 +640,7 @@ void SAL_CALL ConvDic::addFlushListener( void SAL_CALL ConvDic::removeFlushListener( const uno::Reference< util::XFlushListener >& rxListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (rxListener.is()) @@ -649,20 +649,20 @@ void SAL_CALL ConvDic::removeFlushListener( OUString SAL_CALL ConvDic::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL ConvDic::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index 26ed5abf6032..bdd2e3d06f3a 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -115,31 +115,31 @@ public: virtual ~ConvDic(); // XConversionDictionary - virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getConversionType( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setActive( sal_Bool bActivate ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversionEntries( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL getMaxCharCount( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::lang::Locale SAL_CALL getLocale( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getConversionType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setActive( sal_Bool bActivate ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL isActive( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL clear( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConversionEntries( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL getMaxCharCount( ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XConversionPropertyType - virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException, std::exception); // XFlushable - virtual void SAL_CALL flush( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL flush( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeFlushListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XFlushListener >& l ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); static inline OUString diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 158c99efb031..d71a5adc036d 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -97,20 +97,20 @@ public: virtual ~ConvDicNameContainer(); // XElementAccess - virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasElements( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeByName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // looks for conversion dictionaries with the specified extension // in the directory and adds them to the container @@ -183,21 +183,21 @@ uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName( } uno::Type SAL_CALL ConvDicNameContainer::getElementType( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return uno::Type( ::getCppuType( (uno::Reference< XConversionDictionary > *) 0) ); } sal_Bool SAL_CALL ConvDicNameContainer::hasElements( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aConvDics.getLength() > 0; } uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException) + throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); uno::Reference< XConversionDictionary > xRes( GetByName( rName ) ); @@ -207,7 +207,7 @@ uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName ) } uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -221,7 +221,7 @@ uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames( ) } sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return GetByName( rName ).is(); @@ -230,7 +230,7 @@ sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName ) void SAL_CALL ConvDicNameContainer::replaceByName( const OUString& rName, const uno::Any& rElement ) - throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -247,7 +247,7 @@ void SAL_CALL ConvDicNameContainer::replaceByName( void SAL_CALL ConvDicNameContainer::insertByName( const OUString& rName, const Any& rElement ) - throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -264,7 +264,7 @@ void SAL_CALL ConvDicNameContainer::insertByName( } void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException) + throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -435,7 +435,7 @@ ConvDicNameContainer & ConvDicList::GetNameContainer() return *pNameContainer; } -uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryContainer( ) throw (RuntimeException) +uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryContainer( ) throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); GetNameContainer(); @@ -447,7 +447,7 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary( const OUString& rName, const Locale& rLocale, sal_Int16 nConvDicType ) - throw (NoSupportException, ElementExistException, RuntimeException) + throw (NoSupportException, ElementExistException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -489,7 +489,7 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions( sal_Int16 nConversionDictionaryType, ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) - throw (IllegalArgumentException, NoSupportException, RuntimeException) + throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -537,7 +537,7 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount( const Locale& rLocale, sal_Int16 nConversionDictionaryType, ConversionDirection eDirection ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -560,7 +560,7 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount( } void SAL_CALL ConvDicList::dispose( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (!bDisposing) @@ -575,7 +575,7 @@ void SAL_CALL ConvDicList::dispose( ) void SAL_CALL ConvDicList::addEventListener( const uno::Reference< XEventListener >& rxListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (!bDisposing && rxListener.is()) @@ -584,7 +584,7 @@ void SAL_CALL ConvDicList::addEventListener( void SAL_CALL ConvDicList::removeEventListener( const uno::Reference< XEventListener >& rxListener ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (!bDisposing && rxListener.is()) @@ -592,20 +592,20 @@ void SAL_CALL ConvDicList::removeEventListener( } OUString SAL_CALL ConvDicList::getImplementationName() - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); } sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL ConvDicList::getSupportedServiceNames() - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index 1edd3fd588ed..d2cd8444c43f 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -75,20 +75,20 @@ public: virtual ~ConvDicList(); // XConversionDictionaryList - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getDictionaryContainer( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int16 SAL_CALL queryMaxCharCount( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getDictionaryContainer( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Int16 SAL_CALL queryMaxCharCount( const ::com::sun::star::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, ::com::sun::star::linguistic2::ConversionDirection eDirection ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); static inline OUString diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index f003c001aecf..6c10744a3e8e 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -384,7 +384,7 @@ void ConvDicXMLExport::_ExportContent() } void SAL_CALL ConvDicXMLImport::startDocument(void) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { // register namespace at first possible opportunity GetNamespaceMap().Add( "tcd", @@ -393,7 +393,7 @@ void SAL_CALL ConvDicXMLImport::startDocument(void) } void SAL_CALL ConvDicXMLImport::endDocument(void) - throw( xml::sax::SAXException, uno::RuntimeException ) + throw( xml::sax::SAXException, uno::RuntimeException, std::exception ) { SvXMLImport::endDocument(); } diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index dd4521c4fb0a..a11a50e75982 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -96,8 +96,8 @@ public: { } - virtual void SAL_CALL startDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL startDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); + virtual void SAL_CALL endDocument(void) throw( ::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException, std::exception ); virtual SvXMLImportContext * CreateContext( sal_uInt16 nPrefix, const OUString &rLocalName, diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx index 0ce35b54f1af..5e3c0fdd53c0 100644 --- a/linguistic/source/dicimp.cxx +++ b/linguistic/source/dicimp.cxx @@ -762,14 +762,14 @@ uno::Reference< XInterface > SAL_CALL DictionaryNeo_CreateInstance( } OUString SAL_CALL DictionaryNeo::getName( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aDicName; } void SAL_CALL DictionaryNeo::setName( const OUString& aName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -781,7 +781,7 @@ void SAL_CALL DictionaryNeo::setName( const OUString& aName ) } DictionaryType SAL_CALL DictionaryNeo::getDictionaryType( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -789,7 +789,7 @@ DictionaryType SAL_CALL DictionaryNeo::getDictionaryType( ) } void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -822,14 +822,14 @@ void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate ) } sal_Bool SAL_CALL DictionaryNeo::isActive( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return bIsActive; } sal_Int32 SAL_CALL DictionaryNeo::getCount( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -839,14 +839,14 @@ sal_Int32 SAL_CALL DictionaryNeo::getCount( ) } Locale SAL_CALL DictionaryNeo::getLocale( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return LanguageTag::convertToLocale( nLanguage ); } void SAL_CALL DictionaryNeo::setLocale( const Locale& aLocale ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); sal_Int16 nLanguageP = LinguLocaleToLanguage( aLocale ); @@ -861,7 +861,7 @@ void SAL_CALL DictionaryNeo::setLocale( const Locale& aLocale ) uno::Reference< XDictionaryEntry > SAL_CALL DictionaryNeo::getEntry( const OUString& aWord ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -879,7 +879,7 @@ uno::Reference< XDictionaryEntry > SAL_CALL DictionaryNeo::getEntry( sal_Bool SAL_CALL DictionaryNeo::addEntry( const uno::Reference< XDictionaryEntry >& xDicEntry ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -898,7 +898,7 @@ sal_Bool SAL_CALL DictionaryNeo::addEntry( sal_Bool SAL_CALL DictionaryNeo::add( const OUString& rWord, sal_Bool bIsNegative, const OUString& rRplcText ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -935,7 +935,7 @@ static void lcl_SequenceRemoveElementAt( } sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -974,7 +974,7 @@ sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord ) } sal_Bool SAL_CALL DictionaryNeo::isFull( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -985,7 +985,7 @@ sal_Bool SAL_CALL DictionaryNeo::isFull( ) uno::Sequence< uno::Reference< XDictionaryEntry > > SAL_CALL DictionaryNeo::getEntries( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -999,7 +999,7 @@ uno::Sequence< uno::Reference< XDictionaryEntry > > void SAL_CALL DictionaryNeo::clear( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -1018,7 +1018,7 @@ void SAL_CALL DictionaryNeo::clear( ) sal_Bool SAL_CALL DictionaryNeo::addDictionaryEventListener( const uno::Reference< XDictionaryEventListener >& xListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -1033,7 +1033,7 @@ sal_Bool SAL_CALL DictionaryNeo::addDictionaryEventListener( sal_Bool SAL_CALL DictionaryNeo::removeDictionaryEventListener( const uno::Reference< XDictionaryEventListener >& xListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -1048,21 +1048,21 @@ sal_Bool SAL_CALL DictionaryNeo::removeDictionaryEventListener( sal_Bool SAL_CALL DictionaryNeo::hasLocation() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return !aMainURL.isEmpty(); } OUString SAL_CALL DictionaryNeo::getLocation() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aMainURL; } sal_Bool SAL_CALL DictionaryNeo::isReadonly() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -1070,7 +1070,7 @@ sal_Bool SAL_CALL DictionaryNeo::isReadonly() } void SAL_CALL DictionaryNeo::store() - throw(io::IOException, RuntimeException) + throw(io::IOException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -1084,7 +1084,7 @@ void SAL_CALL DictionaryNeo::store() void SAL_CALL DictionaryNeo::storeAsURL( const OUString& aURL, const uno::Sequence< beans::PropertyValue >& /*rArgs*/ ) - throw(io::IOException, RuntimeException) + throw(io::IOException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -1099,7 +1099,7 @@ void SAL_CALL DictionaryNeo::storeAsURL( void SAL_CALL DictionaryNeo::storeToURL( const OUString& aURL, const uno::Sequence< beans::PropertyValue >& /*rArgs*/ ) - throw(io::IOException, RuntimeException) + throw(io::IOException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); saveEntries(aURL); @@ -1152,21 +1152,21 @@ void DicEntry::splitDicFileWord(const OUString &rDicFileWord, } OUString SAL_CALL DicEntry::getDictionaryWord( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aDicWord; } sal_Bool SAL_CALL DicEntry::isNegative( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return bIsNegativ; } OUString SAL_CALL DicEntry::getReplacementText( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aReplacement; diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index dee9df3e0e50..3f82c19337c9 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -91,91 +91,91 @@ public: // XNamed virtual OUString SAL_CALL getName() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setName( const OUString& aName ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XDictionary virtual ::com::sun::star::linguistic2::DictionaryType SAL_CALL getDictionaryType() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setActive( sal_Bool bActivate ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isActive() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Int32 SAL_CALL getCount() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::lang::Locale SAL_CALL getLocale() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL setLocale( const ::com::sun::star::lang::Locale& aLocale ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL getEntry( const OUString& aWord ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL addEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry >& xDicEntry ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL add( const OUString& aWord, sal_Bool bIsNegative, const OUString& aRplcText ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL remove( const OUString& aWord ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isFull() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > > SAL_CALL getEntries() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL clear() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL addDictionaryEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEventListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL removeDictionaryEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEventListener >& xListener ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XStorable virtual sal_Bool SAL_CALL hasLocation() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL getLocation() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL isReadonly() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL store() throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeAsURL( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual void SAL_CALL storeToURL( const OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); }; @@ -206,11 +206,11 @@ public: // XDictionaryEntry virtual OUString SAL_CALL - getDictionaryWord() throw(::com::sun::star::uno::RuntimeException); + getDictionaryWord() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL - isNegative() throw(::com::sun::star::uno::RuntimeException); + isNegative() throw(::com::sun::star::uno::RuntimeException, std::exception); virtual OUString SAL_CALL - getReplacementText() throw(::com::sun::star::uno::RuntimeException); + getReplacementText() throw(::com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index b398ed8e88d0..7089919f0b42 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -79,12 +79,12 @@ public: // XEventListener virtual void SAL_CALL disposing( const EventObject& rSource ) - throw(RuntimeException); + throw(RuntimeException, std::exception); // XDictionaryEventListener virtual void SAL_CALL processDictionaryEvent( const DictionaryEvent& rDicEvent ) - throw(RuntimeException); + throw(RuntimeException, std::exception); // non-UNO functions void DisposeAndClear( const EventObject &rEvtObj ); @@ -125,7 +125,7 @@ void DicEvtListenerHelper::DisposeAndClear( const EventObject &rEvtObj ) void SAL_CALL DicEvtListenerHelper::disposing( const EventObject& rSource ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -148,7 +148,7 @@ void SAL_CALL DicEvtListenerHelper::disposing( const EventObject& rSource ) void SAL_CALL DicEvtListenerHelper::processDictionaryEvent( const DictionaryEvent& rDicEvent ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -394,7 +394,7 @@ uno::Reference< XInterface > SAL_CALL return xService; } -sal_Int16 SAL_CALL DicList::getCount() throw(RuntimeException) +sal_Int16 SAL_CALL DicList::getCount() throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); return static_cast< sal_Int16 >(GetOrCreateDicList().size()); @@ -402,7 +402,7 @@ sal_Int16 SAL_CALL DicList::getCount() throw(RuntimeException) uno::Sequence< uno::Reference< XDictionary > > SAL_CALL DicList::getDictionaries() - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -420,7 +420,7 @@ uno::Sequence< uno::Reference< XDictionary > > SAL_CALL uno::Reference< XDictionary > SAL_CALL DicList::getDictionaryByName( const OUString& aDictionaryName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -442,7 +442,7 @@ uno::Reference< XDictionary > SAL_CALL sal_Bool SAL_CALL DicList::addDictionary( const uno::Reference< XDictionary >& xDictionary ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -464,7 +464,7 @@ sal_Bool SAL_CALL DicList::addDictionary( sal_Bool SAL_CALL DicList::removeDictionary( const uno::Reference< XDictionary >& xDictionary ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -497,7 +497,7 @@ sal_Bool SAL_CALL sal_Bool SAL_CALL DicList::addDictionaryListEventListener( const uno::Reference< XDictionaryListEventListener >& xListener, sal_Bool bReceiveVerbose ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -517,7 +517,7 @@ sal_Bool SAL_CALL DicList::addDictionaryListEventListener( sal_Bool SAL_CALL DicList::removeDictionaryListEventListener( const uno::Reference< XDictionaryListEventListener >& xListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -532,19 +532,19 @@ sal_Bool SAL_CALL DicList::removeDictionaryListEventListener( return bRes; } -sal_Int16 SAL_CALL DicList::beginCollectEvents() throw(RuntimeException) +sal_Int16 SAL_CALL DicList::beginCollectEvents() throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); return pDicEvtLstnrHelper->BeginCollectEvents(); } -sal_Int16 SAL_CALL DicList::endCollectEvents() throw(RuntimeException) +sal_Int16 SAL_CALL DicList::endCollectEvents() throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); return pDicEvtLstnrHelper->EndCollectEvents(); } -sal_Int16 SAL_CALL DicList::flushEvents() throw(RuntimeException) +sal_Int16 SAL_CALL DicList::flushEvents() throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); return pDicEvtLstnrHelper->FlushEvents(); @@ -553,7 +553,7 @@ sal_Int16 SAL_CALL DicList::flushEvents() throw(RuntimeException) uno::Reference< XDictionary > SAL_CALL DicList::createDictionary( const OUString& rName, const Locale& rLocale, DictionaryType eDicType, const OUString& rURL ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -566,7 +566,7 @@ uno::Reference< XDictionary > SAL_CALL uno::Reference< XDictionaryEntry > SAL_CALL DicList::queryDictionaryEntry( const OUString& rWord, const Locale& rLocale, sal_Bool bSearchPosDics, sal_Bool bSearchSpellEntry ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); return SearchDicList( this, rWord, LinguLocaleToLanguage( rLocale ), @@ -576,7 +576,7 @@ uno::Reference< XDictionaryEntry > SAL_CALL void SAL_CALL DicList::dispose() - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -624,7 +624,7 @@ void SAL_CALL void SAL_CALL DicList::addEventListener( const uno::Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -634,7 +634,7 @@ void SAL_CALL void SAL_CALL DicList::removeEventListener( const uno::Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -729,7 +729,7 @@ void DicList::SaveDics() // Service specific part -OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); @@ -737,13 +737,13 @@ OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException) sal_Bool SAL_CALL DicList::supportsService( const OUString& ServiceName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL DicList::getSupportedServiceNames( ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index 4f48bca7bd5b..2938e245ac80 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -95,30 +95,30 @@ public: virtual ~DicList(); // XDictionaryList - virtual ::sal_Int16 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > > SAL_CALL getDictionaries( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL addDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL removeDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL addDictionaryListEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryListEventListener >& xListener, ::sal_Bool bReceiveVerbose ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL removeDictionaryListEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryListEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL beginCollectEvents( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL endCollectEvents( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL flushEvents( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, ::com::sun::star::linguistic2::DictionaryType eDicType, const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Int16 SAL_CALL getCount( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > > SAL_CALL getDictionaries( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL addDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL removeDictionary( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary >& xDictionary ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL addDictionaryListEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryListEventListener >& xListener, ::sal_Bool bReceiveVerbose ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL removeDictionaryListEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryListEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL beginCollectEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL endCollectEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Int16 SAL_CALL flushEvents( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const ::com::sun::star::lang::Locale& aLocale, ::com::sun::star::linguistic2::DictionaryType eDicType, const OUString& aURL ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XSearchableDictionaryList - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); static inline OUString getImplementationName_Static() throw(); diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 230b6074e802..e96c9d042b7e 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -629,7 +629,7 @@ void GrammarCheckingIterator::DequeueAndCheck() void SAL_CALL GrammarCheckingIterator::startProofreading( const uno::Reference< ::uno::XInterface > & xDoc, const uno::Reference< text::XFlatParagraphIteratorProvider > & xIteratorProvider ) -throw (uno::RuntimeException, lang::IllegalArgumentException) +throw (uno::RuntimeException, lang::IllegalArgumentException, std::exception) { // get paragraph to start checking with const bool bAutomatic = true; @@ -659,7 +659,7 @@ linguistic2::ProofreadingResult SAL_CALL GrammarCheckingIterator::checkSentenceA sal_Int32 nStartOfSentencePos, sal_Int32 nSuggestedEndOfSentencePos, sal_Int32 nErrorPosInPara ) -throw (lang::IllegalArgumentException, uno::RuntimeException) +throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { (void) rLocale; @@ -781,7 +781,7 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence( void SAL_CALL GrammarCheckingIterator::resetIgnoreRules( ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { GCReferences_t::iterator aIt( m_aGCReferencesByService.begin() ); while (aIt != m_aGCReferencesByService.end()) @@ -796,7 +796,7 @@ throw (uno::RuntimeException) sal_Bool SAL_CALL GrammarCheckingIterator::isProofreading( const uno::Reference< uno::XInterface >& xDoc ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { // ---- THREAD SAFE START ---- ::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() ); @@ -842,7 +842,7 @@ throw (uno::RuntimeException) void SAL_CALL GrammarCheckingIterator::processLinguServiceEvent( const linguistic2::LinguServiceEvent& rLngSvcEvent ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { if (rLngSvcEvent.nEvent == linguistic2::LinguServiceEventFlags::PROOFREAD_AGAIN) { @@ -871,7 +871,7 @@ throw (uno::RuntimeException) sal_Bool SAL_CALL GrammarCheckingIterator::addLinguServiceEventListener( const uno::Reference< linguistic2::XLinguServiceEventListener >& xListener ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -883,7 +883,7 @@ throw (uno::RuntimeException) sal_Bool SAL_CALL GrammarCheckingIterator::removeLinguServiceEventListener( const uno::Reference< linguistic2::XLinguServiceEventListener >& xListener ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -894,7 +894,7 @@ throw (uno::RuntimeException) void SAL_CALL GrammarCheckingIterator::dispose() -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { lang::EventObject aEvt( (linguistic2::XProofreadingIterator *) this ); m_aEventListeners.disposeAndClear( aEvt ); @@ -923,7 +923,7 @@ throw (uno::RuntimeException) void SAL_CALL GrammarCheckingIterator::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -934,7 +934,7 @@ throw (uno::RuntimeException) void SAL_CALL GrammarCheckingIterator::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -944,7 +944,7 @@ throw (uno::RuntimeException) void SAL_CALL GrammarCheckingIterator::disposing( const lang::EventObject &rSource ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { // if the component (document) is disposing release all references //!! There is no need to remove entries from the queue that are from this document @@ -1047,19 +1047,19 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl() sal_Bool SAL_CALL GrammarCheckingIterator::supportsService( const OUString & rServiceName ) -throw(uno::RuntimeException) +throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } -OUString SAL_CALL GrammarCheckingIterator::getImplementationName( ) throw (uno::RuntimeException) +OUString SAL_CALL GrammarCheckingIterator::getImplementationName( ) throw (uno::RuntimeException, std::exception) { return GrammarCheckingIterator_getImplementationName(); } -uno::Sequence< OUString > SAL_CALL GrammarCheckingIterator::getSupportedServiceNames( ) throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL GrammarCheckingIterator::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) { return GrammarCheckingIterator_getSupportedServiceNames(); } diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index 650787146d50..0b7a4a89bfe3 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -154,30 +154,30 @@ public: virtual ~GrammarCheckingIterator(); // XProofreadingIterator - virtual void SAL_CALL startProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const ::com::sun::star::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL resetIgnoreRules( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL isProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL startProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const ::com::sun::star::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL resetIgnoreRules( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL isProofreading( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xDocument ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XLinguServiceEventListener - virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& aLngSvcEvent ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL processLinguServiceEvent( const ::com::sun::star::linguistic2::LinguServiceEvent& aLngSvcEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XLinguServiceEventBroadcaster - virtual ::sal_Bool SAL_CALL addLinguServiceEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL removeLinguServiceEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL addLinguServiceEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL removeLinguServiceEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // LinguDispatcher virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< OUString > &rSvcImplNames ); diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index c26353fb2f55..d7e3044af27b 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -98,7 +98,7 @@ HHConvDic::~HHConvDic() void SAL_CALL HHConvDic::addEntry( const OUString& aLeftText, const OUString& aRightText ) - throw (IllegalArgumentException, container::ElementExistException, RuntimeException) + throw (IllegalArgumentException, container::ElementExistException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -111,7 +111,7 @@ void SAL_CALL HHConvDic::addEntry( OUString SAL_CALL HHConvDic::getImplementationName( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); @@ -119,14 +119,14 @@ OUString SAL_CALL HHConvDic::getImplementationName( ) sal_Bool SAL_CALL HHConvDic::supportsService( const OUString& rServiceName ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL HHConvDic::getSupportedServiceNames( ) - throw (RuntimeException) + throw (RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index 9b6db28ff55c..affa217ac9df 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -43,12 +43,12 @@ public: virtual ~HHConvDic(); // XConversionDictionary - virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); static inline OUString diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 01d49a275348..f8770618eac9 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -245,7 +245,7 @@ Reference< XPossibleHyphens > HyphenatorDispatcher::buildPossHyphens( Sequence< Locale > SAL_CALL HyphenatorDispatcher::getLocales() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -261,7 +261,7 @@ Sequence< Locale > SAL_CALL HyphenatorDispatcher::getLocales() sal_Bool SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); HyphSvcByLangMap_t::const_iterator aIt( aSvcMap.find( LinguLocaleToLanguage( rLocale ) ) ); @@ -273,7 +273,7 @@ Reference< XHyphenatedWord > SAL_CALL HyphenatorDispatcher::hyphenate( const OUString& rWord, const Locale& rLocale, sal_Int16 nMaxLeading, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -410,7 +410,7 @@ Reference< XHyphenatedWord > SAL_CALL HyphenatorDispatcher::queryAlternativeSpelling( const OUString& rWord, const Locale& rLocale, sal_Int16 nIndex, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -542,7 +542,7 @@ Reference< XPossibleHyphens > SAL_CALL HyphenatorDispatcher::createPossibleHyphens( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index 390bd4483720..fdcfcbf0bc5a 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -94,10 +94,10 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XHyphenator virtual ::com::sun::star::uno::Reference< @@ -107,7 +107,7 @@ public: sal_Int16 nMaxLeading, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenatedWord > SAL_CALL queryAlternativeSpelling( const OUString& aWord, @@ -115,7 +115,7 @@ public: sal_Int16 nIndex, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XPossibleHyphens > SAL_CALL createPossibleHyphens( @@ -123,7 +123,7 @@ public: const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // LinguDispatcher virtual void diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index b2dfad2f7d1f..fe17634e29b2 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -71,7 +71,7 @@ HyphenatedWord::~HyphenatedWord() OUString SAL_CALL HyphenatedWord::getWord() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aWord; @@ -79,7 +79,7 @@ OUString SAL_CALL HyphenatedWord::getWord() Locale SAL_CALL HyphenatedWord::getLocale() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -88,7 +88,7 @@ Locale SAL_CALL HyphenatedWord::getLocale() sal_Int16 SAL_CALL HyphenatedWord::getHyphenationPos() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return nHyphenationPos; @@ -96,7 +96,7 @@ sal_Int16 SAL_CALL HyphenatedWord::getHyphenationPos() OUString SAL_CALL HyphenatedWord::getHyphenatedWord() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aHyphenatedWord; @@ -104,7 +104,7 @@ OUString SAL_CALL HyphenatedWord::getHyphenatedWord() sal_Int16 SAL_CALL HyphenatedWord::getHyphenPos() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return nHyphPos; @@ -112,7 +112,7 @@ sal_Int16 SAL_CALL HyphenatedWord::getHyphenPos() sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return bIsAltSpelling; @@ -138,7 +138,7 @@ PossibleHyphens::~PossibleHyphens() OUString SAL_CALL PossibleHyphens::getWord() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aWord; @@ -146,7 +146,7 @@ OUString SAL_CALL PossibleHyphens::getWord() Locale SAL_CALL PossibleHyphens::getLocale() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return LanguageTag::convertToLocale( nLanguage ); @@ -154,7 +154,7 @@ Locale SAL_CALL PossibleHyphens::getLocale() OUString SAL_CALL PossibleHyphens::getPossibleHyphens() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aWordWithHyphens; @@ -162,7 +162,7 @@ OUString SAL_CALL PossibleHyphens::getPossibleHyphens() Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aOrigHyphenPos; diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index 2b5a37ce03d8..c3d021061103 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -143,7 +143,7 @@ void FlushListener::SetPropSet( Reference< XLinguProperties > &rPS ) void SAL_CALL FlushListener::disposing( const EventObject& rSource ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -162,7 +162,7 @@ void SAL_CALL FlushListener::disposing( const EventObject& rSource ) void SAL_CALL FlushListener::processDictionaryListEvent( const DictionaryListEvent& rDicListEvent ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -185,7 +185,7 @@ void SAL_CALL FlushListener::processDictionaryListEvent( void SAL_CALL FlushListener::propertyChange( const PropertyChangeEvent& rEvt ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 7dbf3318f37d..036733d48130 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -222,7 +222,7 @@ Reference< XInterface > SAL_CALL LinguProps_CreateInstance( } Reference< XPropertySetInfo > SAL_CALL LinguProps::getPropertySetInfo() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -234,7 +234,7 @@ Reference< XPropertySetInfo > SAL_CALL LinguProps::getPropertySetInfo() void SAL_CALL LinguProps::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, RuntimeException) + IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -252,7 +252,7 @@ void SAL_CALL LinguProps::setPropertyValue( } Any SAL_CALL LinguProps::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -270,7 +270,7 @@ Any SAL_CALL LinguProps::getPropertyValue( const OUString& rPropertyName ) void SAL_CALL LinguProps::addPropertyChangeListener( const OUString& rPropertyName, const Reference< XPropertyChangeListener >& rxListener ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -285,7 +285,7 @@ void SAL_CALL LinguProps::addPropertyChangeListener( void SAL_CALL LinguProps::removePropertyChangeListener( const OUString& rPropertyName, const Reference< XPropertyChangeListener >& rxListener ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -300,21 +300,21 @@ void SAL_CALL LinguProps::removePropertyChangeListener( void SAL_CALL LinguProps::addVetoableChangeListener( const OUString& /*rPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL LinguProps::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const Reference< XVetoableChangeListener >& /*xListener*/ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL LinguProps::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, RuntimeException) + IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -329,7 +329,7 @@ void SAL_CALL LinguProps::setFastPropertyValue( sal_Int32 nHandle, const Any& rV Any SAL_CALL LinguProps::getFastPropertyValue( sal_Int32 nHandle ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException) + throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -340,7 +340,7 @@ Any SAL_CALL LinguProps::getFastPropertyValue( sal_Int32 nHandle ) Sequence< PropertyValue > SAL_CALL LinguProps::getPropertyValues() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -365,7 +365,7 @@ Sequence< PropertyValue > SAL_CALL void SAL_CALL LinguProps::setPropertyValues( const Sequence< PropertyValue >& rProps ) throw(UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, RuntimeException) + IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -380,7 +380,7 @@ void SAL_CALL void SAL_CALL LinguProps::dispose() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -400,7 +400,7 @@ void SAL_CALL void SAL_CALL LinguProps::addEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -410,7 +410,7 @@ void SAL_CALL void SAL_CALL LinguProps::removeEventListener( const Reference< XEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -423,7 +423,7 @@ void SAL_CALL // XServiceInfo OUString SAL_CALL LinguProps::getImplementationName() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); @@ -431,14 +431,14 @@ OUString SAL_CALL LinguProps::getImplementationName() // XServiceInfo sal_Bool SAL_CALL LinguProps::supportsService( const OUString& ServiceName ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } // XServiceInfo uno::Sequence< OUString > SAL_CALL LinguProps::getSupportedServiceNames() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index e44046832058..54dd78224181 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -122,97 +122,97 @@ class LinguProps : public: LinguProps(); - virtual sal_Bool SAL_CALL getIsUseDictionaryList() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsUseDictionaryList() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_USE_DICTIONARY_LIST); } - virtual void SAL_CALL setIsUseDictionaryList(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsUseDictionaryList(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_USE_DICTIONARY_LIST, p1); } - virtual sal_Bool SAL_CALL getIsIgnoreControlCharacters() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsIgnoreControlCharacters() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_IGNORE_CONTROL_CHARACTERS); } - virtual void SAL_CALL setIsIgnoreControlCharacters(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsIgnoreControlCharacters(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_IGNORE_CONTROL_CHARACTERS, p1); } - virtual sal_Bool SAL_CALL getIsSpellUpperCase() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsSpellUpperCase() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_SPELL_UPPER_CASE); } - virtual void SAL_CALL setIsSpellUpperCase(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsSpellUpperCase(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_SPELL_UPPER_CASE, p1); } - virtual sal_Bool SAL_CALL getIsSpellWithDigits() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsSpellWithDigits() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_SPELL_WITH_DIGITS); } - virtual void SAL_CALL setIsSpellWithDigits(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsSpellWithDigits(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_SPELL_WITH_DIGITS, p1); } - virtual sal_Bool SAL_CALL getIsSpellCapitalization() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsSpellCapitalization() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_SPELL_CAPITALIZATION); } - virtual void SAL_CALL setIsSpellCapitalization(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsSpellCapitalization(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_SPELL_CAPITALIZATION, p1); } - virtual sal_Int16 SAL_CALL getHyphMinLeading() throw (css::uno::RuntimeException) + virtual sal_Int16 SAL_CALL getHyphMinLeading() throw (css::uno::RuntimeException, std::exception) { return getPropertyInt16(UPN_HYPH_MIN_LEADING); } - virtual void SAL_CALL setHyphMinLeading(sal_Int16 p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setHyphMinLeading(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_HYPH_MIN_LEADING, p1); } - virtual sal_Int16 SAL_CALL getHyphMinTrailing() throw (css::uno::RuntimeException) + virtual sal_Int16 SAL_CALL getHyphMinTrailing() throw (css::uno::RuntimeException, std::exception) { return getPropertyInt16(UPN_HYPH_MIN_TRAILING); } - virtual void SAL_CALL setHyphMinTrailing(sal_Int16 p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setHyphMinTrailing(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_HYPH_MIN_TRAILING, p1); } - virtual sal_Int16 SAL_CALL getHyphMinWordLength() throw (css::uno::RuntimeException) + virtual sal_Int16 SAL_CALL getHyphMinWordLength() throw (css::uno::RuntimeException, std::exception) { return getPropertyInt16(UPN_HYPH_MIN_WORD_LENGTH); } - virtual void SAL_CALL setHyphMinWordLength(sal_Int16 p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setHyphMinWordLength(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_HYPH_MIN_WORD_LENGTH, p1); } - virtual com::sun::star::lang::Locale SAL_CALL getDefaultLocale() throw (css::uno::RuntimeException) + virtual com::sun::star::lang::Locale SAL_CALL getDefaultLocale() throw (css::uno::RuntimeException, std::exception) { return getPropertyLocale(UPN_DEFAULT_LOCALE); } - virtual void SAL_CALL setDefaultLocale(const com::sun::star::lang::Locale& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setDefaultLocale(const com::sun::star::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_DEFAULT_LOCALE, p1); } - virtual sal_Bool SAL_CALL getIsHyphAuto() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsHyphAuto() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_HYPH_AUTO); } - virtual void SAL_CALL setIsHyphAuto(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsHyphAuto(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_HYPH_AUTO, p1); } - virtual sal_Bool SAL_CALL getIsHyphSpecial() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsHyphSpecial() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_HYPH_SPECIAL); } - virtual void SAL_CALL setIsHyphSpecial(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsHyphSpecial(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_HYPH_SPECIAL, p1); } - virtual sal_Bool SAL_CALL getIsSpellAuto() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsSpellAuto() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_SPELL_AUTO); } - virtual void SAL_CALL setIsSpellAuto(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsSpellAuto(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_SPELL_AUTO, p1); } - virtual sal_Bool SAL_CALL getIsSpellSpecial() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsSpellSpecial() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_SPELL_SPECIAL); } - virtual void SAL_CALL setIsSpellSpecial(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsSpellSpecial(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_SPELL_SPECIAL, p1); } - virtual sal_Bool SAL_CALL getIsWrapReverse() throw (css::uno::RuntimeException) + virtual sal_Bool SAL_CALL getIsWrapReverse() throw (css::uno::RuntimeException, std::exception) { return getPropertyBool(UPN_IS_WRAP_REVERSE); } - virtual void SAL_CALL setIsWrapReverse(sal_Bool p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setIsWrapReverse(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_IS_WRAP_REVERSE, p1); } - virtual com::sun::star::lang::Locale SAL_CALL getDefaultLocale_CJK() throw (css::uno::RuntimeException) + virtual com::sun::star::lang::Locale SAL_CALL getDefaultLocale_CJK() throw (css::uno::RuntimeException, std::exception) { return getPropertyLocale(UPN_DEFAULT_LOCALE_CJK); } - virtual void SAL_CALL setDefaultLocale_CJK(const com::sun::star::lang::Locale& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setDefaultLocale_CJK(const com::sun::star::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_DEFAULT_LOCALE_CJK, p1); } - virtual css::lang::Locale SAL_CALL getDefaultLocale_CTL() throw (css::uno::RuntimeException) + virtual css::lang::Locale SAL_CALL getDefaultLocale_CTL() throw (css::uno::RuntimeException, std::exception) { return getPropertyLocale(UPN_DEFAULT_LOCALE_CTL); } - virtual void SAL_CALL setDefaultLocale_CTL(const com::sun::star::lang::Locale& p1) throw (css::uno::RuntimeException) + virtual void SAL_CALL setDefaultLocale_CTL(const com::sun::star::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) { setProperty(UPN_DEFAULT_LOCALE_CTL, p1); } // XPropertySet - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XFastPropertySet - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XPropertyAccess - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProps ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& rxListener ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException, std::exception); static inline OUString getImplementationName_Static() throw(); diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 44ebd68e4e38..d11b9e687c4f 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -237,7 +237,7 @@ sal_Bool PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt void SAL_CALL PropertyChgHelper::propertyChange( const PropertyChangeEvent& rEvt ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); propertyChange_Impl( rEvt ); @@ -286,7 +286,7 @@ void PropertyChgHelper::LaunchEvent( const LinguServiceEvent &rEvt ) void SAL_CALL PropertyChgHelper::disposing( const EventObject& rSource ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); if (rSource.Source == xPropSet) @@ -301,7 +301,7 @@ void SAL_CALL PropertyChgHelper::disposing( const EventObject& rSource ) sal_Bool SAL_CALL PropertyChgHelper::addLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -318,7 +318,7 @@ sal_Bool SAL_CALL sal_Bool SAL_CALL PropertyChgHelper::removeLinguServiceEventListener( const Reference< XLinguServiceEventListener >& rxListener ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -350,7 +350,7 @@ PropertyHelper_Thes::~PropertyHelper_Thes() void SAL_CALL PropertyHelper_Thes::propertyChange( const PropertyChangeEvent& rEvt ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); PropertyChgHelper::propertyChange_Impl( rEvt ); @@ -496,7 +496,7 @@ sal_Bool PropertyHelper_Spell::propertyChange_Impl( const PropertyChangeEvent& r void SAL_CALL PropertyHelper_Spell::propertyChange( const PropertyChangeEvent& rEvt ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); propertyChange_Impl( rEvt ); @@ -658,7 +658,7 @@ sal_Bool PropertyHelper_Hyphen::propertyChange_Impl( const PropertyChangeEvent& void SAL_CALL PropertyHelper_Hyphen::propertyChange( const PropertyChangeEvent& rEvt ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); propertyChange_Impl( rEvt ); diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 6b1579679659..041cea75a305 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -203,18 +203,18 @@ public: // lang::XEventListener virtual void SAL_CALL disposing( const lang::EventObject& rSource ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // linguistic2::XLinguServiceEventListener virtual void SAL_CALL processLinguServiceEvent( const linguistic2::LinguServiceEvent& aLngSvcEvent ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); // linguistic2::XDictionaryListEventListener virtual void SAL_CALL processDictionaryListEvent( const linguistic2::DictionaryListEvent& rDicListEvent ) - throw(uno::RuntimeException); + throw(uno::RuntimeException, std::exception); inline sal_Bool AddLngSvcMgrListener( const uno::Reference< lang::XEventListener >& rxListener ); @@ -249,7 +249,7 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper( void SAL_CALL LngSvcMgrListenerHelper::disposing( const lang::EventObject& rSource ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -301,7 +301,7 @@ void LngSvcMgrListenerHelper::AddLngSvcEvt( sal_Int16 nLngSvcEvt ) void SAL_CALL LngSvcMgrListenerHelper::processLinguServiceEvent( const linguistic2::LinguServiceEvent& rLngSvcEvent ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); AddLngSvcEvt( rLngSvcEvent.nEvent ); @@ -311,7 +311,7 @@ void SAL_CALL void SAL_CALL LngSvcMgrListenerHelper::processDictionaryListEvent( const linguistic2::DictionaryListEvent& rDicListEvent ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -502,7 +502,7 @@ LngSvcMgr::LngSvcMgr() // ::com::sun::star::util::XModifyListener void LngSvcMgr::modified(const lang::EventObject&) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard(GetLinguMutex()); //assume that if an extension has been added/removed that @@ -559,7 +559,7 @@ void LngSvcMgr::stopListening() } void LngSvcMgr::disposing(const lang::EventObject&) - throw (uno::RuntimeException) + throw (uno::RuntimeException, std::exception) { stopListening(); } @@ -1461,7 +1461,7 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp ) uno::Reference< linguistic2::XSpellChecker > SAL_CALL LngSvcMgr::getSpellChecker() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); #if OSL_DEBUG_LEVEL > 1 @@ -1481,7 +1481,7 @@ uno::Reference< linguistic2::XSpellChecker > SAL_CALL uno::Reference< linguistic2::XHyphenator > SAL_CALL LngSvcMgr::getHyphenator() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); #if OSL_DEBUG_LEVEL > 1 @@ -1501,7 +1501,7 @@ uno::Reference< linguistic2::XHyphenator > SAL_CALL uno::Reference< linguistic2::XThesaurus > SAL_CALL LngSvcMgr::getThesaurus() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); #if OSL_DEBUG_LEVEL > 1 @@ -1522,7 +1522,7 @@ uno::Reference< linguistic2::XThesaurus > SAL_CALL sal_Bool SAL_CALL LngSvcMgr::addLinguServiceManagerListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -1540,7 +1540,7 @@ sal_Bool SAL_CALL sal_Bool SAL_CALL LngSvcMgr::removeLinguServiceManagerListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -1620,7 +1620,7 @@ uno::Sequence< OUString > SAL_CALL uno::Sequence< lang::Locale > SAL_CALL LngSvcMgr::getAvailableLocales( const OUString& rServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -1675,7 +1675,7 @@ void SAL_CALL const OUString& rServiceName, const lang::Locale& rLocale, const uno::Sequence< OUString >& rServiceImplNames ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { SAL_INFO( "linguistic", "linguistic: LngSvcMgr::setConfiguredServices" ); @@ -1917,7 +1917,7 @@ uno::Sequence< OUString > SAL_CALL LngSvcMgr::getConfiguredServices( const OUString& rServiceName, const lang::Locale& rLocale ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -1999,7 +1999,7 @@ uno::Sequence< OUString > SAL_CALL void SAL_CALL LngSvcMgr::dispose() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -2020,7 +2020,7 @@ void SAL_CALL void SAL_CALL LngSvcMgr::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -2034,7 +2034,7 @@ void SAL_CALL void SAL_CALL LngSvcMgr::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); @@ -2061,7 +2061,7 @@ sal_Bool LngSvcMgr::AddLngSvcEvtBroadcaster( OUString SAL_CALL LngSvcMgr::getImplementationName() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); return getImplementationName_Static(); @@ -2070,7 +2070,7 @@ OUString SAL_CALL sal_Bool SAL_CALL LngSvcMgr::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } @@ -2078,7 +2078,7 @@ sal_Bool SAL_CALL uno::Sequence< OUString > SAL_CALL LngSvcMgr::getSupportedServiceNames() - throw(uno::RuntimeException) + throw(uno::RuntimeException, std::exception) { osl::MutexGuard aGuard( GetLinguMutex() ); return getSupportedServiceNames_Static(); diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 14e7b9738f86..772513e75308 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -145,35 +145,35 @@ public: virtual ~LngSvcMgr(); // XLinguServiceManager - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker > SAL_CALL getSpellChecker( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > SAL_CALL getHyphenator( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > SAL_CALL getThesaurus( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL addLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL removeLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker > SAL_CALL getSpellChecker( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > SAL_CALL getHyphenator( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > SAL_CALL getThesaurus( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL addLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL removeLinguServiceManagerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException, std::exception); - virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::uno::Sequence< OUString >& aServiceImplNames ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::uno::Sequence< OUString >& aServiceImplNames ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const ::com::sun::star::lang::Locale& aLocale ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XAvailableLocales - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XComponent - virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& rSource ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XModifyListener - virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& rEvent ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL modified( const ::com::sun::star::lang::EventObject& rEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception); static inline OUString getImplementationName_Static(); static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static() throw(); diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index d60ec3dbaa35..b56b0cb9987e 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -787,7 +787,7 @@ void AppExitListener::Deactivate() void SAL_CALL AppExitListener::disposing( const EventObject& rEvtSource ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -799,13 +799,13 @@ void SAL_CALL void SAL_CALL AppExitListener::queryTermination( const EventObject& /*rEvtSource*/ ) - throw(frame::TerminationVetoException, RuntimeException) + throw(frame::TerminationVetoException, RuntimeException, std::exception) { } void SAL_CALL AppExitListener::notifyTermination( const EventObject& rEvtSource ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 6435832fc764..0c892f38c20a 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -200,7 +200,7 @@ void SpellCheckerDispatcher::ClearSvcList() Sequence< Locale > SAL_CALL SpellCheckerDispatcher::getLocales() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -216,7 +216,7 @@ Sequence< Locale > SAL_CALL SpellCheckerDispatcher::getLocales() sal_Bool SAL_CALL SpellCheckerDispatcher::hasLocale( const Locale& rLocale ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); SpellSvcByLangMap_t::const_iterator aIt( aSvcMap.find( LinguLocaleToLanguage( rLocale ) ) ); @@ -227,7 +227,7 @@ sal_Bool SAL_CALL SpellCheckerDispatcher::hasLocale( const Locale& rLocale ) sal_Bool SAL_CALL SpellCheckerDispatcher::isValid( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return isValid_Impl( rWord, LinguLocaleToLanguage( rLocale ), rProperties, sal_True ); @@ -237,7 +237,7 @@ sal_Bool SAL_CALL Reference< XSpellAlternatives > SAL_CALL SpellCheckerDispatcher::spell( const OUString& rWord, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return spell_Impl( rWord, LinguLocaleToLanguage( rLocale ), rProperties, sal_True ); @@ -714,7 +714,7 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl( } uno::Sequence< sal_Int16 > SAL_CALL SpellCheckerDispatcher::getLanguages( ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); uno::Sequence< Locale > aTmp( getLocales() ); @@ -725,7 +725,7 @@ throw (uno::RuntimeException) sal_Bool SAL_CALL SpellCheckerDispatcher::hasLanguage( sal_Int16 nLanguage ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return hasLocale( LanguageTag::convertToLocale( nLanguage) ); @@ -736,7 +736,7 @@ sal_Bool SAL_CALL SpellCheckerDispatcher::isValid( const OUString& rWord, sal_Int16 nLanguage, const uno::Sequence< beans::PropertyValue >& rProperties ) -throw (lang::IllegalArgumentException, uno::RuntimeException) +throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return isValid( rWord, LanguageTag::convertToLocale( nLanguage ), rProperties); @@ -747,7 +747,7 @@ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL SpellCheckerDispatche const OUString& rWord, sal_Int16 nLanguage, const uno::Sequence< beans::PropertyValue >& rProperties ) -throw (lang::IllegalArgumentException, uno::RuntimeException) +throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return spell( rWord, LanguageTag::convertToLocale( nLanguage), rProperties); diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 1c95e8d43f3a..025d422b053c 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -99,20 +99,20 @@ public: virtual ~SpellCheckerDispatcher(); // XSupportedLocales (for XSpellChecker) - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales() throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales() throw(::com::sun::star::uno::RuntimeException, std::exception); + virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) throw(::com::sun::star::uno::RuntimeException, std::exception); // XSpellChecker - virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // XSupportedLanguages - virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages( ) throw (::com::sun::star::uno::RuntimeException, std::exception); + virtual ::sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) throw (::com::sun::star::uno::RuntimeException, std::exception); // XSpellChecker1 - virtual ::sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, ::sal_Int16 nLanguage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception); // LinguDispatcher virtual void SetServiceList( const ::com::sun::star::lang::Locale &rLocale, const ::com::sun::star::uno::Sequence< OUString > &rSvcImplNames ); diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index 1d07dc1ba412..d895bcb9fa90 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -201,7 +201,7 @@ SpellAlternatives::~SpellAlternatives() OUString SAL_CALL SpellAlternatives::getWord() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aWord; @@ -209,7 +209,7 @@ OUString SAL_CALL SpellAlternatives::getWord() Locale SAL_CALL SpellAlternatives::getLocale() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return LanguageTag::convertToLocale( nLanguage ); @@ -217,7 +217,7 @@ Locale SAL_CALL SpellAlternatives::getLocale() sal_Int16 SAL_CALL SpellAlternatives::getFailureType() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return nType; @@ -225,7 +225,7 @@ sal_Int16 SAL_CALL SpellAlternatives::getFailureType() sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return (sal_Int16) aAlt.getLength(); @@ -233,7 +233,7 @@ sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount() Sequence< OUString > SAL_CALL SpellAlternatives::getAlternatives() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); return aAlt; @@ -241,7 +241,7 @@ Sequence< OUString > SAL_CALL SpellAlternatives::getAlternatives() void SAL_CALL SpellAlternatives::setAlternatives( const uno::Sequence< OUString >& rAlternatives ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); aAlt = rAlternatives; @@ -249,7 +249,7 @@ throw (uno::RuntimeException) void SAL_CALL SpellAlternatives::setFailureType( sal_Int16 nFailureType ) -throw (uno::RuntimeException) +throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); nType = nFailureType; diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 44f5fa95e051..664216cd6ceb 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -80,7 +80,7 @@ void ThesaurusDispatcher::ClearSvcList() Sequence< Locale > SAL_CALL ThesaurusDispatcher::getLocales() - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); @@ -97,7 +97,7 @@ Sequence< Locale > SAL_CALL sal_Bool SAL_CALL ThesaurusDispatcher::hasLocale( const Locale& rLocale ) - throw(RuntimeException) + throw(RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); ThesSvcByLangMap_t::const_iterator aIt( aSvcMap.find( LinguLocaleToLanguage( rLocale ) ) ); @@ -109,7 +109,7 @@ Sequence< Reference< XMeaning > > SAL_CALL ThesaurusDispatcher::queryMeanings( const OUString& rTerm, const Locale& rLocale, const PropertyValues& rProperties ) - throw(IllegalArgumentException, RuntimeException) + throw(IllegalArgumentException, RuntimeException, std::exception) { MutexGuard aGuard( GetLinguMutex() ); diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx index 1f9e8973df9d..50e04d0b940e 100644 --- a/linguistic/source/thesdsp.hxx +++ b/linguistic/source/thesdsp.hxx @@ -77,10 +77,10 @@ public: virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getLocales() - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); virtual sal_Bool SAL_CALL hasLocale( const ::com::sun::star::lang::Locale& aLocale ) - throw(::com::sun::star::uno::RuntimeException); + throw(::com::sun::star::uno::RuntimeException, std::exception); // XThesaurus virtual ::com::sun::star::uno::Sequence< @@ -90,7 +90,7 @@ public: const ::com::sun::star::lang::Locale& aLocale, const ::com::sun::star::beans::PropertyValues& aProperties ) throw(::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::RuntimeException, std::exception); // LinguDispatcher virtual void |