diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:28:58 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2017-01-26 12:54:43 +0000 |
commit | e57ca02849c3d87142ff5ff9099a212e72b8139c (patch) | |
tree | bcce66b27261553c308779f3e8663a269ed3a671 /editeng/source/uno | |
parent | 8802ebd5172ec4bc412a59d136c82b77ab452281 (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 'editeng/source/uno')
-rw-r--r-- | editeng/source/uno/UnoForbiddenCharsTable.cxx | 6 | ||||
-rw-r--r-- | editeng/source/uno/unofield.cxx | 30 | ||||
-rw-r--r-- | editeng/source/uno/unonrule.cxx | 25 | ||||
-rw-r--r-- | editeng/source/uno/unopracc.cxx | 10 | ||||
-rw-r--r-- | editeng/source/uno/unotext.cxx | 105 | ||||
-rw-r--r-- | editeng/source/uno/unotext2.cxx | 58 |
6 files changed, 62 insertions, 172 deletions
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx b/editeng/source/uno/UnoForbiddenCharsTable.cxx index 31d30d5471fa..779603096655 100644 --- a/editeng/source/uno/UnoForbiddenCharsTable.cxx +++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx @@ -44,7 +44,6 @@ void SvxUnoForbiddenCharsTable::onChange() } ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const lang::Locale& rLocale ) - throw(NoSuchElementException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -60,7 +59,6 @@ ForbiddenCharacters SvxUnoForbiddenCharsTable::getForbiddenCharacters( const lan } sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const lang::Locale& rLocale ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -74,7 +72,6 @@ sal_Bool SvxUnoForbiddenCharsTable::hasForbiddenCharacters( const lang::Locale& } void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const lang::Locale& rLocale, const ForbiddenCharacters& rForbiddenCharacters ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -88,7 +85,6 @@ void SvxUnoForbiddenCharsTable::setForbiddenCharacters(const lang::Locale& rLoca } void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const lang::Locale& rLocale ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -103,7 +99,6 @@ void SvxUnoForbiddenCharsTable::removeForbiddenCharacters( const lang::Locale& r // XSupportedLocales Sequence< lang::Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -126,7 +121,6 @@ Sequence< lang::Locale > SAL_CALL SvxUnoForbiddenCharsTable::getLocales() } sal_Bool SAL_CALL SvxUnoForbiddenCharsTable::hasLocale( const lang::Locale& aLocale ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx index 5a0dddd48186..b6d6b626dec4 100644 --- a/editeng/source/uno/unofield.cxx +++ b/editeng/source/uno/unofield.cxx @@ -228,7 +228,7 @@ const css::uno::Sequence< sal_Int8 > & SvxUnoTextField::getUnoTunnelId() throw() return theSvxUnoTextFieldUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw(css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxUnoTextField::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -516,7 +516,6 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const throw() // uno::XInterface uno::Any SAL_CALL SvxUnoTextField::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aAny; @@ -534,7 +533,6 @@ uno::Any SAL_CALL SvxUnoTextField::queryAggregation( const uno::Type & rType ) // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxUnoTextField::getTypes() - throw (uno::RuntimeException, std::exception) { if( maTypeSequence.getLength() == 0 ) { @@ -553,13 +551,11 @@ uno::Sequence< uno::Type > SAL_CALL SvxUnoTextField::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextField::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } uno::Any SAL_CALL SvxUnoTextField::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return OComponentHelper::queryInterface(rType); } @@ -576,7 +572,6 @@ void SAL_CALL SvxUnoTextField::release() throw( ) // Interface text::XTextField OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (bShowCommand) @@ -625,7 +620,6 @@ OUString SAL_CALL SvxUnoTextField::getPresentation( sal_Bool bShowCommand ) // Interface text::XTextContent void SAL_CALL SvxUnoTextField::attach( const uno::Reference< text::XTextRange >& xTextRange ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xTextRange ); if(pRange == nullptr) @@ -639,26 +633,22 @@ void SAL_CALL SvxUnoTextField::attach( const uno::Reference< text::XTextRange >& } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextField::getAnchor() - throw(uno::RuntimeException, std::exception) { return mxAnchor; } // lang::XComponent void SAL_CALL SvxUnoTextField::dispose() - throw(uno::RuntimeException, std::exception) { OComponentHelper::dispose(); } void SAL_CALL SvxUnoTextField::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException, std::exception) { OComponentHelper::addEventListener(xListener); } void SAL_CALL SvxUnoTextField::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw(uno::RuntimeException, std::exception) { OComponentHelper::removeEventListener(aListener); } @@ -666,14 +656,12 @@ void SAL_CALL SvxUnoTextField::removeEventListener( const uno::Reference< lang:: // Interface beans::XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SvxUnoTextField::getPropertySetInfo( ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpPropSet->getPropertySetInfo(); } void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -730,7 +718,6 @@ void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName, } uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -777,10 +764,10 @@ uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyNam return aValue; } -void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw(css::beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SvxUnoTextField::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SvxUnoTextField::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SvxUnoTextField::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) {} +void SAL_CALL SvxUnoTextField::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) {} // OComponentHelper void SvxUnoTextField::disposing() @@ -789,13 +776,12 @@ void SvxUnoTextField::disposing() } // lang::XServiceInfo -OUString SAL_CALL SvxUnoTextField::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxUnoTextField::getImplementationName() { return OUString("SvxUnoTextField"); } uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence<OUString> aSeq(4); OUString* pServices = aSeq.getArray(); @@ -871,12 +857,12 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextField::getSupportedServiceNames() return aSeq; } -sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxUnoTextField::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) throw(css::uno::Exception, css::uno::RuntimeException) +uno::Reference< uno::XInterface > SAL_CALL SvxUnoTextCreateTextField( const OUString& ServiceSpecifier ) { uno::Reference< uno::XInterface > xRet; diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx index 1970f5fb2c39..0c779fb2965b 100644 --- a/editeng/source/uno/unonrule.cxx +++ b/editeng/source/uno/unonrule.cxx @@ -93,7 +93,6 @@ SvxUnoNumberingRules::~SvxUnoNumberingRules() throw() //XIndexReplace void SAL_CALL SvxUnoNumberingRules::replaceByIndex( sal_Int32 Index, const uno::Any& Element ) - throw( IllegalArgumentException, IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -108,7 +107,7 @@ void SAL_CALL SvxUnoNumberingRules::replaceByIndex( sal_Int32 Index, const uno:: } // XIndexAccess -sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() { SolarMutexGuard aGuard; @@ -116,7 +115,6 @@ sal_Int32 SAL_CALL SvxUnoNumberingRules::getCount() throw( RuntimeException, std } Any SAL_CALL SvxUnoNumberingRules::getByIndex( sal_Int32 Index ) - throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -128,39 +126,38 @@ Any SAL_CALL SvxUnoNumberingRules::getByIndex( sal_Int32 Index ) //XElementAccess Type SAL_CALL SvxUnoNumberingRules::getElementType() - throw( RuntimeException, std::exception ) { return cppu::UnoType<Sequence< beans::PropertyValue >>::get(); } -sal_Bool SAL_CALL SvxUnoNumberingRules::hasElements() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL SvxUnoNumberingRules::hasElements() { return true; } // XAnyCompare -sal_Int16 SAL_CALL SvxUnoNumberingRules::compare( const Any& rAny1, const Any& rAny2 ) throw(RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxUnoNumberingRules::compare( const Any& rAny1, const Any& rAny2 ) { return SvxUnoNumberingRules::Compare( rAny1, rAny2 ); } // XCloneable -Reference< XCloneable > SAL_CALL SvxUnoNumberingRules::createClone( ) throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL SvxUnoNumberingRules::createClone( ) { return new SvxUnoNumberingRules(maRule); } -OUString SAL_CALL SvxUnoNumberingRules::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL SvxUnoNumberingRules::getImplementationName( ) { return OUString( "SvxUnoNumberingRules" ); } -sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoNumberingRules::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( ) { OUString aService( "com.sun.star.text.NumberingRules" ); Sequence< OUString > aSeq( &aService, 1 ); @@ -168,7 +165,6 @@ Sequence< OUString > SAL_CALL SvxUnoNumberingRules::getSupportedServiceNames( ) } Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal_Int32 nIndex) const - throw (RuntimeException, std::exception) { // NumberingRule aRule; const SvxNumberFormat& rFmt = maRule.GetLevel((sal_uInt16) nIndex); @@ -266,7 +262,6 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex(sal } void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::PropertyValue >& rProperties, sal_Int32 nIndex) - throw (RuntimeException, IllegalArgumentException, std::exception) { SvxNumberFormat aFmt(maRule.GetLevel( (sal_uInt16)nIndex )); const beans::PropertyValue* pPropArray = rProperties.getConstArray(); @@ -466,7 +461,7 @@ void SvxUnoNumberingRules::setNumberingRuleByIndex(const Sequence<beans::Propert maRule.SetLevel( (sal_uInt16)nIndex, aFmt ); } -const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule ) throw( IllegalArgumentException ) +const SvxNumRule& SvxGetNumRule( Reference< XIndexReplace > const & xRule ) { SvxUnoNumberingRules* pRule = SvxUnoNumberingRules::getImplementation( xRule ); if( pRule == nullptr ) @@ -492,10 +487,10 @@ css::uno::Reference< css::container::XIndexReplace > SvxCreateNumRule( const Svx class SvxUnoNumberingRulesCompare : public ::cppu::WeakAggImplHelper1< XAnyCompare > { public: - virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL compare( const Any& Any1, const Any& Any2 ) override; }; -sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 ) throw(RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxUnoNumberingRulesCompare::compare( const Any& Any1, const Any& Any2 ) { return SvxUnoNumberingRules::Compare( Any1, Any2 ); } diff --git a/editeng/source/uno/unopracc.cxx b/editeng/source/uno/unopracc.cxx index bae44d0a982c..a26ddd2123a2 100644 --- a/editeng/source/uno/unopracc.cxx +++ b/editeng/source/uno/unopracc.cxx @@ -41,14 +41,13 @@ SvxAccessibleTextPropertySet::~SvxAccessibleTextPropertySet() throw() { } -uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText() throw (uno::RuntimeException, std::exception) +uno::Reference< text::XText > SAL_CALL SvxAccessibleTextPropertySet::getText() { // TODO (empty?) return uno::Reference< text::XText > (); } uno::Any SAL_CALL SvxAccessibleTextPropertySet::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return OWeakObject::queryInterface(rType); } @@ -66,7 +65,7 @@ void SAL_CALL SvxAccessibleTextPropertySet::release() } // XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() throw ( uno::RuntimeException, std::exception ) +uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() { static ::cppu::OTypeCollection* pTypeCollection = nullptr ; @@ -95,18 +94,17 @@ uno::Sequence< uno::Type > SAL_CALL SvxAccessibleTextPropertySet::getTypes() thr } uno::Sequence< sal_Int8 > SAL_CALL SvxAccessibleTextPropertySet::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XServiceInfo -OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL SAL_CALL SvxAccessibleTextPropertySet::getImplementationName() { return OUString("SvxAccessibleTextPropertySet"); } -sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const OUString& sServiceName) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxAccessibleTextPropertySet::supportsService (const OUString& sServiceName) { return cppu::supportsService(this, sServiceName); } diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index d5d809eb1b8e..f3fe061c6f75 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -307,7 +307,6 @@ void SvxUnoTextRangeBase::SetSelection( const ESelection& rSelection ) throw() // Interface XTextRange ( XText ) uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -336,7 +335,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getStart() } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -364,7 +362,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextRangeBase::getEnd() } OUString SAL_CALL SvxUnoTextRangeBase::getString() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -382,7 +379,6 @@ OUString SAL_CALL SvxUnoTextRangeBase::getString() } void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString) - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; @@ -409,13 +405,11 @@ void SAL_CALL SvxUnoTextRangeBase::setString(const OUString& aString) // Interface beans::XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL SvxUnoTextRangeBase::getPropertySetInfo() - throw( uno::RuntimeException, std::exception ) { return mpPropSet->getPropertySetInfo(); } void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName, const uno::Any& aValue) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if (PropertyName == UNO_TR_PROP_SELECTION) { @@ -429,7 +423,6 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertyValue(const OUString& PropertyName } void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyName, const uno::Any& aValue, sal_Int32 nPara ) - throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -488,7 +481,7 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const OUString& PropertyNa throw beans::UnknownPropertyException(); } -void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) throw( beans::UnknownPropertyException, lang::IllegalArgumentException ) +void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rValue, const ESelection& rSelection, const SfxItemSet& rOldSet, SfxItemSet& rNewSet ) { if(!SetPropertyValueHelper( rOldSet, pMap, rValue, rNewSet, &rSelection, GetEditSource() )) { @@ -588,7 +581,6 @@ bool SvxUnoTextRangeBase::SetPropertyValueHelper( const SfxItemSet&, const SfxIt } uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& PropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if (PropertyName == UNO_TR_PROP_SELECTION) { @@ -605,7 +597,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyValue(const OUString& Property } uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& PropertyName, sal_Int32 nPara ) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -637,7 +628,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::_getPropertyValue(const OUString& Propert } void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, uno::Any& rAny, const SfxItemSet& rSet ) - throw (beans::UnknownPropertyException, uno::RuntimeException) { switch( pMap->nWID ) { @@ -683,7 +673,6 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM } bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxItemPropertySimpleEntry* pMap, uno::Any& aAny, const ESelection* pSelection /* = NULL */, SvxEditSource* pEditSource /* = NULL */ ) - throw( uno::RuntimeException ) { switch( pMap->nWID ) { @@ -758,18 +747,18 @@ bool SvxUnoTextRangeBase::GetPropertyValueHelper( SfxItemSet& rSet, const SfxIt } // is not (yet) supported -void SAL_CALL SvxUnoTextRangeBase::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextRangeBase::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} -void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) {} +void SAL_CALL SvxUnoTextRangeBase::addPropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SvxUnoTextRangeBase::removePropertyChangeListener( const OUString& , const uno::Reference< beans::XPropertyChangeListener >& ) {} +void SAL_CALL SvxUnoTextRangeBase::addVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} +void SAL_CALL SvxUnoTextRangeBase::removeVetoableChangeListener( const OUString& , const uno::Reference< beans::XVetoableChangeListener >& ) {} // XMultiPropertySet -void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) { _setPropertyValues( aPropertyNames, aValues ); } -void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) +void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues, sal_Int32 nPara ) { SolarMutexGuard aGuard; @@ -888,12 +877,12 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValues( const uno::Sequence< OUSt } } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException, std::exception) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) { return _getPropertyValues( aPropertyNames ); } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) throw (uno::RuntimeException) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( const uno::Sequence< OUString >& aPropertyNames, sal_Int32 nPara ) { SolarMutexGuard aGuard; @@ -932,21 +921,20 @@ uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::_getPropertyValues( cons return aValues; } -void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) { } -void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) { } // beans::XPropertyState beans::PropertyState SAL_CALL SvxUnoTextRangeBase::getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { return _getPropertyState( PropertyName ); } @@ -956,7 +944,6 @@ static const sal_uInt16 aSvxUnoFontDescriptorWhichMap[] = { EE_CHAR_FONTINFO, EE EE_CHAR_WLM, 0 }; beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { if ( pMap ) { @@ -1048,7 +1035,6 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const SfxIt } beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUString& PropertyName, sal_Int32 nPara /* = -1 */) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -1056,13 +1042,11 @@ beans::PropertyState SAL_CALL SvxUnoTextRangeBase::_getPropertyState(const OUStr } uno::Sequence< beans::PropertyState > SAL_CALL SvxUnoTextRangeBase::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { return _getPropertyStates( aPropertyName ); } uno::Sequence< beans::PropertyState > SvxUnoTextRangeBase::_getPropertyStates(const uno::Sequence< OUString >& PropertyName, sal_Int32 nPara /* = -1 */) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { const sal_Int32 nCount = PropertyName.getLength(); const OUString* pNames = PropertyName.getConstArray(); @@ -1193,13 +1177,11 @@ bool SvxUnoTextRangeBase::_getOnePropertyStates(const SfxItemSet* pSet, const Sf } void SAL_CALL SvxUnoTextRangeBase::setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { _setPropertyToDefault( PropertyName ); } void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sal_Int32 nPara /* = -1 */) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { SolarMutexGuard aGuard; @@ -1220,7 +1202,6 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(const OUString& PropertyName, sa } void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) - throw( beans::UnknownPropertyException, uno::RuntimeException ) { do { @@ -1262,7 +1243,6 @@ void SvxUnoTextRangeBase::_setPropertyToDefault(SvxTextForwarder* pForwarder, co } uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1309,7 +1289,6 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp // beans::XMultiPropertyStates void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1327,7 +1306,7 @@ void SAL_CALL SvxUnoTextRangeBase::setAllPropertiesToDefault() } } -void SAL_CALL SvxUnoTextRangeBase::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextRangeBase::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) { sal_Int32 nCount = aPropertyNames.getLength(); for( const OUString* pName = aPropertyNames.getConstArray(); nCount; pName++, nCount-- ) @@ -1336,7 +1315,7 @@ void SAL_CALL SvxUnoTextRangeBase::setPropertiesToDefault( const uno::Sequence< } } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextRangeBase::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) { sal_Int32 nCount = aPropertyNames.getLength(); uno::Sequence< uno::Any > ret( nCount ); @@ -1483,13 +1462,11 @@ void SvxUnoTextRangeBase::GotoEnd(bool Expand) throw() // lang::XServiceInfo sal_Bool SAL_CALL SvxUnoTextRangeBase::supportsService( const OUString& ServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -1504,7 +1481,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTextRangeBase::getSupportedServiceNames } // XTextRangeCompare -sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) { SvxUnoTextRangeBase* pR1 = SvxUnoTextRangeBase::getImplementation( xR1 ); SvxUnoTextRangeBase* pR2 = SvxUnoTextRangeBase::getImplementation( xR2 ); @@ -1528,7 +1505,7 @@ sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionStarts( const uno::Referenc } } -sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL SvxUnoTextRangeBase::compareRegionEnds( const uno::Reference< text::XTextRange >& xR1, const uno::Reference< text::XTextRange >& xR2 ) { SvxUnoTextRangeBase* pR1 = SvxUnoTextRangeBase::getImplementation( xR1 ); SvxUnoTextRangeBase* pR2 = SvxUnoTextRangeBase::getImplementation( xR2 ); @@ -1564,7 +1541,6 @@ SvxUnoTextRange::~SvxUnoTextRange() throw() } uno::Any SAL_CALL SvxUnoTextRange::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { QUERYINT( text::XTextRange ); else if( rType == cppu::UnoType<beans::XMultiPropertyStates>::get()) @@ -1583,7 +1559,6 @@ uno::Any SAL_CALL SvxUnoTextRange::queryAggregation( const uno::Type & rType ) } uno::Any SAL_CALL SvxUnoTextRange::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return OWeakAggObject::queryInterface(rType); } @@ -1630,27 +1605,23 @@ namespace } uno::Sequence< uno::Type > SAL_CALL SvxUnoTextRange::getTypes() - throw (uno::RuntimeException, std::exception) { return theSvxUnoTextRangeTypes::get(); } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextRange::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XTextRange uno::Reference< text::XText > SAL_CALL SvxUnoTextRange::getText() - throw(uno::RuntimeException, std::exception) { return xParentText; } // lang::XServiceInfo OUString SAL_CALL SvxUnoTextRange::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxUnoTextRange"); } @@ -1690,7 +1661,6 @@ SvxUnoTextBase::~SvxUnoTextBase() throw() // XInterface uno::Any SAL_CALL SvxUnoTextBase::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { QUERYINT( text::XText ); QUERYINT( text::XSimpleText ); @@ -1751,13 +1721,11 @@ namespace } uno::Sequence< uno::Type > SAL_CALL SvxUnoTextBase::getTypes() - throw (uno::RuntimeException, std::exception) { return theSvxUnoTextBaseTypes::get(); } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextBase::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1773,14 +1741,12 @@ uno::Reference< text::XTextCursor > SvxUnoTextBase::createTextCursorBySelection( // XSimpleText uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new SvxUnoTextCursor( *this ); } uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursorByRange( const uno::Reference< text::XTextRange >& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1797,7 +1763,6 @@ uno::Reference< text::XTextCursor > SAL_CALL SvxUnoTextBase::createTextCursorByR } void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRange >& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1829,7 +1794,6 @@ void SAL_CALL SvxUnoTextBase::insertString( const uno::Reference< text::XTextRan } void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text::XTextRange >& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1917,7 +1881,6 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter( const uno::Reference< text // XText void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTextRange >& xRange, const uno::Reference< text::XTextContent >& xContent, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1953,14 +1916,13 @@ void SAL_CALL SvxUnoTextBase::insertTextContent( const uno::Reference< text::XTe xPropSet->setPropertyValue(UNO_TR_PROP_SELECTION, uno::makeAny(aSel)); } -void SAL_CALL SvxUnoTextBase::removeTextContent( const uno::Reference< text::XTextContent >& ) throw(container::NoSuchElementException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextBase::removeTextContent( const uno::Reference< text::XTextContent >& ) { } // XTextRange uno::Reference< text::XText > SAL_CALL SvxUnoTextBase::getText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1975,23 +1937,21 @@ uno::Reference< text::XText > SAL_CALL SvxUnoTextBase::getText() } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::getStart() - throw(uno::RuntimeException, std::exception) { return SvxUnoTextRangeBase::getStart(); } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::getEnd() - throw(uno::RuntimeException, std::exception) { return SvxUnoTextRangeBase::getEnd(); } -OUString SAL_CALL SvxUnoTextBase::getString() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoTextBase::getString() { return SvxUnoTextRangeBase::getString(); } -void SAL_CALL SvxUnoTextBase::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextBase::setString( const OUString& aString ) { SvxUnoTextRangeBase::setString(aString); } @@ -1999,7 +1959,6 @@ void SAL_CALL SvxUnoTextBase::setString( const OUString& aString ) throw(uno::Ru // XEnumerationAccess uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextBase::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2012,12 +1971,12 @@ uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextBase::createEnumera } // XElementAccess ( container::XEnumerationAccess ) -uno::Type SAL_CALL SvxUnoTextBase::getElementType( ) throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL SvxUnoTextBase::getElementType( ) { return cppu::UnoType<text::XTextRange>::get(); } -sal_Bool SAL_CALL SvxUnoTextBase::hasElements( ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoTextBase::hasElements( ) { SolarMutexGuard aGuard; @@ -2033,7 +1992,6 @@ sal_Bool SAL_CALL SvxUnoTextBase::hasElements( ) throw(uno::RuntimeException, s // text::XTextRangeMover void SAL_CALL SvxUnoTextBase::moveTextRange( const uno::Reference< text::XTextRange >&, sal_Int16 ) - throw(uno::RuntimeException, std::exception) { } @@ -2046,7 +2004,6 @@ void SvxPropertyValuesToItemSet( const SfxItemPropertySet *pPropSet, SvxTextForwarder *pForwarder /*needed for WID_NUMLEVEL*/, sal_Int32 nPara /*needed for WID_NUMLEVEL*/) - throw(lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException) { sal_Int32 nProps = rPropertyVaules.getLength(); const beans::PropertyValue *pProps = rPropertyVaules.getConstArray(); @@ -2116,7 +2073,6 @@ void SvxPropertyValuesToItemSet( uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraphInsert( const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/, const uno::Reference< text::XTextRange >& /*rTextRange*/ ) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Reference< text::XTextRange > xRet; return xRet; @@ -2124,7 +2080,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraphInser uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::finishParagraph( const uno::Sequence< beans::PropertyValue >& rCharAndParaProps ) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2156,7 +2111,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( const OUString& /*rText*/, const uno::Sequence< beans::PropertyValue >& /*rCharAndParaProps*/, const uno::Reference< text::XTextRange>& /*rTextRange*/ ) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Reference< text::XTextRange > xRet; return xRet; @@ -2166,7 +2120,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::insertTextPortion( uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( const OUString& rText, const uno::Sequence< beans::PropertyValue >& rCharAndParaProps ) - throw (lang::IllegalArgumentException, beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2203,7 +2156,7 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextBase::appendTextPortion( } void SvxUnoTextBase::copyText( - const uno::Reference< text::XTextCopy >& xSource ) throw ( uno::RuntimeException, std::exception ) + const uno::Reference< text::XTextCopy >& xSource ) { SolarMutexGuard aGuard; uno::Reference< lang::XUnoTunnel > xUT( xSource, uno::UNO_QUERY ); @@ -2235,13 +2188,11 @@ void SvxUnoTextBase::copyText( // lang::XServiceInfo OUString SAL_CALL SvxUnoTextBase::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxUnoTextBase"); } uno::Sequence< OUString > SAL_CALL SvxUnoTextBase::getSupportedServiceNames( ) - throw(uno::RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -2272,7 +2223,7 @@ SvxUnoTextBase* SvxUnoTextBase::getImplementation( const uno::Reference< uno::XI return nullptr; } -sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxUnoTextBase::getSomething( const uno::Sequence< sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) @@ -2306,7 +2257,7 @@ SvxUnoText::~SvxUnoText() throw() } // uno::XInterface -uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType ) { uno::Any aAny( SvxUnoTextBase::queryAggregation( rType ) ); if( !aAny.hasValue() ) @@ -2315,7 +2266,7 @@ uno::Any SAL_CALL SvxUnoText::queryAggregation( const uno::Type & rType ) throw( return aAny; } -uno::Any SAL_CALL SvxUnoText::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL SvxUnoText::queryInterface( const uno::Type & rType ) { return OWeakAggObject::queryInterface( rType ); } @@ -2331,12 +2282,12 @@ void SAL_CALL SvxUnoText::release() throw( ) } // lang::XTypeProvider -uno::Sequence< uno::Type > SAL_CALL SvxUnoText::getTypes( ) throw( uno::RuntimeException, std::exception ) +uno::Sequence< uno::Type > SAL_CALL SvxUnoText::getTypes( ) { return SvxUnoTextBase::getTypes(); } -uno::Sequence< sal_Int8 > SAL_CALL SvxUnoText::getImplementationId( ) throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL SvxUnoText::getImplementationId( ) { return css::uno::Sequence<sal_Int8>(); } @@ -2351,7 +2302,7 @@ const uno::Sequence< sal_Int8 > & SvxUnoText::getUnoTunnelId() throw() return theSvxUnoTextUnoTunnelId::get().getSeq(); } -sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL SvxUnoText::getSomething( const uno::Sequence< sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) diff --git a/editeng/source/uno/unotext2.cxx b/editeng/source/uno/unotext2.cxx index e56443a1bea2..f1809e8dc25a 100644 --- a/editeng/source/uno/unotext2.cxx +++ b/editeng/source/uno/unotext2.cxx @@ -55,7 +55,6 @@ SvxUnoTextContentEnumeration::~SvxUnoTextContentEnumeration() throw() // container::XEnumeration sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements() - throw( uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; if( mpEditSource && mpEditSource->GetTextForwarder() ) @@ -64,7 +63,7 @@ sal_Bool SAL_CALL SvxUnoTextContentEnumeration::hasMoreElements() return false; } -uno::Any SvxUnoTextContentEnumeration::nextElement() throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) +uno::Any SvxUnoTextContentEnumeration::nextElement() { SolarMutexGuard aGuard; @@ -127,7 +126,7 @@ SvxUnoTextContent::~SvxUnoTextContent() throw() } // uno::XInterface -uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType ) { QUERYINT( text::XTextRange ); else QUERYINT( beans::XMultiPropertyStates ); @@ -146,7 +145,7 @@ uno::Any SAL_CALL SvxUnoTextContent::queryAggregation( const uno::Type & rType ) return OWeakAggObject::queryAggregation( rType ); } -uno::Any SAL_CALL SvxUnoTextContent::queryInterface( const uno::Type & rType ) throw( uno::RuntimeException, std::exception ) +uno::Any SAL_CALL SvxUnoTextContent::queryInterface( const uno::Type & rType ) { return OWeakAggObject::queryInterface(rType); } @@ -193,13 +192,11 @@ namespace } uno::Sequence< uno::Type > SAL_CALL SvxUnoTextContent::getTypes() - throw (uno::RuntimeException, std::exception) { return theSvxUnoTextContentTypes::get(); } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextContent::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -207,18 +204,16 @@ uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextContent::getImplementationId() // text::XTextRange uno::Reference< text::XText > SAL_CALL SvxUnoTextContent::getText() - throw(uno::RuntimeException, std::exception) { return mxParentText; } // text::XTextContent void SAL_CALL SvxUnoTextContent::attach( const uno::Reference< text::XTextRange >& ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { } -uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() { return uno::Reference< text::XTextRange >::query( mxParentText ); } @@ -226,7 +221,6 @@ uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextContent::getAnchor() throw // XComponent void SAL_CALL SvxUnoTextContent::dispose() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -244,13 +238,11 @@ void SAL_CALL SvxUnoTextContent::dispose() } void SAL_CALL SvxUnoTextContent::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw(uno::RuntimeException, std::exception) { maDisposeListeners.addInterface(xListener); } void SAL_CALL SvxUnoTextContent::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw(uno::RuntimeException, std::exception) { maDisposeListeners.removeInterface(aListener); } @@ -258,7 +250,6 @@ void SAL_CALL SvxUnoTextContent::removeEventListener( const uno::Reference< lang // XEnumerationAccess uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextContent::createEnumeration( ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -268,13 +259,11 @@ uno::Reference< container::XEnumeration > SAL_CALL SvxUnoTextContent::createEnum // XElementAccess ( container::XEnumerationAccess ) uno::Type SAL_CALL SvxUnoTextContent::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<text::XTextRange>::get(); } sal_Bool SAL_CALL SvxUnoTextContent::hasElements() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -294,24 +283,22 @@ sal_Bool SAL_CALL SvxUnoTextContent::hasElements() // XPropertySet void SAL_CALL SvxUnoTextContent::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { _setPropertyValue( aPropertyName, aValue, mnParagraph ); } uno::Any SAL_CALL SvxUnoTextContent::getPropertyValue( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { return _getPropertyValue( PropertyName, mnParagraph ); } // XMultiPropertySet -void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextContent::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) { _setPropertyValues( aPropertyNames, aValues, mnParagraph ); } -uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) throw (uno::RuntimeException, std::exception) +uno::Sequence< uno::Any > SAL_CALL SvxUnoTextContent::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) { return _getPropertyValues( aPropertyNames, mnParagraph ); } @@ -335,19 +322,16 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SvxUnoTextConte // beans::XPropertyState beans::PropertyState SAL_CALL SvxUnoTextContent::getPropertyState( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { return _getPropertyState( PropertyName, mnParagraph ); } uno::Sequence< beans::PropertyState > SAL_CALL SvxUnoTextContent::getPropertyStates( const uno::Sequence< OUString >& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { return _getPropertyStates( aPropertyName, mnParagraph ); } void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { _setPropertyToDefault( PropertyName, mnParagraph ); } @@ -355,13 +339,11 @@ void SAL_CALL SvxUnoTextContent::setPropertyToDefault( const OUString& PropertyN // lang::XServiceInfo OUString SAL_CALL SvxUnoTextContent::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("SvxUnoTextContent"); } uno::Sequence< OUString > SAL_CALL SvxUnoTextContent::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.style.ParagraphProperties", @@ -404,7 +386,6 @@ SvxUnoTextRangeEnumeration::~SvxUnoTextRangeEnumeration() throw() // container::XEnumeration sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -412,7 +393,6 @@ sal_Bool SAL_CALL SvxUnoTextRangeEnumeration::hasMoreElements() } uno::Any SAL_CALL SvxUnoTextRangeEnumeration::nextElement() - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -475,7 +455,6 @@ SvxUnoTextCursor::~SvxUnoTextCursor() throw() // Please use the XTypeProvider! //sal_Bool SvxUnoTextCursor::queryInterface( uno::Uik aUIK, Reference< uno::XInterface > & xRef) uno::Any SAL_CALL SvxUnoTextCursor::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { if( rType == cppu::UnoType<text::XTextRange>::get()) return uno::makeAny(uno::Reference< text::XTextRange >(static_cast<SvxUnoTextRangeBase *>(this))); @@ -493,7 +472,6 @@ uno::Any SAL_CALL SvxUnoTextCursor::queryAggregation( const uno::Type & rType ) } uno::Any SAL_CALL SvxUnoTextCursor::queryInterface( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { return OWeakAggObject::queryInterface(rType); } @@ -538,69 +516,59 @@ namespace // XTypeProvider uno::Sequence< uno::Type > SAL_CALL SvxUnoTextCursor::getTypes() - throw(uno::RuntimeException, std::exception) { return theSvxUnoTextCursorTypes::get(); } uno::Sequence< sal_Int8 > SAL_CALL SvxUnoTextCursor::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // text::XTextCursor void SAL_CALL SvxUnoTextCursor::collapseToStart() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; CollapseToStart(); } void SAL_CALL SvxUnoTextCursor::collapseToEnd() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; CollapseToEnd(); } sal_Bool SAL_CALL SvxUnoTextCursor::isCollapsed() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return IsCollapsed(); } sal_Bool SAL_CALL SvxUnoTextCursor::goLeft( sal_Int16 nCount, sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GoLeft( nCount, bExpand ); } sal_Bool SAL_CALL SvxUnoTextCursor::goRight( sal_Int16 nCount, sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GoRight( nCount, bExpand ); } void SAL_CALL SvxUnoTextCursor::gotoStart( sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GotoStart( bExpand ); } void SAL_CALL SvxUnoTextCursor::gotoEnd( sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GotoEnd( bExpand ); } void SAL_CALL SvxUnoTextCursor::gotoRange( const uno::Reference< text::XTextRange >& xRange, sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { if( !xRange.is() ) return; @@ -623,44 +591,42 @@ void SAL_CALL SvxUnoTextCursor::gotoRange( const uno::Reference< text::XTextRang } // text::XTextRange (rest in SvxTextRange) -uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText() throw( uno::RuntimeException, std::exception ) +uno::Reference< text::XText > SAL_CALL SvxUnoTextCursor::getText() { return mxParentText; } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextCursor::getStart() - throw(uno::RuntimeException, std::exception) { return SvxUnoTextRangeBase::getStart(); } uno::Reference< text::XTextRange > SAL_CALL SvxUnoTextCursor::getEnd() - throw(uno::RuntimeException, std::exception) { return SvxUnoTextRangeBase::getEnd(); } -OUString SAL_CALL SvxUnoTextCursor::getString() throw( uno::RuntimeException, std::exception ) +OUString SAL_CALL SvxUnoTextCursor::getString() { return SvxUnoTextRangeBase::getString(); } -void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString ) throw(uno::RuntimeException, std::exception) +void SAL_CALL SvxUnoTextCursor::setString( const OUString& aString ) { SvxUnoTextRangeBase::setString(aString); } // lang::XServiceInfo -OUString SAL_CALL SvxUnoTextCursor::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL SvxUnoTextCursor::getImplementationName() { return OUString("SvxUnoTextCursor"); } -sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL SvxUnoTextCursor::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } -uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL SvxUnoTextCursor::getSupportedServiceNames() { uno::Sequence< OUString > aSeq( SvxUnoTextRangeBase::getSupportedServiceNames() ); comphelper::ServiceInfoHelper::addToSequence( aSeq, {"com.sun.star.style.ParagraphProperties", |