summaryrefslogtreecommitdiff
path: root/linguistic
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /linguistic
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'linguistic')
-rw-r--r--linguistic/inc/iprcache.hxx6
-rw-r--r--linguistic/source/convdic.cxx19
-rw-r--r--linguistic/source/convdic.hxx38
-rw-r--r--linguistic/source/convdiclist.cxx36
-rw-r--r--linguistic/source/convdiclist.hxx20
-rw-r--r--linguistic/source/convdicxml.cxx1
-rw-r--r--linguistic/source/convdicxml.hxx2
-rw-r--r--linguistic/source/dicimp.cxx26
-rw-r--r--linguistic/source/dicimp.hxx78
-rw-r--r--linguistic/source/dlistimp.cxx32
-rw-r--r--linguistic/source/dlistimp.hxx36
-rw-r--r--linguistic/source/gciterator.cxx17
-rw-r--r--linguistic/source/gciterator.hxx28
-rw-r--r--linguistic/source/hhconvdic.cxx6
-rw-r--r--linguistic/source/hhconvdic.hxx8
-rw-r--r--linguistic/source/hyphdsp.cxx5
-rw-r--r--linguistic/source/hyphdsp.hxx18
-rw-r--r--linguistic/source/hyphdta.cxx10
-rw-r--r--linguistic/source/iprcache.cxx3
-rw-r--r--linguistic/source/lngopt.cxx27
-rw-r--r--linguistic/source/lngopt.hxx110
-rw-r--r--linguistic/source/lngprophelp.cxx11
-rw-r--r--linguistic/source/lngsvcmgr.cxx31
-rw-r--r--linguistic/source/lngsvcmgr.hxx36
-rw-r--r--linguistic/source/misc.cxx3
-rw-r--r--linguistic/source/spelldsp.cxx10
-rw-r--r--linguistic/source/spelldsp.hxx22
-rw-r--r--linguistic/source/spelldta.cxx7
-rw-r--r--linguistic/source/thesdsp.cxx3
-rw-r--r--linguistic/source/thesdsp.hxx10
30 files changed, 210 insertions, 449 deletions
diff --git a/linguistic/inc/iprcache.hxx b/linguistic/inc/iprcache.hxx
index 390ceda80d9f..da467b3468f1 100644
--- a/linguistic/inc/iprcache.hxx
+++ b/linguistic/inc/iprcache.hxx
@@ -63,13 +63,13 @@ public:
void SetPropSet( css::uno::Reference< css::linguistic2::XLinguProperties > &rPS );
//XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) override;
// XDictionaryListEventListener
- virtual void SAL_CALL processDictionaryListEvent( const css::linguistic2::DictionaryListEvent& rDicListEvent ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL processDictionaryListEvent( const css::linguistic2::DictionaryListEvent& rDicListEvent ) override;
// XPropertyChangeListener
- virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvt ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvt ) override;
};
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index 73953556b0fe..c140bb1bd957 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -344,7 +344,6 @@ void ConvDic::RemoveEntry( const OUString &rLeftText, const OUString &rRightText
OUString SAL_CALL ConvDic::getName( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aName;
@@ -352,7 +351,6 @@ OUString SAL_CALL ConvDic::getName( )
Locale SAL_CALL ConvDic::getLocale( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return LanguageTag::convertToLocale( nLanguage );
@@ -360,7 +358,6 @@ Locale SAL_CALL ConvDic::getLocale( )
sal_Int16 SAL_CALL ConvDic::getConversionType( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return nConversionType;
@@ -368,7 +365,6 @@ sal_Int16 SAL_CALL ConvDic::getConversionType( )
void SAL_CALL ConvDic::setActive( sal_Bool bActivate )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
bIsActive = bActivate;
@@ -376,7 +372,6 @@ void SAL_CALL ConvDic::setActive( sal_Bool bActivate )
sal_Bool SAL_CALL ConvDic::isActive( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return bIsActive;
@@ -384,7 +379,6 @@ sal_Bool SAL_CALL ConvDic::isActive( )
void SAL_CALL ConvDic::clear( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
aFromLeft .clear();
@@ -404,7 +398,6 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversions(
sal_Int32 nLength,
ConversionDirection eDirection,
sal_Int32 /*nTextConversionOptions*/ )
- throw (IllegalArgumentException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -455,7 +448,6 @@ static bool lcl_SeqHasEntry(
uno::Sequence< OUString > SAL_CALL ConvDic::getConversionEntries(
ConversionDirection eDirection )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -491,7 +483,6 @@ uno::Sequence< OUString > SAL_CALL ConvDic::getConversionEntries(
void SAL_CALL ConvDic::addEntry(
const OUString& aLeftText,
const OUString& aRightText )
- throw (IllegalArgumentException, container::ElementExistException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
if (bNeedEntries)
@@ -505,7 +496,6 @@ void SAL_CALL ConvDic::addEntry(
void SAL_CALL ConvDic::removeEntry(
const OUString& aLeftText,
const OUString& aRightText )
- throw (container::NoSuchElementException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
if (bNeedEntries)
@@ -517,7 +507,6 @@ void SAL_CALL ConvDic::removeEntry(
sal_Int16 SAL_CALL ConvDic::getMaxCharCount( ConversionDirection eDirection )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -568,7 +557,6 @@ void SAL_CALL ConvDic::setPropertyType(
const OUString& rLeftText,
const OUString& rRightText,
sal_Int16 nPropertyType )
- throw (container::NoSuchElementException, IllegalArgumentException, RuntimeException, std::exception)
{
bool bHasElement = HasEntry( rLeftText, rRightText);
if (!bHasElement)
@@ -585,7 +573,6 @@ void SAL_CALL ConvDic::setPropertyType(
sal_Int16 SAL_CALL ConvDic::getPropertyType(
const OUString& rLeftText,
const OUString& rRightText )
- throw (container::NoSuchElementException, RuntimeException, std::exception)
{
bool bHasElement = HasEntry( rLeftText, rRightText);
if (!bHasElement)
@@ -605,7 +592,6 @@ sal_Int16 SAL_CALL ConvDic::getPropertyType(
void SAL_CALL ConvDic::flush( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -623,7 +609,6 @@ void SAL_CALL ConvDic::flush( )
void SAL_CALL ConvDic::addFlushListener(
const uno::Reference< util::XFlushListener >& rxListener )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
if (rxListener.is())
@@ -633,7 +618,6 @@ void SAL_CALL ConvDic::addFlushListener(
void SAL_CALL ConvDic::removeFlushListener(
const uno::Reference< util::XFlushListener >& rxListener )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
if (rxListener.is())
@@ -642,19 +626,16 @@ void SAL_CALL ConvDic::removeFlushListener(
OUString SAL_CALL ConvDic::getImplementationName( )
- throw (RuntimeException, std::exception)
{
return OUString( "com.sun.star.lingu2.ConvDic" );
}
sal_Bool SAL_CALL ConvDic::supportsService( const OUString& rServiceName )
- throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
uno::Sequence< OUString > SAL_CALL ConvDic::getSupportedServiceNames( )
- throw (RuntimeException, std::exception)
{
return { SN_CONV_DICTIONARY };
}
diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx
index e5d28b2a9489..950df21b8099 100644
--- a/linguistic/source/convdic.hxx
+++ b/linguistic/source/convdic.hxx
@@ -96,31 +96,31 @@ public:
virtual ~ConvDic() override;
// XConversionDictionary
- virtual OUString SAL_CALL getName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getConversionType( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setActive( sal_Bool bActivate ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isActive( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL clear( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getConversionEntries( css::linguistic2::ConversionDirection eDirection ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getMaxCharCount( css::linguistic2::ConversionDirection eDirection ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getName( ) override;
+ virtual css::lang::Locale SAL_CALL getLocale( ) override;
+ virtual sal_Int16 SAL_CALL getConversionType( ) override;
+ virtual void SAL_CALL setActive( sal_Bool bActivate ) override;
+ virtual sal_Bool SAL_CALL isActive( ) override;
+ virtual void SAL_CALL clear( ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getConversionEntries( css::linguistic2::ConversionDirection eDirection ) override;
+ virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) override;
+ virtual void SAL_CALL removeEntry( const OUString& aLeftText, const OUString& aRightText ) override;
+ virtual sal_Int16 SAL_CALL getMaxCharCount( css::linguistic2::ConversionDirection eDirection ) override;
// XConversionPropertyType
- virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) throw (css::container::NoSuchElementException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyType( const OUString& aLeftText, const OUString& aRightText, ::sal_Int16 nPropertyType ) override;
+ virtual ::sal_Int16 SAL_CALL getPropertyType( const OUString& aLeftText, const OUString& aRightText ) override;
// XFlushable
- virtual void SAL_CALL flush( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL flush( ) override;
+ virtual void SAL_CALL addFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override;
+ virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& l ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
bool HasEntry( const OUString &rLeftText, const OUString &rRightText );
void AddEntry( const OUString &rLeftText, const OUString &rRightText );
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 7bc413ca7559..3aecf316ec40 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -88,20 +88,20 @@ public:
ConvDicNameContainer& operator=(const ConvDicNameContainer&) = delete;
// XElementAccess
- virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) override;
+ virtual sal_Bool SAL_CALL hasElements( ) override;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeByName( const OUString& Name ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+ virtual void SAL_CALL removeByName( const OUString& Name ) override;
// looks for conversion dictionaries with the specified extension
// in the directory and adds them to the container
@@ -167,21 +167,18 @@ uno::Reference< XConversionDictionary > ConvDicNameContainer::GetByName(
}
uno::Type SAL_CALL ConvDicNameContainer::getElementType( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return uno::Type( cppu::UnoType<XConversionDictionary>::get());
}
sal_Bool SAL_CALL ConvDicNameContainer::hasElements( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return !aConvDics.empty();
}
uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName )
- throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
uno::Reference< XConversionDictionary > xRes( GetByName( rName ) );
@@ -191,7 +188,6 @@ uno::Any SAL_CALL ConvDicNameContainer::getByName( const OUString& rName )
}
uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -204,7 +200,6 @@ uno::Sequence< OUString > SAL_CALL ConvDicNameContainer::getElementNames( )
}
sal_Bool SAL_CALL ConvDicNameContainer::hasByName( const OUString& rName )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return GetByName( rName ).is();
@@ -213,7 +208,6 @@ 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, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -230,7 +224,6 @@ void SAL_CALL ConvDicNameContainer::replaceByName(
void SAL_CALL ConvDicNameContainer::insertByName(
const OUString& rName,
const Any& rElement )
- throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -245,7 +238,6 @@ void SAL_CALL ConvDicNameContainer::insertByName(
}
void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName )
- throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -405,7 +397,7 @@ ConvDicNameContainer & ConvDicList::GetNameContainer()
return *mxNameContainer;
}
-uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryContainer( ) throw (RuntimeException, std::exception)
+uno::Reference< container::XNameContainer > SAL_CALL ConvDicList::getDictionaryContainer( )
{
MutexGuard aGuard( GetLinguMutex() );
GetNameContainer();
@@ -417,7 +409,6 @@ uno::Reference< XConversionDictionary > SAL_CALL ConvDicList::addNewDictionary(
const OUString& rName,
const Locale& rLocale,
sal_Int16 nConvDicType )
- throw (NoSupportException, ElementExistException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -457,7 +448,6 @@ uno::Sequence< OUString > SAL_CALL ConvDicList::queryConversions(
sal_Int16 nConversionDictionaryType,
ConversionDirection eDirection,
sal_Int32 nTextConversionOptions )
- throw (IllegalArgumentException, NoSupportException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -496,7 +486,6 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount(
const Locale& rLocale,
sal_Int16 nConversionDictionaryType,
ConversionDirection eDirection )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -519,7 +508,6 @@ sal_Int16 SAL_CALL ConvDicList::queryMaxCharCount(
}
void SAL_CALL ConvDicList::dispose( )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
if (!bDisposing)
@@ -534,7 +522,6 @@ void SAL_CALL ConvDicList::dispose( )
void SAL_CALL ConvDicList::addEventListener(
const uno::Reference< XEventListener >& rxListener )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
if (!bDisposing && rxListener.is())
@@ -543,7 +530,6 @@ void SAL_CALL ConvDicList::addEventListener(
void SAL_CALL ConvDicList::removeEventListener(
const uno::Reference< XEventListener >& rxListener )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
if (!bDisposing && rxListener.is())
@@ -551,19 +537,16 @@ void SAL_CALL ConvDicList::removeEventListener(
}
OUString SAL_CALL ConvDicList::getImplementationName()
- throw (RuntimeException, std::exception)
{
return getImplementationName_Static();
}
sal_Bool SAL_CALL ConvDicList::supportsService( const OUString& rServiceName )
- throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
uno::Sequence< OUString > SAL_CALL ConvDicList::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return getSupportedServiceNames_Static();
}
@@ -578,7 +561,6 @@ uno::Sequence< OUString > ConvDicList::getSupportedServiceNames_Static()
/// @throws css::uno::Exception
uno::Reference< uno::XInterface > SAL_CALL ConvDicList_CreateInstance(
const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ )
- throw(Exception)
{
return StaticConvDicList::get();
}
diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx
index 98af26e1b431..c11e60cb331a 100644
--- a/linguistic/source/convdiclist.hxx
+++ b/linguistic/source/convdiclist.hxx
@@ -67,20 +67,20 @@ public:
virtual ~ConvDicList() override;
// XConversionDictionaryList
- virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getDictionaryContainer( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) throw (css::lang::NoSupportException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) throw (css::lang::IllegalArgumentException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL queryMaxCharCount( const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getDictionaryContainer( ) override;
+ virtual css::uno::Reference< css::linguistic2::XConversionDictionary > SAL_CALL addNewDictionary( const OUString& aName, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL queryConversions( const OUString& aText, sal_Int32 nStartPos, sal_Int32 nLength, const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection, sal_Int32 nTextConversionOptions ) override;
+ virtual sal_Int16 SAL_CALL queryMaxCharCount( const css::lang::Locale& aLocale, sal_Int16 nConversionDictionaryType, css::linguistic2::ConversionDirection eDirection ) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose( ) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
static inline OUString
diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx
index 3f364e1a32d2..36bf36679c30 100644
--- a/linguistic/source/convdicxml.cxx
+++ b/linguistic/source/convdicxml.cxx
@@ -370,7 +370,6 @@ void ConvDicXMLExport::ExportContent_()
}
void SAL_CALL ConvDicXMLImport::startDocument()
- throw( xml::sax::SAXException, uno::RuntimeException, std::exception )
{
// register namespace at first possible opportunity
GetNamespaceMap().Add( "tcd",
diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx
index 3dd3182fcbe5..c806e1b9f9c7 100644
--- a/linguistic/source/convdicxml.hxx
+++ b/linguistic/source/convdicxml.hxx
@@ -86,7 +86,7 @@ public:
nConversionType = -1;
}
- virtual void SAL_CALL startDocument() throw( css::xml::sax::SAXException, css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL startDocument() override;
virtual SvXMLImportContext * CreateContext(
sal_uInt16 nPrefix, const OUString &rLocalName,
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 96d3cb00a4c9..ad76249b8280 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -678,14 +678,12 @@ bool DictionaryNeo::addEntry_Impl(const uno::Reference< XDictionaryEntry >& xDic
}
OUString SAL_CALL DictionaryNeo::getName( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aDicName;
}
void SAL_CALL DictionaryNeo::setName( const OUString& aName )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -697,7 +695,6 @@ void SAL_CALL DictionaryNeo::setName( const OUString& aName )
}
DictionaryType SAL_CALL DictionaryNeo::getDictionaryType( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -705,7 +702,6 @@ DictionaryType SAL_CALL DictionaryNeo::getDictionaryType( )
}
void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -737,14 +733,12 @@ void SAL_CALL DictionaryNeo::setActive( sal_Bool bActivate )
}
sal_Bool SAL_CALL DictionaryNeo::isActive( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return bIsActive;
}
sal_Int32 SAL_CALL DictionaryNeo::getCount( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -754,14 +748,12 @@ sal_Int32 SAL_CALL DictionaryNeo::getCount( )
}
Locale SAL_CALL DictionaryNeo::getLocale( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return LanguageTag::convertToLocale( nLanguage );
}
void SAL_CALL DictionaryNeo::setLocale( const Locale& aLocale )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
sal_Int16 nLanguageP = LinguLocaleToLanguage( aLocale );
@@ -776,7 +768,6 @@ void SAL_CALL DictionaryNeo::setLocale( const Locale& aLocale )
uno::Reference< XDictionaryEntry > SAL_CALL DictionaryNeo::getEntry(
const OUString& aWord )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -793,7 +784,6 @@ uno::Reference< XDictionaryEntry > SAL_CALL DictionaryNeo::getEntry(
sal_Bool SAL_CALL DictionaryNeo::addEntry(
const uno::Reference< XDictionaryEntry >& xDicEntry )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -812,7 +802,6 @@ sal_Bool SAL_CALL DictionaryNeo::addEntry(
sal_Bool SAL_CALL
DictionaryNeo::add( const OUString& rWord, sal_Bool bIsNegative,
const OUString& rRplcText )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -829,7 +818,6 @@ sal_Bool SAL_CALL
}
sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -864,7 +852,6 @@ sal_Bool SAL_CALL DictionaryNeo::remove( const OUString& aWord )
}
sal_Bool SAL_CALL DictionaryNeo::isFull( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -875,7 +862,6 @@ sal_Bool SAL_CALL DictionaryNeo::isFull( )
uno::Sequence< uno::Reference< XDictionaryEntry > >
SAL_CALL DictionaryNeo::getEntries( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -886,7 +872,6 @@ uno::Sequence< uno::Reference< XDictionaryEntry > >
void SAL_CALL DictionaryNeo::clear( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -904,7 +889,6 @@ void SAL_CALL DictionaryNeo::clear( )
sal_Bool SAL_CALL DictionaryNeo::addDictionaryEventListener(
const uno::Reference< XDictionaryEventListener >& xListener )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -919,7 +903,6 @@ sal_Bool SAL_CALL DictionaryNeo::addDictionaryEventListener(
sal_Bool SAL_CALL DictionaryNeo::removeDictionaryEventListener(
const uno::Reference< XDictionaryEventListener >& xListener )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -934,21 +917,18 @@ sal_Bool SAL_CALL DictionaryNeo::removeDictionaryEventListener(
sal_Bool SAL_CALL DictionaryNeo::hasLocation()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return !aMainURL.isEmpty();
}
OUString SAL_CALL DictionaryNeo::getLocation()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aMainURL;
}
sal_Bool SAL_CALL DictionaryNeo::isReadonly()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -956,7 +936,6 @@ sal_Bool SAL_CALL DictionaryNeo::isReadonly()
}
void SAL_CALL DictionaryNeo::store()
- throw(io::IOException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -970,7 +949,6 @@ void SAL_CALL DictionaryNeo::store()
void SAL_CALL DictionaryNeo::storeAsURL(
const OUString& aURL,
const uno::Sequence< beans::PropertyValue >& /*rArgs*/ )
- throw(io::IOException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -985,7 +963,6 @@ void SAL_CALL DictionaryNeo::storeAsURL(
void SAL_CALL DictionaryNeo::storeToURL(
const OUString& aURL,
const uno::Sequence< beans::PropertyValue >& /*rArgs*/ )
- throw(io::IOException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
saveEntries(aURL);
@@ -1036,21 +1013,18 @@ void DicEntry::splitDicFileWord(const OUString &rDicFileWord,
}
OUString SAL_CALL DicEntry::getDictionaryWord( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aDicWord;
}
sal_Bool SAL_CALL DicEntry::isNegative( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return bIsNegativ;
}
OUString SAL_CALL DicEntry::getReplacementText( )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aReplacement;
diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx
index 9435dbae0750..6bc7e7853306 100644
--- a/linguistic/source/dicimp.hxx
+++ b/linguistic/source/dicimp.hxx
@@ -83,86 +83,60 @@ public:
// XNamed
virtual OUString SAL_CALL
- getName()
- throw(css::uno::RuntimeException, std::exception) override;
+ getName() override;
virtual void SAL_CALL
- setName( const OUString& aName )
- throw(css::uno::RuntimeException, std::exception) override;
+ setName( const OUString& aName ) override;
// XDictionary
virtual css::linguistic2::DictionaryType SAL_CALL
- getDictionaryType()
- throw(css::uno::RuntimeException, std::exception) override;
+ getDictionaryType() override;
virtual void SAL_CALL
- setActive( sal_Bool bActivate )
- throw(css::uno::RuntimeException, std::exception) override;
+ setActive( sal_Bool bActivate ) override;
virtual sal_Bool SAL_CALL
- isActive()
- throw(css::uno::RuntimeException, std::exception) override;
+ isActive() override;
virtual sal_Int32 SAL_CALL
- getCount()
- throw(css::uno::RuntimeException, std::exception) override;
+ getCount() override;
virtual css::lang::Locale SAL_CALL
- getLocale()
- throw(css::uno::RuntimeException, std::exception) override;
+ getLocale() override;
virtual void SAL_CALL
- setLocale( const css::lang::Locale& aLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ setLocale( const css::lang::Locale& aLocale ) override;
virtual css::uno::Reference<
css::linguistic2::XDictionaryEntry > SAL_CALL
- getEntry( const OUString& aWord )
- throw(css::uno::RuntimeException, std::exception) override;
+ getEntry( const OUString& aWord ) override;
virtual sal_Bool SAL_CALL
addEntry( const css::uno::Reference<
- css::linguistic2::XDictionaryEntry >& xDicEntry )
- throw(css::uno::RuntimeException, std::exception) override;
+ css::linguistic2::XDictionaryEntry >& xDicEntry ) override;
virtual sal_Bool SAL_CALL
add( const OUString& aWord, sal_Bool bIsNegative,
- const OUString& aRplcText )
- throw(css::uno::RuntimeException, std::exception) override;
+ const OUString& aRplcText ) override;
virtual sal_Bool SAL_CALL
- remove( const OUString& aWord )
- throw(css::uno::RuntimeException, std::exception) override;
+ remove( const OUString& aWord ) override;
virtual sal_Bool SAL_CALL
- isFull()
- throw(css::uno::RuntimeException, std::exception) override;
+ isFull() override;
virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionaryEntry > > SAL_CALL
- getEntries()
- throw(css::uno::RuntimeException, std::exception) override;
+ getEntries() override;
virtual void SAL_CALL
- clear()
- throw(css::uno::RuntimeException, std::exception) override;
+ clear() override;
virtual sal_Bool SAL_CALL
- addDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener )
- throw(css::uno::RuntimeException, std::exception) override;
+ addDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener ) override;
virtual sal_Bool SAL_CALL
- removeDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener )
- throw(css::uno::RuntimeException, std::exception) override;
+ removeDictionaryEventListener( const css::uno::Reference< css::linguistic2::XDictionaryEventListener >& xListener ) override;
// XStorable
virtual sal_Bool SAL_CALL
- hasLocation()
- throw(css::uno::RuntimeException, std::exception) override;
+ hasLocation() override;
virtual OUString SAL_CALL
- getLocation()
- throw(css::uno::RuntimeException, std::exception) override;
+ getLocation() override;
virtual sal_Bool SAL_CALL
- isReadonly()
- throw(css::uno::RuntimeException, std::exception) override;
+ isReadonly() override;
virtual void SAL_CALL
- store()
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ store() override;
virtual void SAL_CALL
storeAsURL( const OUString& aURL,
- const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override;
virtual void SAL_CALL
storeToURL( const OUString& aURL,
- const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
- throw(css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override;
};
@@ -188,11 +162,11 @@ public:
// XDictionaryEntry
virtual OUString SAL_CALL
- getDictionaryWord() throw(css::uno::RuntimeException, std::exception) override;
+ getDictionaryWord() override;
virtual sal_Bool SAL_CALL
- isNegative() throw(css::uno::RuntimeException, std::exception) override;
+ isNegative() override;
virtual OUString SAL_CALL
- getReplacementText() throw(css::uno::RuntimeException, std::exception) override;
+ getReplacementText() override;
};
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index 3780d4eccc27..05b6c81ee741 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -79,13 +79,11 @@ public:
// XEventListener
virtual void SAL_CALL
- disposing( const EventObject& rSource )
- throw(RuntimeException, std::exception) override;
+ disposing( const EventObject& rSource ) override;
// XDictionaryEventListener
virtual void SAL_CALL
- processDictionaryEvent( const DictionaryEvent& rDicEvent )
- throw(RuntimeException, std::exception) override;
+ processDictionaryEvent( const DictionaryEvent& rDicEvent ) override;
// non-UNO functions
void DisposeAndClear( const EventObject &rEvtObj );
@@ -126,7 +124,6 @@ void DicEvtListenerHelper::DisposeAndClear( const EventObject &rEvtObj )
void SAL_CALL DicEvtListenerHelper::disposing( const EventObject& rSource )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -149,7 +146,6 @@ void SAL_CALL DicEvtListenerHelper::disposing( const EventObject& rSource )
void SAL_CALL DicEvtListenerHelper::processDictionaryEvent(
const DictionaryEvent& rDicEvent )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -370,13 +366,12 @@ sal_Int32 DicList::GetDicPos(const uno::Reference< XDictionary > &xDic)
/// @throws Exception
uno::Reference< XInterface > SAL_CALL
DicList_CreateInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/ )
- throw(Exception)
{
uno::Reference< XInterface > xService = static_cast<cppu::OWeakObject *>(new DicList);
return xService;
}
-sal_Int16 SAL_CALL DicList::getCount() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL DicList::getCount()
{
osl::MutexGuard aGuard( GetLinguMutex() );
return static_cast< sal_Int16 >(GetOrCreateDicList().size());
@@ -384,7 +379,6 @@ sal_Int16 SAL_CALL DicList::getCount() throw(RuntimeException, std::exception)
uno::Sequence< uno::Reference< XDictionary > > SAL_CALL
DicList::getDictionaries()
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -395,7 +389,6 @@ uno::Sequence< uno::Reference< XDictionary > > SAL_CALL
uno::Reference< XDictionary > SAL_CALL
DicList::getDictionaryByName( const OUString& aDictionaryName )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -417,7 +410,6 @@ uno::Reference< XDictionary > SAL_CALL
sal_Bool SAL_CALL DicList::addDictionary(
const uno::Reference< XDictionary >& xDictionary )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -439,7 +431,6 @@ sal_Bool SAL_CALL DicList::addDictionary(
sal_Bool SAL_CALL
DicList::removeDictionary( const uno::Reference< XDictionary >& xDictionary )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -472,7 +463,6 @@ sal_Bool SAL_CALL
sal_Bool SAL_CALL DicList::addDictionaryListEventListener(
const uno::Reference< XDictionaryListEventListener >& xListener,
sal_Bool bReceiveVerbose )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -492,7 +482,6 @@ sal_Bool SAL_CALL DicList::addDictionaryListEventListener(
sal_Bool SAL_CALL DicList::removeDictionaryListEventListener(
const uno::Reference< XDictionaryListEventListener >& xListener )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -507,19 +496,19 @@ sal_Bool SAL_CALL DicList::removeDictionaryListEventListener(
return bRes;
}
-sal_Int16 SAL_CALL DicList::beginCollectEvents() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL DicList::beginCollectEvents()
{
osl::MutexGuard aGuard( GetLinguMutex() );
return mxDicEvtLstnrHelper->BeginCollectEvents();
}
-sal_Int16 SAL_CALL DicList::endCollectEvents() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL DicList::endCollectEvents()
{
osl::MutexGuard aGuard( GetLinguMutex() );
return mxDicEvtLstnrHelper->EndCollectEvents();
}
-sal_Int16 SAL_CALL DicList::flushEvents() throw(RuntimeException, std::exception)
+sal_Int16 SAL_CALL DicList::flushEvents()
{
osl::MutexGuard aGuard( GetLinguMutex() );
return mxDicEvtLstnrHelper->FlushEvents();
@@ -528,7 +517,6 @@ sal_Int16 SAL_CALL DicList::flushEvents() throw(RuntimeException, std::exception
uno::Reference< XDictionary > SAL_CALL
DicList::createDictionary( const OUString& rName, const Locale& rLocale,
DictionaryType eDicType, const OUString& rURL )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -541,7 +529,6 @@ 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, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
return SearchDicList( this, rWord, LinguLocaleToLanguage( rLocale ),
@@ -551,7 +538,6 @@ uno::Reference< XDictionaryEntry > SAL_CALL
void SAL_CALL
DicList::dispose()
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -599,7 +585,6 @@ void SAL_CALL
void SAL_CALL
DicList::addEventListener( const uno::Reference< XEventListener >& rxListener )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -609,7 +594,6 @@ void SAL_CALL
void SAL_CALL
DicList::removeEventListener( const uno::Reference< XEventListener >& rxListener )
- throw(RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -703,20 +687,18 @@ void DicList::SaveDics()
// Service specific part
-OUString SAL_CALL DicList::getImplementationName( ) throw(RuntimeException, std::exception)
+OUString SAL_CALL DicList::getImplementationName( )
{
return getImplementationName_Static();
}
sal_Bool SAL_CALL DicList::supportsService( const OUString& ServiceName )
- throw(RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
uno::Sequence< OUString > SAL_CALL DicList::getSupportedServiceNames( )
- throw(RuntimeException, std::exception)
{
return getSupportedServiceNames_Static();
}
diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx
index 3e9130b7d2d6..55030149af10 100644
--- a/linguistic/source/dlistimp.hxx
+++ b/linguistic/source/dlistimp.hxx
@@ -87,30 +87,30 @@ public:
virtual ~DicList() override;
// XDictionaryList
- virtual ::sal_Int16 SAL_CALL getCount( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > SAL_CALL getDictionaries( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL addDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL removeDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL addDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener, sal_Bool bReceiveVerbose ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL removeDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int16 SAL_CALL beginCollectEvents( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int16 SAL_CALL endCollectEvents( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int16 SAL_CALL flushEvents( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const css::lang::Locale& aLocale, css::linguistic2::DictionaryType eDicType, const OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int16 SAL_CALL getCount( ) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > SAL_CALL getDictionaries( ) override;
+ virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL getDictionaryByName( const OUString& aDictionaryName ) override;
+ virtual sal_Bool SAL_CALL addDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) override;
+ virtual sal_Bool SAL_CALL removeDictionary( const css::uno::Reference< css::linguistic2::XDictionary >& xDictionary ) override;
+ virtual sal_Bool SAL_CALL addDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener, sal_Bool bReceiveVerbose ) override;
+ virtual sal_Bool SAL_CALL removeDictionaryListEventListener( const css::uno::Reference< css::linguistic2::XDictionaryListEventListener >& xListener ) override;
+ virtual ::sal_Int16 SAL_CALL beginCollectEvents( ) override;
+ virtual ::sal_Int16 SAL_CALL endCollectEvents( ) override;
+ virtual ::sal_Int16 SAL_CALL flushEvents( ) override;
+ virtual css::uno::Reference< css::linguistic2::XDictionary > SAL_CALL createDictionary( const OUString& aName, const css::lang::Locale& aLocale, css::linguistic2::DictionaryType eDicType, const OUString& aURL ) override;
// XSearchableDictionaryList
- virtual css::uno::Reference< css::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const css::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::linguistic2::XDictionaryEntry > SAL_CALL queryDictionaryEntry( const OUString& aWord, const css::lang::Locale& aLocale, sal_Bool bSearchPosDics, sal_Bool bSpellEntry ) override;
// XComponent
- virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
static inline OUString getImplementationName_Static() throw();
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 8897122f1cd4..265f1b8fd9cd 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -652,7 +652,6 @@ 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, std::exception)
{
// get paragraph to start checking with
const bool bAutomatic = true;
@@ -682,7 +681,6 @@ linguistic2::ProofreadingResult SAL_CALL GrammarCheckingIterator::checkSentenceA
sal_Int32 nStartOfSentencePos,
sal_Int32 nSuggestedEndOfSentencePos,
sal_Int32 nErrorPosInPara )
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
(void) rLocale;
@@ -806,7 +804,6 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence(
void SAL_CALL GrammarCheckingIterator::resetIgnoreRules( )
-throw (uno::RuntimeException, std::exception)
{
GCReferences_t::iterator aIt( m_aGCReferencesByService.begin() );
while (aIt != m_aGCReferencesByService.end())
@@ -821,7 +818,6 @@ throw (uno::RuntimeException, std::exception)
sal_Bool SAL_CALL GrammarCheckingIterator::isProofreading(
const uno::Reference< uno::XInterface >& xDoc )
-throw (uno::RuntimeException, std::exception)
{
// ---- THREAD SAFE START ----
::osl::Guard< ::osl::Mutex > aGuard( MyMutex::get() );
@@ -867,7 +863,6 @@ throw (uno::RuntimeException, std::exception)
void SAL_CALL GrammarCheckingIterator::processLinguServiceEvent(
const linguistic2::LinguServiceEvent& rLngSvcEvent )
-throw (uno::RuntimeException, std::exception)
{
if (rLngSvcEvent.nEvent == linguistic2::LinguServiceEventFlags::PROOFREAD_AGAIN)
{
@@ -894,7 +889,6 @@ throw (uno::RuntimeException, std::exception)
sal_Bool SAL_CALL GrammarCheckingIterator::addLinguServiceEventListener(
const uno::Reference< linguistic2::XLinguServiceEventListener >& xListener )
-throw (uno::RuntimeException, std::exception)
{
if (xListener.is())
{
@@ -906,7 +900,6 @@ throw (uno::RuntimeException, std::exception)
sal_Bool SAL_CALL GrammarCheckingIterator::removeLinguServiceEventListener(
const uno::Reference< linguistic2::XLinguServiceEventListener >& xListener )
-throw (uno::RuntimeException, std::exception)
{
if (xListener.is())
{
@@ -917,7 +910,6 @@ throw (uno::RuntimeException, std::exception)
void SAL_CALL GrammarCheckingIterator::dispose()
-throw (uno::RuntimeException, std::exception)
{
lang::EventObject aEvt( static_cast<linguistic2::XProofreadingIterator *>(this) );
m_aEventListeners.disposeAndClear( aEvt );
@@ -946,7 +938,6 @@ throw (uno::RuntimeException, std::exception)
void SAL_CALL GrammarCheckingIterator::addEventListener(
const uno::Reference< lang::XEventListener >& xListener )
-throw (uno::RuntimeException, std::exception)
{
if (xListener.is())
{
@@ -957,7 +948,6 @@ throw (uno::RuntimeException, std::exception)
void SAL_CALL GrammarCheckingIterator::removeEventListener(
const uno::Reference< lang::XEventListener >& xListener )
-throw (uno::RuntimeException, std::exception)
{
if (xListener.is())
{
@@ -967,7 +957,6 @@ throw (uno::RuntimeException, std::exception)
void SAL_CALL GrammarCheckingIterator::disposing( const lang::EventObject &rSource )
-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
@@ -1068,19 +1057,18 @@ void GrammarCheckingIterator::GetConfiguredGCSvcs_Impl()
sal_Bool SAL_CALL GrammarCheckingIterator::supportsService(
const OUString & rServiceName )
-throw(uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
-OUString SAL_CALL GrammarCheckingIterator::getImplementationName( ) throw (uno::RuntimeException, std::exception)
+OUString SAL_CALL GrammarCheckingIterator::getImplementationName( )
{
return GrammarCheckingIterator_getImplementationName();
}
-uno::Sequence< OUString > SAL_CALL GrammarCheckingIterator::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception)
+uno::Sequence< OUString > SAL_CALL GrammarCheckingIterator::getSupportedServiceNames( )
{
return GrammarCheckingIterator_getSupportedServiceNames();
}
@@ -1144,7 +1132,6 @@ static uno::Sequence< OUString > GrammarCheckingIterator_getSupportedServiceName
/// @throws uno::Exception
static uno::Reference< uno::XInterface > SAL_CALL GrammarCheckingIterator_createInstance(
const uno::Reference< lang::XMultiServiceFactory > & /*rxSMgr*/ )
-throw(uno::Exception)
{
return static_cast< ::cppu::OWeakObject * >(new GrammarCheckingIterator());
}
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index c114c80284f4..a4d6fc1672d3 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -149,30 +149,30 @@ public:
virtual ~GrammarCheckingIterator() override;
// XProofreadingIterator
- virtual void SAL_CALL startProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const css::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL resetIgnoreRules( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL startProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraphIteratorProvider >& xIteratorProvider ) override;
+ virtual css::linguistic2::ProofreadingResult SAL_CALL checkSentenceAtPosition( const css::uno::Reference< css::uno::XInterface >& xDocument, const css::uno::Reference< css::text::XFlatParagraph >& xFlatParagraph, const OUString& aText, const css::lang::Locale& aLocale, ::sal_Int32 nStartOfSentencePosition, ::sal_Int32 nSuggestedBehindEndOfSentencePosition, ::sal_Int32 nErrorPositionInParagraph ) override;
+ virtual void SAL_CALL resetIgnoreRules( ) override;
+ virtual sal_Bool SAL_CALL isProofreading( const css::uno::Reference< css::uno::XInterface >& xDocument ) override;
// XLinguServiceEventListener
- virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& aLngSvcEvent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL processLinguServiceEvent( const css::linguistic2::LinguServiceEvent& aLngSvcEvent ) override;
// XLinguServiceEventBroadcaster
- virtual sal_Bool SAL_CALL addLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL addLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) override;
+ virtual sal_Bool SAL_CALL removeLinguServiceEventListener( const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& xLstnr ) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose( ) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// LinguDispatcher
virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< OUString > &rSvcImplNames ) override;
diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx
index f96c5bfc6253..12ec7cf9c8d5 100644
--- a/linguistic/source/hhconvdic.cxx
+++ b/linguistic/source/hhconvdic.cxx
@@ -57,7 +57,7 @@ using namespace i18n;
// from i18npool/source/textconversion/textconversion_ko.cxx
/// @throws RuntimeException
-sal_Int16 SAL_CALL checkScriptType(sal_Unicode c) throw (RuntimeException)
+sal_Int16 SAL_CALL checkScriptType(sal_Unicode c)
{
UErrorCode status = U_ZERO_ERROR;
@@ -96,7 +96,6 @@ HHConvDic::~HHConvDic()
void SAL_CALL HHConvDic::addEntry(
const OUString& aLeftText,
const OUString& aRightText )
- throw (IllegalArgumentException, container::ElementExistException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -109,21 +108,18 @@ void SAL_CALL HHConvDic::addEntry(
OUString SAL_CALL HHConvDic::getImplementationName( )
- throw (RuntimeException, std::exception)
{
return OUString( "com.sun.star.lingu2.HHConvDic" );
}
sal_Bool SAL_CALL HHConvDic::supportsService( const OUString& rServiceName )
- throw (RuntimeException, std::exception)
{
return cppu::supportsService(this, rServiceName);
}
uno::Sequence< OUString > SAL_CALL HHConvDic::getSupportedServiceNames( )
- throw (RuntimeException, std::exception)
{
return { SN_CONV_DICTIONARY, SN_HH_CONV_DICTIONARY };
}
diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx
index e925c17d3dd8..5d6330a4ece3 100644
--- a/linguistic/source/hhconvdic.hxx
+++ b/linguistic/source/hhconvdic.hxx
@@ -41,12 +41,12 @@ public:
virtual ~HHConvDic() override;
// XConversionDictionary
- virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addEntry( const OUString& aLeftText, const OUString& aRightText ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
};
diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx
index 1a6db5efa4a6..c475db91d3a5 100644
--- a/linguistic/source/hyphdsp.cxx
+++ b/linguistic/source/hyphdsp.cxx
@@ -246,7 +246,6 @@ Reference< XPossibleHyphens > HyphenatorDispatcher::buildPossHyphens(
Sequence< Locale > SAL_CALL HyphenatorDispatcher::getLocales()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -262,7 +261,6 @@ Sequence< Locale > SAL_CALL HyphenatorDispatcher::getLocales()
sal_Bool SAL_CALL HyphenatorDispatcher::hasLocale(const Locale& rLocale)
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
HyphSvcByLangMap_t::const_iterator aIt( aSvcMap.find( LinguLocaleToLanguage( rLocale ) ) );
@@ -274,7 +272,6 @@ Reference< XHyphenatedWord > SAL_CALL
HyphenatorDispatcher::hyphenate(
const OUString& rWord, const Locale& rLocale, sal_Int16 nMaxLeading,
const PropertyValues& rProperties )
- throw(IllegalArgumentException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -411,7 +408,6 @@ Reference< XHyphenatedWord > SAL_CALL
HyphenatorDispatcher::queryAlternativeSpelling(
const OUString& rWord, const Locale& rLocale, sal_Int16 nIndex,
const PropertyValues& rProperties )
- throw(IllegalArgumentException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -543,7 +539,6 @@ Reference< XPossibleHyphens > SAL_CALL
HyphenatorDispatcher::createPossibleHyphens(
const OUString& rWord, const Locale& rLocale,
const PropertyValues& rProperties )
- throw(IllegalArgumentException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx
index cf250664aaa0..fc91441beefa 100644
--- a/linguistic/source/hyphdsp.hxx
+++ b/linguistic/source/hyphdsp.hxx
@@ -83,35 +83,27 @@ public:
// XSupportedLocales
virtual css::uno::Sequence< css::lang::Locale > SAL_CALL
- getLocales()
- throw(css::uno::RuntimeException, std::exception) override;
+ getLocales() override;
virtual sal_Bool SAL_CALL
- hasLocale( const css::lang::Locale& aLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ hasLocale( const css::lang::Locale& aLocale ) override;
// XHyphenator
virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL
hyphenate( const OUString& aWord,
const css::lang::Locale& aLocale,
sal_Int16 nMaxLeading,
- const css::beans::PropertyValues& aProperties )
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const css::beans::PropertyValues& aProperties ) override;
virtual css::uno::Reference< css::linguistic2::XHyphenatedWord > SAL_CALL
queryAlternativeSpelling( const OUString& aWord,
const css::lang::Locale& aLocale,
sal_Int16 nIndex,
- const css::beans::PropertyValues& aProperties )
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const css::beans::PropertyValues& aProperties ) override;
virtual css::uno::Reference<
css::linguistic2::XPossibleHyphens > SAL_CALL
createPossibleHyphens(
const OUString& aWord,
const css::lang::Locale& aLocale,
- const css::beans::PropertyValues& aProperties )
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const css::beans::PropertyValues& aProperties ) override;
// LinguDispatcher
virtual void
diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx
index 69e6a5f0c101..bef72839a1b3 100644
--- a/linguistic/source/hyphdta.cxx
+++ b/linguistic/source/hyphdta.cxx
@@ -71,7 +71,6 @@ HyphenatedWord::~HyphenatedWord()
OUString SAL_CALL HyphenatedWord::getWord()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aWord;
@@ -79,7 +78,6 @@ OUString SAL_CALL HyphenatedWord::getWord()
Locale SAL_CALL HyphenatedWord::getLocale()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -88,7 +86,6 @@ Locale SAL_CALL HyphenatedWord::getLocale()
sal_Int16 SAL_CALL HyphenatedWord::getHyphenationPos()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return nHyphenationPos;
@@ -96,7 +93,6 @@ sal_Int16 SAL_CALL HyphenatedWord::getHyphenationPos()
OUString SAL_CALL HyphenatedWord::getHyphenatedWord()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aHyphenatedWord;
@@ -104,7 +100,6 @@ OUString SAL_CALL HyphenatedWord::getHyphenatedWord()
sal_Int16 SAL_CALL HyphenatedWord::getHyphenPos()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return nHyphPos;
@@ -112,7 +107,6 @@ sal_Int16 SAL_CALL HyphenatedWord::getHyphenPos()
sal_Bool SAL_CALL HyphenatedWord::isAlternativeSpelling()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return bIsAltSpelling;
@@ -136,7 +130,6 @@ PossibleHyphens::~PossibleHyphens()
OUString SAL_CALL PossibleHyphens::getWord()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aWord;
@@ -144,7 +137,6 @@ OUString SAL_CALL PossibleHyphens::getWord()
Locale SAL_CALL PossibleHyphens::getLocale()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return LanguageTag::convertToLocale( nLanguage );
@@ -152,7 +144,6 @@ Locale SAL_CALL PossibleHyphens::getLocale()
OUString SAL_CALL PossibleHyphens::getPossibleHyphens()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aWordWithHyphens;
@@ -160,7 +151,6 @@ OUString SAL_CALL PossibleHyphens::getPossibleHyphens()
Sequence< sal_Int16 > SAL_CALL PossibleHyphens::getHyphenationPositions()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aOrigHyphenPos;
diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx
index e7989b2b8af6..8329ecd97265 100644
--- a/linguistic/source/iprcache.cxx
+++ b/linguistic/source/iprcache.cxx
@@ -132,7 +132,6 @@ void FlushListener::SetPropSet( Reference< XLinguProperties > &rPS )
void SAL_CALL FlushListener::disposing( const EventObject& rSource )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -151,7 +150,6 @@ void SAL_CALL FlushListener::disposing( const EventObject& rSource )
void SAL_CALL FlushListener::processDictionaryListEvent(
const DictionaryListEvent& rDicListEvent )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -173,7 +171,6 @@ void SAL_CALL FlushListener::processDictionaryListEvent(
void SAL_CALL FlushListener::propertyChange(
const PropertyChangeEvent& rEvt )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index ba99a5a21a0f..96908dd1ac73 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -212,14 +212,12 @@ void LinguProps::launchEvent( const PropertyChangeEvent &rEvt ) const
/// @throws Exception
Reference< XInterface > SAL_CALL LinguProps_CreateInstance(
const Reference< XMultiServiceFactory > & /*rSMgr*/ )
- throw(Exception)
{
Reference< XInterface > xService = static_cast<cppu::OWeakObject*>(new LinguProps);
return xService;
}
Reference< XPropertySetInfo > SAL_CALL LinguProps::getPropertySetInfo()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -230,8 +228,6 @@ Reference< XPropertySetInfo > SAL_CALL LinguProps::getPropertySetInfo()
void SAL_CALL LinguProps::setPropertyValue(
const OUString& rPropertyName, const Any& rValue )
- throw(UnknownPropertyException, PropertyVetoException,
- IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -249,7 +245,6 @@ void SAL_CALL LinguProps::setPropertyValue(
}
Any SAL_CALL LinguProps::getPropertyValue( const OUString& rPropertyName )
- throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -267,7 +262,6 @@ Any SAL_CALL LinguProps::getPropertyValue( const OUString& rPropertyName )
void SAL_CALL LinguProps::addPropertyChangeListener(
const OUString& rPropertyName,
const Reference< XPropertyChangeListener >& rxListener )
- throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -282,7 +276,6 @@ void SAL_CALL LinguProps::addPropertyChangeListener(
void SAL_CALL LinguProps::removePropertyChangeListener(
const OUString& rPropertyName,
const Reference< XPropertyChangeListener >& rxListener )
- throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -297,21 +290,17 @@ void SAL_CALL LinguProps::removePropertyChangeListener(
void SAL_CALL LinguProps::addVetoableChangeListener(
const OUString& /*rPropertyName*/,
const Reference< XVetoableChangeListener >& /*xListener*/ )
- throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
{
}
void SAL_CALL LinguProps::removeVetoableChangeListener(
const OUString& /*rPropertyName*/,
const Reference< XVetoableChangeListener >& /*xListener*/ )
- throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
{
}
void SAL_CALL LinguProps::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue )
- throw(UnknownPropertyException, PropertyVetoException,
- IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -326,7 +315,6 @@ void SAL_CALL LinguProps::setFastPropertyValue( sal_Int32 nHandle, const Any& rV
Any SAL_CALL LinguProps::getFastPropertyValue( sal_Int32 nHandle )
- throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -337,7 +325,6 @@ Any SAL_CALL LinguProps::getFastPropertyValue( sal_Int32 nHandle )
Sequence< PropertyValue > SAL_CALL
LinguProps::getPropertyValues()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -361,8 +348,6 @@ Sequence< PropertyValue > SAL_CALL
void SAL_CALL
LinguProps::setPropertyValues( const Sequence< PropertyValue >& rProps )
- throw(UnknownPropertyException, PropertyVetoException,
- IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -377,7 +362,6 @@ void SAL_CALL
void SAL_CALL
LinguProps::dispose()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -397,7 +381,6 @@ void SAL_CALL
void SAL_CALL
LinguProps::addEventListener( const Reference< XEventListener >& rxListener )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -407,7 +390,6 @@ void SAL_CALL
void SAL_CALL
LinguProps::removeEventListener( const Reference< XEventListener >& rxListener )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -420,21 +402,18 @@ void SAL_CALL
// XServiceInfo
OUString SAL_CALL LinguProps::getImplementationName()
- throw(RuntimeException, std::exception)
{
return getImplementationName_Static();
}
// XServiceInfo
sal_Bool SAL_CALL LinguProps::supportsService( const OUString& ServiceName )
- throw(RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
// XServiceInfo
uno::Sequence< OUString > SAL_CALL LinguProps::getSupportedServiceNames()
- throw(RuntimeException, std::exception)
{
return getSupportedServiceNames_Static();
}
@@ -447,7 +426,7 @@ uno::Sequence< OUString > LinguProps::getSupportedServiceNames_Static()
return aSNS;
}
-bool LinguProps::getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+bool LinguProps::getPropertyBool(const OUString& aPropertyName)
{
uno::Any any = getPropertyValue(aPropertyName);
bool b = false;
@@ -455,7 +434,7 @@ bool LinguProps::getPropertyBool(const OUString& aPropertyName) throw (css::uno:
return b;
}
-sal_Int16 LinguProps::getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+sal_Int16 LinguProps::getPropertyInt16(const OUString& aPropertyName)
{
uno::Any any = getPropertyValue(aPropertyName);
sal_Int16 b = 0;
@@ -463,7 +442,7 @@ sal_Int16 LinguProps::getPropertyInt16(const OUString& aPropertyName) throw (css
return b;
}
-Locale LinguProps::getPropertyLocale(const OUString& aPropertyName) throw (css::uno::RuntimeException)
+Locale LinguProps::getPropertyLocale(const OUString& aPropertyName)
{
uno::Any any = getPropertyValue(aPropertyName);
css::lang::Locale b;
diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx
index 5eb5b92925af..1efed14d4dc1 100644
--- a/linguistic/source/lngopt.hxx
+++ b/linguistic/source/lngopt.hxx
@@ -90,115 +90,115 @@ class LinguProps :
void launchEvent( const css::beans::PropertyChangeEvent &rEvt ) const;
/// @throws css::uno::RuntimeException
- bool getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException);
+ bool getPropertyBool(const OUString& aPropertyName);
/// @throws css::uno::RuntimeException
- sal_Int16 getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException);
+ sal_Int16 getPropertyInt16(const OUString& aPropertyName);
/// @throws css::uno::RuntimeException
- css::lang::Locale getPropertyLocale(const OUString& aPropertyName) throw (css::uno::RuntimeException);
+ css::lang::Locale getPropertyLocale(const OUString& aPropertyName);
/// @throws css::uno::RuntimeException
- void setProperty(const OUString& aPropertyName, bool p1) throw (css::uno::RuntimeException)
+ void setProperty(const OUString& aPropertyName, bool p1)
{ setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
/// @throws css::uno::RuntimeException
- void setProperty(const OUString& aPropertyName, sal_Int16 p1) throw (css::uno::RuntimeException)
+ void setProperty(const OUString& aPropertyName, sal_Int16 p1)
{ setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
/// @throws css::uno::RuntimeException
- void setProperty(const OUString& aPropertyName, css::lang::Locale p1) throw (css::uno::RuntimeException)
+ void setProperty(const OUString& aPropertyName, css::lang::Locale p1)
{ setPropertyValue( aPropertyName, css::uno::Any(p1) ); }
public:
LinguProps();
- virtual sal_Bool SAL_CALL getIsUseDictionaryList() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsUseDictionaryList() override
{ return getPropertyBool(UPN_IS_USE_DICTIONARY_LIST); }
- virtual void SAL_CALL setIsUseDictionaryList(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsUseDictionaryList(sal_Bool p1) override
{ setProperty(UPN_IS_USE_DICTIONARY_LIST, (bool) p1); }
- virtual sal_Bool SAL_CALL getIsIgnoreControlCharacters() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsIgnoreControlCharacters() override
{ return getPropertyBool(UPN_IS_IGNORE_CONTROL_CHARACTERS); }
- virtual void SAL_CALL setIsIgnoreControlCharacters(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsIgnoreControlCharacters(sal_Bool p1) override
{ setProperty(UPN_IS_IGNORE_CONTROL_CHARACTERS, (bool) p1); }
- virtual sal_Bool SAL_CALL getIsSpellUpperCase() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsSpellUpperCase() override
{ return getPropertyBool(UPN_IS_SPELL_UPPER_CASE); }
- virtual void SAL_CALL setIsSpellUpperCase(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsSpellUpperCase(sal_Bool p1) override
{ setProperty(UPN_IS_SPELL_UPPER_CASE, (bool) p1); }
- virtual sal_Bool SAL_CALL getIsSpellWithDigits() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsSpellWithDigits() override
{ return getPropertyBool(UPN_IS_SPELL_WITH_DIGITS); }
- virtual void SAL_CALL setIsSpellWithDigits(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsSpellWithDigits(sal_Bool p1) override
{ setProperty(UPN_IS_SPELL_WITH_DIGITS, (bool) p1); }
- virtual sal_Bool SAL_CALL getIsSpellCapitalization() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsSpellCapitalization() override
{ return getPropertyBool(UPN_IS_SPELL_CAPITALIZATION); }
- virtual void SAL_CALL setIsSpellCapitalization(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsSpellCapitalization(sal_Bool p1) override
{ setProperty(UPN_IS_SPELL_CAPITALIZATION, (bool) p1); }
- virtual sal_Int16 SAL_CALL getHyphMinLeading() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int16 SAL_CALL getHyphMinLeading() override
{ return getPropertyInt16(UPN_HYPH_MIN_LEADING); }
- virtual void SAL_CALL setHyphMinLeading(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setHyphMinLeading(sal_Int16 p1) override
{ setProperty(UPN_HYPH_MIN_LEADING, p1); }
- virtual sal_Int16 SAL_CALL getHyphMinTrailing() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int16 SAL_CALL getHyphMinTrailing() override
{ return getPropertyInt16(UPN_HYPH_MIN_TRAILING); }
- virtual void SAL_CALL setHyphMinTrailing(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setHyphMinTrailing(sal_Int16 p1) override
{ setProperty(UPN_HYPH_MIN_TRAILING, p1); }
- virtual sal_Int16 SAL_CALL getHyphMinWordLength() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Int16 SAL_CALL getHyphMinWordLength() override
{ return getPropertyInt16(UPN_HYPH_MIN_WORD_LENGTH); }
- virtual void SAL_CALL setHyphMinWordLength(sal_Int16 p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setHyphMinWordLength(sal_Int16 p1) override
{ setProperty(UPN_HYPH_MIN_WORD_LENGTH, p1); }
- virtual css::lang::Locale SAL_CALL getDefaultLocale() throw (css::uno::RuntimeException, std::exception) override
+ virtual css::lang::Locale SAL_CALL getDefaultLocale() override
{ return getPropertyLocale(UPN_DEFAULT_LOCALE); }
- virtual void SAL_CALL setDefaultLocale(const css::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setDefaultLocale(const css::lang::Locale& p1) override
{ setProperty(UPN_DEFAULT_LOCALE, p1); }
- virtual sal_Bool SAL_CALL getIsHyphAuto() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsHyphAuto() override
{ return getPropertyBool(UPN_IS_HYPH_AUTO); }
- virtual void SAL_CALL setIsHyphAuto(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsHyphAuto(sal_Bool p1) override
{ setProperty(UPN_IS_HYPH_AUTO, (bool) p1); }
- virtual sal_Bool SAL_CALL getIsHyphSpecial() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsHyphSpecial() override
{ return getPropertyBool(UPN_IS_HYPH_SPECIAL); }
- virtual void SAL_CALL setIsHyphSpecial(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsHyphSpecial(sal_Bool p1) override
{ setProperty(UPN_IS_HYPH_SPECIAL, (bool) p1); }
- virtual sal_Bool SAL_CALL getIsSpellAuto() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsSpellAuto() override
{ return getPropertyBool(UPN_IS_SPELL_AUTO); }
- virtual void SAL_CALL setIsSpellAuto(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsSpellAuto(sal_Bool p1) override
{ setProperty(UPN_IS_SPELL_AUTO, (bool) p1); }
- virtual sal_Bool SAL_CALL getIsSpellSpecial() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsSpellSpecial() override
{ return getPropertyBool(UPN_IS_SPELL_SPECIAL); }
- virtual void SAL_CALL setIsSpellSpecial(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsSpellSpecial(sal_Bool p1) override
{ setProperty(UPN_IS_SPELL_SPECIAL, (bool) p1); }
- virtual sal_Bool SAL_CALL getIsWrapReverse() throw (css::uno::RuntimeException, std::exception) override
+ virtual sal_Bool SAL_CALL getIsWrapReverse() override
{ return getPropertyBool(UPN_IS_WRAP_REVERSE); }
- virtual void SAL_CALL setIsWrapReverse(sal_Bool p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setIsWrapReverse(sal_Bool p1) override
{ setProperty(UPN_IS_WRAP_REVERSE, (bool) p1); }
- virtual css::lang::Locale SAL_CALL getDefaultLocale_CJK() throw (css::uno::RuntimeException, std::exception) override
+ virtual css::lang::Locale SAL_CALL getDefaultLocale_CJK() override
{ return getPropertyLocale(UPN_DEFAULT_LOCALE_CJK); }
- virtual void SAL_CALL setDefaultLocale_CJK(const css::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setDefaultLocale_CJK(const css::lang::Locale& p1) override
{ setProperty(UPN_DEFAULT_LOCALE_CJK, p1); }
- virtual css::lang::Locale SAL_CALL getDefaultLocale_CTL() throw (css::uno::RuntimeException, std::exception) override
+ virtual css::lang::Locale SAL_CALL getDefaultLocale_CTL() override
{ return getPropertyLocale(UPN_DEFAULT_LOCALE_CTL); }
- virtual void SAL_CALL setDefaultLocale_CTL(const css::lang::Locale& p1) throw (css::uno::RuntimeException, std::exception) override
+ virtual void SAL_CALL setDefaultLocale_CTL(const css::lang::Locale& p1) override
{ setProperty(UPN_DEFAULT_LOCALE_CTL, p1); }
// XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& rxListener ) override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& rxListener ) override;
// XFastPropertySet
- virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getFastPropertyValue( sal_Int32 nHandle ) override;
// XPropertyAccess
- virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() override;
+ virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override;
// XComponent
- virtual void SAL_CALL dispose() throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& rxListener ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
static inline OUString getImplementationName_Static() throw();
diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx
index 0528f5ddcbc9..2846569b172b 100644
--- a/linguistic/source/lngprophelp.cxx
+++ b/linguistic/source/lngprophelp.cxx
@@ -216,7 +216,6 @@ bool PropertyChgHelper::propertyChange_Impl( const PropertyChangeEvent& rEvt )
void SAL_CALL
PropertyChgHelper::propertyChange( const PropertyChangeEvent& rEvt )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
propertyChange_Impl( rEvt );
@@ -259,7 +258,6 @@ void PropertyChgHelper::LaunchEvent( const LinguServiceEvent &rEvt )
void SAL_CALL PropertyChgHelper::disposing( const EventObject& rSource )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
if (rSource.Source == xPropSet)
@@ -274,7 +272,6 @@ void SAL_CALL PropertyChgHelper::disposing( const EventObject& rSource )
sal_Bool SAL_CALL
PropertyChgHelper::addLinguServiceEventListener(
const Reference< XLinguServiceEventListener >& rxListener )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -291,7 +288,6 @@ sal_Bool SAL_CALL
sal_Bool SAL_CALL
PropertyChgHelper::removeLinguServiceEventListener(
const Reference< XLinguServiceEventListener >& rxListener )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -322,7 +318,6 @@ PropertyHelper_Thes::~PropertyHelper_Thes()
void SAL_CALL
PropertyHelper_Thes::propertyChange( const PropertyChangeEvent& rEvt )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
PropertyChgHelper::propertyChange_Impl( rEvt );
@@ -467,7 +462,6 @@ bool PropertyHelper_Spell::propertyChange_Impl( const PropertyChangeEvent& rEvt
void SAL_CALL
PropertyHelper_Spell::propertyChange( const PropertyChangeEvent& rEvt )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
propertyChange_Impl( rEvt );
@@ -623,7 +617,6 @@ bool PropertyHelper_Hyphen::propertyChange_Impl( const PropertyChangeEvent& rEvt
void SAL_CALL
PropertyHelper_Hyphen::propertyChange( const PropertyChangeEvent& rEvt )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
propertyChange_Impl( rEvt );
@@ -735,14 +728,12 @@ sal_Int16 PropertyHelper_Hyphenation::GetMinWordLength() const
bool PropertyHelper_Hyphenation::addLinguServiceEventListener(
const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
- throw(css::uno::RuntimeException)
{
return pInst->addLinguServiceEventListener( rxListener );
}
bool PropertyHelper_Hyphenation::removeLinguServiceEventListener(
const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& rxListener )
- throw(css::uno::RuntimeException)
{
return pInst->removeLinguServiceEventListener( rxListener );
}
@@ -792,7 +783,6 @@ bool PropertyHelper_Spelling::IsSpellCapitalization() const
bool PropertyHelper_Spelling::addLinguServiceEventListener(
const css::uno::Reference<
css::linguistic2::XLinguServiceEventListener >& rxListener )
- throw(css::uno::RuntimeException)
{
return pInst->addLinguServiceEventListener( rxListener );
}
@@ -800,7 +790,6 @@ bool PropertyHelper_Spelling::addLinguServiceEventListener(
bool PropertyHelper_Spelling::removeLinguServiceEventListener(
const css::uno::Reference<
css::linguistic2::XLinguServiceEventListener >& rxListener )
- throw(css::uno::RuntimeException)
{
return pInst->removeLinguServiceEventListener( rxListener );
}
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 4cc4fa7c8b9f..0fcd7dfff492 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -199,19 +199,16 @@ public:
// lang::XEventListener
virtual void SAL_CALL
- disposing( const lang::EventObject& rSource )
- throw(uno::RuntimeException, std::exception) override;
+ disposing( const lang::EventObject& rSource ) override;
// linguistic2::XLinguServiceEventListener
virtual void SAL_CALL
- processLinguServiceEvent( const linguistic2::LinguServiceEvent& aLngSvcEvent )
- throw(uno::RuntimeException, std::exception) override;
+ processLinguServiceEvent( const linguistic2::LinguServiceEvent& aLngSvcEvent ) override;
// linguistic2::XDictionaryListEventListener
virtual void SAL_CALL
processDictionaryListEvent(
- const linguistic2::DictionaryListEvent& rDicListEvent )
- throw(uno::RuntimeException, std::exception) override;
+ const linguistic2::DictionaryListEvent& rDicListEvent ) override;
inline bool AddLngSvcMgrListener(
const uno::Reference< lang::XEventListener >& rxListener );
@@ -246,7 +243,6 @@ LngSvcMgrListenerHelper::LngSvcMgrListenerHelper(
void SAL_CALL LngSvcMgrListenerHelper::disposing( const lang::EventObject& rSource )
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -291,7 +287,6 @@ void LngSvcMgrListenerHelper::AddLngSvcEvt( sal_Int16 nLngSvcEvt )
void SAL_CALL
LngSvcMgrListenerHelper::processLinguServiceEvent(
const linguistic2::LinguServiceEvent& rLngSvcEvent )
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
AddLngSvcEvt( rLngSvcEvent.nEvent );
@@ -301,7 +296,6 @@ void SAL_CALL
void SAL_CALL
LngSvcMgrListenerHelper::processDictionaryListEvent(
const linguistic2::DictionaryListEvent& rDicListEvent )
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -472,7 +466,6 @@ LngSvcMgr::LngSvcMgr()
// css::util::XModifyListener
void LngSvcMgr::modified(const lang::EventObject&)
- throw(uno::RuntimeException, std::exception)
{
{
osl::MutexGuard aGuard(GetLinguMutex());
@@ -532,7 +525,6 @@ void LngSvcMgr::stopListening()
}
void LngSvcMgr::disposing(const lang::EventObject&)
- throw (uno::RuntimeException, std::exception)
{
stopListening();
}
@@ -1408,7 +1400,6 @@ void LngSvcMgr::SetCfgServiceLists( ThesaurusDispatcher &rThesDsp )
uno::Reference< linguistic2::XSpellChecker > SAL_CALL
LngSvcMgr::getSpellChecker()
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
#if OSL_DEBUG_LEVEL > 0
@@ -1428,7 +1419,6 @@ uno::Reference< linguistic2::XSpellChecker > SAL_CALL
uno::Reference< linguistic2::XHyphenator > SAL_CALL
LngSvcMgr::getHyphenator()
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
#if OSL_DEBUG_LEVEL > 0
@@ -1447,7 +1437,6 @@ uno::Reference< linguistic2::XHyphenator > SAL_CALL
uno::Reference< linguistic2::XThesaurus > SAL_CALL
LngSvcMgr::getThesaurus()
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
#if OSL_DEBUG_LEVEL > 0
@@ -1467,7 +1456,6 @@ uno::Reference< linguistic2::XThesaurus > SAL_CALL
sal_Bool SAL_CALL
LngSvcMgr::addLinguServiceManagerListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -1485,7 +1473,6 @@ sal_Bool SAL_CALL
sal_Bool SAL_CALL
LngSvcMgr::removeLinguServiceManagerListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -1505,8 +1492,6 @@ uno::Sequence< OUString > SAL_CALL
LngSvcMgr::getAvailableServices(
const OUString& rServiceName,
const lang::Locale& rLocale )
- throw(uno::RuntimeException,
- std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -1565,7 +1550,6 @@ uno::Sequence< OUString > SAL_CALL
uno::Sequence< lang::Locale > SAL_CALL
LngSvcMgr::getAvailableLocales(
const OUString& rServiceName )
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -1620,7 +1604,6 @@ void SAL_CALL
const OUString& rServiceName,
const lang::Locale& rLocale,
const uno::Sequence< OUString >& rServiceImplNames )
- throw(uno::RuntimeException, std::exception)
{
SAL_INFO( "linguistic", "linguistic: LngSvcMgr::setConfiguredServices" );
@@ -1847,7 +1830,6 @@ uno::Sequence< OUString > SAL_CALL
LngSvcMgr::getConfiguredServices(
const OUString& rServiceName,
const lang::Locale& rLocale )
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -1913,7 +1895,6 @@ uno::Sequence< OUString > SAL_CALL
void SAL_CALL
LngSvcMgr::dispose()
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -1934,7 +1915,6 @@ void SAL_CALL
void SAL_CALL
LngSvcMgr::addEventListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -1948,7 +1928,6 @@ void SAL_CALL
void SAL_CALL
LngSvcMgr::removeEventListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw(uno::RuntimeException, std::exception)
{
osl::MutexGuard aGuard( GetLinguMutex() );
@@ -1975,7 +1954,6 @@ bool LngSvcMgr::AddLngSvcEvtBroadcaster(
OUString SAL_CALL
LngSvcMgr::getImplementationName()
- throw(uno::RuntimeException, std::exception)
{
return getImplementationName_Static();
}
@@ -1983,7 +1961,6 @@ OUString SAL_CALL
sal_Bool SAL_CALL
LngSvcMgr::supportsService( const OUString& ServiceName )
- throw(uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
@@ -1991,7 +1968,6 @@ sal_Bool SAL_CALL
uno::Sequence< OUString > SAL_CALL
LngSvcMgr::getSupportedServiceNames()
- throw(uno::RuntimeException, std::exception)
{
return getSupportedServiceNames_Static();
}
@@ -2007,7 +1983,6 @@ uno::Sequence< OUString > LngSvcMgr::getSupportedServiceNames_Static()
/// @throws uno::Exception
uno::Reference< uno::XInterface > SAL_CALL LngSvcMgr_CreateInstance(
const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/ )
- throw(uno::Exception, std::exception)
{
uno::Reference< uno::XInterface > xService = static_cast<cppu::OWeakObject*>(new LngSvcMgr);
return xService;
diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx
index 75b4c1ca1b1e..8a9f9ed91a41 100644
--- a/linguistic/source/lngsvcmgr.hxx
+++ b/linguistic/source/lngsvcmgr.hxx
@@ -134,35 +134,33 @@ public:
virtual ~LngSvcMgr() override;
// XLinguServiceManager
- virtual css::uno::Reference< css::linguistic2::XSpellChecker > SAL_CALL getSpellChecker( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::linguistic2::XHyphenator > SAL_CALL getHyphenator( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::linguistic2::XThesaurus > SAL_CALL getThesaurus( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL addLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL removeLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const css::lang::Locale& aLocale )
- throw (css::uno::RuntimeException,
- std::exception) override;
- virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale, const css::uno::Sequence< OUString >& aServiceImplNames ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::linguistic2::XSpellChecker > SAL_CALL getSpellChecker( ) override;
+ virtual css::uno::Reference< css::linguistic2::XHyphenator > SAL_CALL getHyphenator( ) override;
+ virtual css::uno::Reference< css::linguistic2::XThesaurus > SAL_CALL getThesaurus( ) override;
+ virtual sal_Bool SAL_CALL addLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual sal_Bool SAL_CALL removeLinguServiceManagerListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServices( const OUString& aServiceName, const css::lang::Locale& aLocale ) override;
+ virtual void SAL_CALL setConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale, const css::uno::Sequence< OUString >& aServiceImplNames ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getConfiguredServices( const OUString& aServiceName, const css::lang::Locale& aLocale ) override;
// XAvailableLocales
- virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getAvailableLocales( const OUString& aServiceName ) override;
// XComponent
- virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose( ) override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) override;
// XModifyListener
- virtual void SAL_CALL modified( const css::lang::EventObject& rEvent ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL modified( const css::lang::EventObject& rEvent ) override;
static inline OUString getImplementationName_Static();
static css::uno::Sequence< OUString > getSupportedServiceNames_Static() throw();
diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx
index b8a3e7f6b507..392b2deec774 100644
--- a/linguistic/source/misc.cxx
+++ b/linguistic/source/misc.cxx
@@ -772,7 +772,6 @@ void AppExitListener::Deactivate()
void SAL_CALL
AppExitListener::disposing( const EventObject& rEvtSource )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -784,13 +783,11 @@ void SAL_CALL
void SAL_CALL
AppExitListener::queryTermination( const EventObject& /*rEvtSource*/ )
- throw(frame::TerminationVetoException, RuntimeException, std::exception)
{
}
void SAL_CALL
AppExitListener::notifyTermination( const EventObject& rEvtSource )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx
index cdcd95e0aab5..484dc1ec62cf 100644
--- a/linguistic/source/spelldsp.cxx
+++ b/linguistic/source/spelldsp.cxx
@@ -199,7 +199,6 @@ void SpellCheckerDispatcher::ClearSvcList()
Sequence< Locale > SAL_CALL SpellCheckerDispatcher::getLocales()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -215,7 +214,6 @@ Sequence< Locale > SAL_CALL SpellCheckerDispatcher::getLocales()
sal_Bool SAL_CALL SpellCheckerDispatcher::hasLocale( const Locale& rLocale )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
SpellSvcByLangMap_t::const_iterator aIt( aSvcMap.find( LinguLocaleToLanguage( rLocale ) ) );
@@ -226,7 +224,6 @@ 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, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return isValid_Impl( rWord, LinguLocaleToLanguage( rLocale ), rProperties );
@@ -236,7 +233,6 @@ sal_Bool SAL_CALL
Reference< XSpellAlternatives > SAL_CALL
SpellCheckerDispatcher::spell( const OUString& rWord, const Locale& rLocale,
const PropertyValues& rProperties )
- throw(IllegalArgumentException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return spell_Impl( rWord, LinguLocaleToLanguage( rLocale ), rProperties );
@@ -281,7 +277,6 @@ bool SpellCheckerDispatcher::isValid_Impl(
const OUString& rWord,
LanguageType nLanguage,
const PropertyValues& rProperties)
- throw( RuntimeException, IllegalArgumentException, std::exception )
{
MutexGuard aGuard( GetLinguMutex() );
@@ -445,7 +440,6 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
const OUString& rWord,
LanguageType nLanguage,
const PropertyValues& rProperties )
- throw(IllegalArgumentException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -750,7 +744,6 @@ Reference< XSpellAlternatives > SpellCheckerDispatcher::spell_Impl(
}
uno::Sequence< sal_Int16 > SAL_CALL SpellCheckerDispatcher::getLanguages( )
-throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
uno::Sequence< Locale > aTmp( getLocales() );
@@ -761,7 +754,6 @@ throw (uno::RuntimeException, std::exception)
sal_Bool SAL_CALL SpellCheckerDispatcher::hasLanguage(
sal_Int16 nLanguage )
-throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return hasLocale( LanguageTag::convertToLocale( nLanguage) );
@@ -772,7 +764,6 @@ sal_Bool SAL_CALL SpellCheckerDispatcher::isValid(
const OUString& rWord,
sal_Int16 nLanguage,
const uno::Sequence< beans::PropertyValue >& rProperties )
-throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return isValid( rWord, LanguageTag::convertToLocale( nLanguage ), rProperties);
@@ -783,7 +774,6 @@ uno::Reference< linguistic2::XSpellAlternatives > SAL_CALL SpellCheckerDispatche
const OUString& rWord,
sal_Int16 nLanguage,
const uno::Sequence< beans::PropertyValue >& rProperties )
-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 26e75e82e05b..e02e4042cadf 100644
--- a/linguistic/source/spelldsp.hxx
+++ b/linguistic/source/spelldsp.hxx
@@ -77,36 +77,34 @@ class SpellCheckerDispatcher :
/// @throws css::uno::RuntimeException
/// @throws css::lang::IllegalArgumentException
bool isValid_Impl(const OUString& aWord, LanguageType nLanguage,
- const css::beans::PropertyValues& aProperties)
- throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception );
+ const css::beans::PropertyValues& aProperties);
/// @throws css::uno::RuntimeException
/// @throws css::lang::IllegalArgumentException
css::uno::Reference<
css::linguistic2::XSpellAlternatives >
spell_Impl(const OUString& aWord, LanguageType nLanguage,
- const css::beans::PropertyValues& aProperties)
- throw( css::uno::RuntimeException, css::lang::IllegalArgumentException, std::exception );
+ const css::beans::PropertyValues& aProperties);
public:
explicit SpellCheckerDispatcher( LngSvcMgr &rLngSvcMgr );
virtual ~SpellCheckerDispatcher() override;
// XSupportedLocales (for XSpellChecker)
- virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales() throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasLocale( const css::lang::Locale& aLocale ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getLocales() override;
+ virtual sal_Bool SAL_CALL hasLocale( const css::lang::Locale& aLocale ) override;
// XSpellChecker
- virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isValid( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override;
+ virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, const css::lang::Locale& aLocale, const css::beans::PropertyValues& aProperties ) override;
// XSupportedLanguages
- virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< ::sal_Int16 > SAL_CALL getLanguages( ) override;
+ virtual sal_Bool SAL_CALL hasLanguage( ::sal_Int16 nLanguage ) override;
// XSpellChecker1
- virtual sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isValid( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) override;
+ virtual css::uno::Reference< css::linguistic2::XSpellAlternatives > SAL_CALL spell( const OUString& aWord, ::sal_Int16 nLanguage, const css::uno::Sequence< css::beans::PropertyValue >& aProperties ) override;
// LinguDispatcher
virtual void SetServiceList( const css::lang::Locale &rLocale, const css::uno::Sequence< OUString > &rSvcImplNames ) override;
diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx
index 7b97f500d9de..65b7c97fc6ef 100644
--- a/linguistic/source/spelldta.cxx
+++ b/linguistic/source/spelldta.cxx
@@ -195,7 +195,6 @@ SpellAlternatives::~SpellAlternatives()
OUString SAL_CALL SpellAlternatives::getWord()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aWord;
@@ -203,7 +202,6 @@ OUString SAL_CALL SpellAlternatives::getWord()
Locale SAL_CALL SpellAlternatives::getLocale()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return LanguageTag::convertToLocale( nLanguage );
@@ -211,7 +209,6 @@ Locale SAL_CALL SpellAlternatives::getLocale()
sal_Int16 SAL_CALL SpellAlternatives::getFailureType()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return nType;
@@ -219,7 +216,6 @@ sal_Int16 SAL_CALL SpellAlternatives::getFailureType()
sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return (sal_Int16) aAlt.getLength();
@@ -227,7 +223,6 @@ sal_Int16 SAL_CALL SpellAlternatives::getAlternativesCount()
Sequence< OUString > SAL_CALL SpellAlternatives::getAlternatives()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
return aAlt;
@@ -235,7 +230,6 @@ Sequence< OUString > SAL_CALL SpellAlternatives::getAlternatives()
void SAL_CALL SpellAlternatives::setAlternatives( const uno::Sequence< OUString >& rAlternatives )
-throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
aAlt = rAlternatives;
@@ -243,7 +237,6 @@ throw (uno::RuntimeException, std::exception)
void SAL_CALL SpellAlternatives::setFailureType( sal_Int16 nFailureType )
-throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
nType = nFailureType;
diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx
index bfd0875eb44e..a967745bc938 100644
--- a/linguistic/source/thesdsp.cxx
+++ b/linguistic/source/thesdsp.cxx
@@ -78,7 +78,6 @@ void ThesaurusDispatcher::ClearSvcList()
Sequence< Locale > SAL_CALL
ThesaurusDispatcher::getLocales()
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
@@ -95,7 +94,6 @@ Sequence< Locale > SAL_CALL
sal_Bool SAL_CALL
ThesaurusDispatcher::hasLocale( const Locale& rLocale )
- throw(RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
ThesSvcByLangMap_t::const_iterator aIt( aSvcMap.find( LinguLocaleToLanguage( rLocale ) ) );
@@ -107,7 +105,6 @@ Sequence< Reference< XMeaning > > SAL_CALL
ThesaurusDispatcher::queryMeanings(
const OUString& rTerm, const Locale& rLocale,
const PropertyValues& rProperties )
- throw(IllegalArgumentException, RuntimeException, std::exception)
{
MutexGuard aGuard( GetLinguMutex() );
diff --git a/linguistic/source/thesdsp.hxx b/linguistic/source/thesdsp.hxx
index 6cb7e4be8b39..236bf960a078 100644
--- a/linguistic/source/thesdsp.hxx
+++ b/linguistic/source/thesdsp.hxx
@@ -67,19 +67,15 @@ public:
// XSupportedLocales
virtual css::uno::Sequence< css::lang::Locale > SAL_CALL
- getLocales()
- throw(css::uno::RuntimeException, std::exception) override;
+ getLocales() override;
virtual sal_Bool SAL_CALL
- hasLocale( const css::lang::Locale& aLocale )
- throw(css::uno::RuntimeException, std::exception) override;
+ hasLocale( const css::lang::Locale& aLocale ) override;
// XThesaurus
virtual css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > SAL_CALL
queryMeanings( const OUString& aTerm,
const css::lang::Locale& aLocale,
- const css::beans::PropertyValues& aProperties )
- throw(css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const css::beans::PropertyValues& aProperties ) override;
// LinguDispatcher
virtual void