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 /sc/source/ui/unoobj | |
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 'sc/source/ui/unoobj')
43 files changed, 488 insertions, 1632 deletions
diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx index f4686de887e9..e90b32192256 100644 --- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx +++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx @@ -44,7 +44,6 @@ ScChartRangeSelectionListener::~ScChartRangeSelectionListener() // ____ XModifyListener ____ void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::data::XRangeHighlighter > xRangeHighlighter( aEvent.Source, uno::UNO_QUERY ); if( xRangeHighlighter.is()) @@ -62,7 +61,6 @@ void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::Event // ____ XEventListener ____ void SAL_CALL ScChartRangeSelectionListener::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException, std::exception) { } diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index ea22d9b824d5..46087c12903e 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -93,7 +93,6 @@ bool ScAddressConversionObj::ParseUIString( const OUString& rUIString, ::formula // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -130,9 +129,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAddressConversionObj::getProp } void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if ( !pDocShell ) throw uno::RuntimeException(); @@ -215,8 +211,6 @@ void SAL_CALL ScAddressConversionObj::setPropertyValue( const OUString& aPropert } uno::Any SAL_CALL ScAddressConversionObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if ( !pDocShell ) throw uno::RuntimeException(); @@ -285,19 +279,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAddressConversionObj ) // lang::XServiceInfo -OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAddressConversionObj::getImplementationName() { return OUString("ScAddressConversionObj" ); } sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScAddressConversionObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { if (bIsRange) return {SC_SERVICENAME_RANGEADDRESS}; diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index d6efeac255c0..6e42bc44e8c5 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -201,9 +201,6 @@ ScAutoFormatObj* ScAutoFormatsObj::GetObjectByName_Impl(const OUString& aName) // container::XNameContainer void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno::Any& aElement ) - throw (lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -255,8 +252,6 @@ void SAL_CALL ScAutoFormatsObj::insertByName( const OUString& aName, const uno:: } void SAL_CALL ScAutoFormatsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //! zusammenfassen? @@ -265,8 +260,6 @@ void SAL_CALL ScAutoFormatsObj::replaceByName( const OUString& aName, const uno: } void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -288,7 +281,6 @@ void SAL_CALL ScAutoFormatsObj::removeByName( const OUString& aName ) // container::XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); @@ -296,15 +288,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatsObj::createEnumera // container::XIndexAccess -sal_Int32 SAL_CALL ScAutoFormatsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAutoFormatsObj::getCount() { SolarMutexGuard aGuard; return ScGlobal::GetOrCreateAutoFormat()->size(); } uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< container::XNamed > xFormat(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -313,13 +303,13 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByIndex( sal_Int32 nIndex ) return uno::makeAny(xFormat); } -uno::Type SAL_CALL ScAutoFormatsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScAutoFormatsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<container::XNamed>::get(); // muss zu getByIndex passen } -sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -328,8 +318,6 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasElements() throw(uno::RuntimeException, s // container::XNameAccess uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< container::XNamed > xFormat(GetObjectByName_Impl(aName)); @@ -339,7 +327,6 @@ uno::Any SAL_CALL ScAutoFormatsObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScAutoFormatsObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -354,7 +341,6 @@ uno::Sequence<OUString> SAL_CALL ScAutoFormatsObj::getElementNames() } sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nDummy; @@ -392,7 +378,7 @@ void ScAutoFormatObj::InitFormat( sal_uInt16 nNewIndex ) // XUnoTunnel sal_Int64 SAL_CALL ScAutoFormatObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -435,7 +421,6 @@ ScAutoFormatFieldObj* ScAutoFormatObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) // container::XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableAutoFormatEnumeration")); @@ -443,7 +428,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAutoFormatObj::createEnumerat // container::XIndexAccess -sal_Int32 SAL_CALL ScAutoFormatObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAutoFormatObj::getCount() { SolarMutexGuard aGuard; if (IsInserted()) @@ -453,8 +438,6 @@ sal_Int32 SAL_CALL ScAutoFormatObj::getCount() throw(uno::RuntimeException, std: } uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -466,13 +449,13 @@ uno::Any SAL_CALL ScAutoFormatObj::getByIndex( sal_Int32 nIndex ) return uno::Any(); } -uno::Type SAL_CALL ScAutoFormatObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScAutoFormatObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<beans::XPropertySet>::get(); // muss zu getByIndex passen } -sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAutoFormatObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -480,7 +463,7 @@ sal_Bool SAL_CALL ScAutoFormatObj::hasElements() throw(uno::RuntimeException, st // container::XNamed -OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAutoFormatObj::getName() { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -491,7 +474,6 @@ OUString SAL_CALL ScAutoFormatObj::getName() throw(uno::RuntimeException, std::e } void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -534,7 +516,6 @@ void SAL_CALL ScAutoFormatObj::setName( const OUString& aNewName ) // beans::XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); @@ -543,9 +524,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatObj::getPropertySet void SAL_CALL ScAutoFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -576,8 +554,6 @@ void SAL_CALL ScAutoFormatObj::setPropertyValue( } uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aAny; @@ -629,7 +605,6 @@ ScAutoFormatFieldObj::~ScAutoFormatFieldObj() // beans::XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatFieldObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( aPropSet.getPropertyMap() )); @@ -638,9 +613,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAutoFormatFieldObj::getProper void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAutoFormat* pFormats = ScGlobal::GetOrCreateAutoFormat(); @@ -742,8 +714,6 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue( } uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aVal; diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 242b8a03fd8b..f5b0e77ef683 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -199,7 +199,7 @@ uno::Sequence<OUString> ScSpreadsheetSettings::getSupportedServiceNames_Static() return aRet; } -bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName) throw (css::uno::RuntimeException) +bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName) { uno::Any any = getPropertyValue(aPropertyName); bool b = false; @@ -207,7 +207,7 @@ bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName) throw return b; } -sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException) +sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName) { uno::Any any = getPropertyValue(aPropertyName); sal_Int16 b = 0; @@ -218,7 +218,6 @@ sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName) // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -228,9 +227,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettings::getPrope void SAL_CALL ScSpreadsheetSettings::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -386,8 +382,6 @@ void SAL_CALL ScSpreadsheetSettings::setPropertyValue( } uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -472,7 +466,6 @@ ScRecentFunctionsObj_get_implementation(css::uno::XComponentContext*, css::uno:: // XRecentFunctions uno::Sequence<sal_Int32> SAL_CALL ScRecentFunctionsObj::getRecentFunctionIds() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScAppOptions& rOpt = SC_MOD()->GetAppOptions(); @@ -491,7 +484,6 @@ uno::Sequence<sal_Int32> SAL_CALL ScRecentFunctionsObj::getRecentFunctionIds() void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( const uno::Sequence<sal_Int32>& aRecentFunctionIds ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = (sal_uInt16) std::min( aRecentFunctionIds.getLength(), (sal_Int32) LRU_MAX ); @@ -507,7 +499,7 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds( pScMod->SetAppOptions(aNewOpts); } -sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() { return LRU_MAX; } @@ -587,7 +579,6 @@ static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, co // XFunctionDescriptions uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int32 nId ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); @@ -614,8 +605,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFunctionListObj::getById( sal_Int // XNameAccess uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); @@ -642,7 +631,7 @@ uno::Any SAL_CALL ScFunctionListObj::getByName( const OUString& aName ) // XIndexAccess -sal_Int32 SAL_CALL ScFunctionListObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScFunctionListObj::getCount() { SolarMutexGuard aGuard; sal_Int32 nCount = 0; @@ -653,8 +642,6 @@ sal_Int32 SAL_CALL ScFunctionListObj::getCount() throw(uno::RuntimeException, st } uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); @@ -680,7 +667,6 @@ uno::Any SAL_CALL ScFunctionListObj::getByIndex( sal_Int32 nIndex ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.FunctionDescriptionEnumeration")); @@ -688,19 +674,19 @@ uno::Reference<container::XEnumeration> SAL_CALL ScFunctionListObj::createEnumer // XElementAccess -uno::Type SAL_CALL ScFunctionListObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScFunctionListObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } -sal_Bool SAL_CALL ScFunctionListObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScFunctionListObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() > 0 ); } -uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); @@ -721,7 +707,6 @@ uno::Sequence<OUString> SAL_CALL ScFunctionListObj::getElementNames() throw(uno: } sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScFunctionList* pFuncList = ScGlobal::GetStarCalcFunctionList(); diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index c17c239a4a72..d826d75e8e16 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -92,7 +92,7 @@ namespace calc // TODO: clean up here whatever you need to clean up (e.g. revoking listeners etc.) } - Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo( ) { return createPropertySetInfo( getInfoHelper() ) ; } @@ -132,17 +132,17 @@ namespace calc // TODO: error message } - OUString SAL_CALL OCellListSource::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OCellListSource::getImplementationName( ) { return OUString( "com.sun.star.comp.sheet.OCellListSource" ); } - sal_Bool SAL_CALL OCellListSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OCellListSource::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OCellListSource::getSupportedServiceNames( ) { return {"com.sun.star.table.CellRangeListSource", "com.sun.star.form.binding.ListEntrySource"}; @@ -172,7 +172,7 @@ namespace calc return sText; } - sal_Int32 SAL_CALL OCellListSource::getListEntryCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OCellListSource::getListEntryCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -182,7 +182,7 @@ namespace calc return aAddress.EndRow - aAddress.StartRow + 1; } - OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -194,7 +194,7 @@ namespace calc return getCellTextContent_noCheck( _nPosition ); } - Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -210,7 +210,7 @@ namespace calc return aAllEntries; } - void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -222,7 +222,7 @@ namespace calc m_aListEntryListeners.addInterface( _rxListener ); } - void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) + void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(); @@ -234,7 +234,7 @@ namespace calc m_aListEntryListeners.removeInterface( _rxListener ); } - void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) + void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) { notifyModified(); } @@ -263,7 +263,7 @@ namespace calc } - void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) { Reference<XInterface> xRangeInt( m_xRange, UNO_QUERY ); if ( xRangeInt == aEvent.Source ) @@ -273,7 +273,7 @@ namespace calc } } - void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments ) { if ( m_bInitialized ) throw Exception(); diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 9f9aa76d26ac..2763c768bc2d 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -85,22 +85,22 @@ namespace calc DECLARE_XTYPEPROVIDER() // XListEntrySource - virtual sal_Int32 SAL_CALL getListEntryCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) throw (css::lang::NullPointerException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getListEntryCount( ) override; + virtual OUString SAL_CALL getListEntry( sal_Int32 Position ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllListEntries( ) override; + virtual void SAL_CALL addListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) override; + virtual void SAL_CALL removeListEntryListener( const css::uno::Reference< css::form::binding::XListEntryListener >& Listener ) override; // OComponentHelper/XComponent virtual void SAL_CALL disposing() 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; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -110,11 +110,11 @@ namespace calc virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; private: void checkDisposed( ) const; diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 536e227a9d94..f387325c6faf 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -1750,7 +1750,6 @@ void ScCellRangesBase::SetCursorOnly( bool bSet ) } uno::Any SAL_CALL ScCellRangesBase::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( beans::XPropertySet ) SC_QUERYINTERFACE( beans::XMultiPropertySet ) @@ -1782,7 +1781,7 @@ void SAL_CALL ScCellRangesBase::release() throw() OWeakObject::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -1807,7 +1806,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesBase::getTypes() throw(uno::Runtim } uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1821,7 +1819,6 @@ void ScCellRangesBase::PaintGridRanges_Impl( ) // XSheetOperation double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunction ) - throw(uno::Exception, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScMarkData aMark(*GetMarkData()); @@ -1841,7 +1838,7 @@ double SAL_CALL ScCellRangesBase::computeFunction( sheet::GeneralFunction nFunct return fVal; } -void SAL_CALL ScCellRangesBase::clearContents( sal_Int32 nContentFlags ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::clearContents( sal_Int32 nContentFlags ) { SolarMutexGuard aGuard; if ( !aRanges.empty() ) @@ -1943,7 +1940,6 @@ beans::PropertyState ScCellRangesBase::GetOnePropertyState( sal_uInt16 nItemWhic } beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aRanges.empty() ) @@ -1958,7 +1954,6 @@ beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const OUString uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates( const uno::Sequence<OUString>& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1977,7 +1972,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates } void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -2022,8 +2016,6 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const OUString& aPropertyN } uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { //! mit getPropertyValue zusammenfassen @@ -2130,7 +2122,6 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const OUString& aPropert // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangesBase::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -2250,9 +2241,6 @@ static void lcl_SetCellProperty( const SfxItemPropertySimpleEntry& rEntry, const void SAL_CALL ScCellRangesBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2268,7 +2256,6 @@ void SAL_CALL ScCellRangesBase::setPropertyValue( } void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -2466,8 +2453,6 @@ void ScCellRangesBase::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pE } uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2485,7 +2470,6 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const OUString& aPropertyN } void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -2635,8 +2619,6 @@ void ScCellRangesBase::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aRanges.empty() ) @@ -2647,8 +2629,6 @@ void SAL_CALL ScCellRangesBase::addPropertyChangeListener( const OUString& /* aP void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aRanges.empty() ) @@ -2659,16 +2639,12 @@ void SAL_CALL ScCellRangesBase::removePropertyChangeListener( const OUString& /* void SAL_CALL ScCellRangesBase::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -2677,10 +2653,6 @@ void SAL_CALL ScCellRangesBase::removeVetoableChangeListener( const OUString&, void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) - throw (beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2767,7 +2739,6 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< OUString uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2785,20 +2756,17 @@ uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues( void SAL_CALL ScCellRangesBase::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScCellRangesBase::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -2818,7 +2786,6 @@ IMPL_LINK( ScCellRangesBase, ValueListenerHdl, const SfxHint&, rHint, void ) // XTolerantMultiPropertySet uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::setPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2937,7 +2904,6 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set } uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::getPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2967,7 +2933,6 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get } uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBase::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& aPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3006,7 +2971,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas // XIndent -void SAL_CALL ScCellRangesBase::decrementIndent() throw(css::uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::decrementIndent() { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun @@ -3018,7 +2983,7 @@ void SAL_CALL ScCellRangesBase::decrementIndent() throw(css::uno::RuntimeExcepti } } -void SAL_CALL ScCellRangesBase::incrementIndent() throw(css::uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangesBase::incrementIndent() { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) // leer = nichts zu tun @@ -3082,7 +3047,6 @@ ScMemChart* ScCellRangesBase::CreateMemChart_Impl() const } uno::Sequence< uno::Sequence<double> > SAL_CALL ScCellRangesBase::getData() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl()); @@ -3143,7 +3107,6 @@ ScRangeListRef ScCellRangesBase::GetLimitedChartRanges_Impl( long nDataColumns, } void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<double> >& aData ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3196,7 +3159,6 @@ void SAL_CALL ScCellRangesBase::setData( const uno::Sequence< uno::Sequence<doub } uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl()); @@ -3215,7 +3177,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getRowDescriptions() void SAL_CALL ScCellRangesBase::setRowDescriptions( const uno::Sequence<OUString>& aRowDescriptions ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3267,7 +3228,6 @@ void SAL_CALL ScCellRangesBase::setRowDescriptions( } uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; std::unique_ptr<ScMemChart> pMemChart(CreateMemChart_Impl()); @@ -3286,7 +3246,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesBase::getColumnDescriptions() void SAL_CALL ScCellRangesBase::setColumnDescriptions( const uno::Sequence<OUString>& aColumnDescriptions ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3361,7 +3320,6 @@ void ScCellRangesBase::ForceChartListener_Impl() void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Reference< chart::XChartDataChangeEventListener >& aListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) @@ -3385,7 +3343,6 @@ void SAL_CALL ScCellRangesBase::addChartDataChangeEventListener( const uno::Refe void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::Reference< chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell && !aRanges.empty() ) @@ -3396,13 +3353,13 @@ void SAL_CALL ScCellRangesBase::removeChartDataChangeEventListener( const uno::R } } -double SAL_CALL ScCellRangesBase::getNotANumber() throw(css::uno::RuntimeException, std::exception) +double SAL_CALL ScCellRangesBase::getNotANumber() { // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will return DBL_MIN; } -sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) { // im ScChartArray wird DBL_MIN verwendet, weil das Chart es so will return (nNumber == DBL_MIN); @@ -3411,7 +3368,6 @@ sal_Bool SAL_CALL ScCellRangesBase::isNotANumber( double nNumber ) throw(uno::Ru // XModifyBroadcaster void SAL_CALL ScCellRangesBase::addModifyListener(const uno::Reference<util::XModifyListener>& aListener) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aRanges.empty() ) @@ -3433,7 +3389,6 @@ void SAL_CALL ScCellRangesBase::addModifyListener(const uno::Reference<util::XMo } void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util::XModifyListener>& aListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3468,7 +3423,6 @@ void SAL_CALL ScCellRangesBase::removeModifyListener( const uno::Reference<util: // XCellRangesQuery uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3508,7 +3462,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryVisibleC } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3544,7 +3497,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryEmptyCel uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentCells( sal_Int16 nContentFlags ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3634,7 +3586,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryContentC uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryFormulaCells( sal_Int32 nResultFlags ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3772,21 +3723,21 @@ uno::Reference<sheet::XSheetCellRanges> ScCellRangesBase::QueryDifferences_Impl( } uno::Reference<sheet::XSheetCellRanges > SAL_CALL ScCellRangesBase::queryColumnDifferences( - const table::CellAddress& aCompare ) throw(uno::RuntimeException, std::exception) + const table::CellAddress& aCompare ) { SolarMutexGuard aGuard; return QueryDifferences_Impl( aCompare, true ); } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryRowDifferences( - const table::CellAddress& aCompare ) throw(uno::RuntimeException, std::exception) + const table::CellAddress& aCompare ) { SolarMutexGuard aGuard; return QueryDifferences_Impl( aCompare, false ); } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersection( - const table::CellRangeAddress& aRange ) throw(uno::RuntimeException, std::exception) + const table::CellRangeAddress& aRange ) { SolarMutexGuard aGuard; ScRange aMask( (SCCOL)aRange.StartColumn, (SCROW)aRange.StartRow, aRange.Sheet, @@ -3811,7 +3762,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryIntersec // XFormulaQuery uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPrecedents( - sal_Bool bRecursive ) throw(uno::RuntimeException, std::exception) + sal_Bool bRecursive ) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -3860,7 +3811,7 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryPreceden } uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependents( - sal_Bool bRecursive ) throw(uno::RuntimeException, std::exception) + sal_Bool bRecursive ) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -3921,7 +3872,6 @@ uno::Reference<sheet::XSheetCellRanges> SAL_CALL ScCellRangesBase::queryDependen // XSearchable uno::Reference<util::XSearchDescriptor> SAL_CALL ScCellRangesBase::createSearchDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScCellSearchObj; @@ -3929,8 +3879,6 @@ uno::Reference<util::XSearchDescriptor> SAL_CALL ScCellRangesBase::createSearchD uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangesBase::findAll( const uno::Reference<util::XSearchDescriptor>& xDesc ) - throw(uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; // Wenn nichts gefunden wird, soll Null zurueckgegeben werden (?) @@ -4016,7 +3964,6 @@ uno::Reference<uno::XInterface> ScCellRangesBase::Find_Impl( uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findFirst( const uno::Reference<util::XSearchDescriptor>& xDesc ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return Find_Impl( xDesc, nullptr ); @@ -4025,7 +3972,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findFirst( uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext( const uno::Reference<uno::XInterface>& xStartAt, const uno::Reference<util::XSearchDescriptor >& xDesc ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xStartAt.is() ) @@ -4047,15 +3993,12 @@ uno::Reference<uno::XInterface> SAL_CALL ScCellRangesBase::findNext( // XReplaceable uno::Reference<util::XReplaceDescriptor> SAL_CALL ScCellRangesBase::createReplaceDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScCellSearchObj; } sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSearchDescriptor>& xDesc ) - throw(uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; sal_Int32 nReplaced = 0; @@ -4139,7 +4082,7 @@ sal_Int32 SAL_CALL ScCellRangesBase::replaceAll( const uno::Reference<util::XSea // XUnoTunnel sal_Int64 SAL_CALL ScCellRangesBase::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -4194,7 +4137,6 @@ void ScCellRangesObj::RefChanged() } uno::Any SAL_CALL ScCellRangesObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XSheetCellRangeContainer ) SC_QUERYINTERFACE( sheet::XSheetCellRanges ) @@ -4218,7 +4160,7 @@ void SAL_CALL ScCellRangesObj::release() throw() ScCellRangesBase::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -4240,7 +4182,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangesObj::getTypes() throw(uno::Runtime } uno::Sequence<sal_Int8> SAL_CALL ScCellRangesObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -4264,7 +4205,6 @@ ScCellRangeObj* ScCellRangesObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const } uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddresses() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -4287,7 +4227,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScCellRangesObj::getRangeAddress } uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4304,7 +4243,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellRangesObj::getCells } OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aString; @@ -4319,7 +4257,6 @@ OUString SAL_CALL ScCellRangesObj::getRangeAddressesAsString() void SAL_CALL ScCellRangesObj::addRangeAddress( const table::CellRangeAddress& rRange, sal_Bool bMergeRanges ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aRange(static_cast<SCCOL>(rRange.StartColumn), @@ -4340,8 +4277,6 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const ScR } void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress& rRange ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -4389,7 +4324,6 @@ void SAL_CALL ScCellRangesObj::removeRangeAddress( const table::CellRangeAddress void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRanges, sal_Bool bMergeRanges ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Int32 nCount(rRanges.getLength()); @@ -4410,8 +4344,6 @@ void SAL_CALL ScCellRangesObj::addRangeAddresses( const uno::Sequence<table::Cel } void SAL_CALL ScCellRangesObj::removeRangeAddresses( const uno::Sequence<table::CellRangeAddress >& rRangeSeq ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) { // use sometimes a better/faster implementation sal_uInt32 nCount(rRangeSeq.getLength()); @@ -4436,9 +4368,6 @@ static void lcl_RemoveNamedEntry( ScNamedEntryArr_Impl& rNamedEntries, const OUS } void SAL_CALL ScCellRangesObj::insertByName( const OUString& aName, const uno::Any& aElement ) - throw (lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -4564,8 +4493,6 @@ static bool lcl_FindRangeOrEntry( const ScNamedEntryArr_Impl& rNamedEntries, } void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -4629,8 +4556,6 @@ void SAL_CALL ScCellRangesObj::removeByName( const OUString& aName ) // XNameReplace void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //! zusammenfassen? @@ -4641,8 +4566,6 @@ void SAL_CALL ScCellRangesObj::replaceByName( const OUString& aName, const uno:: // XNameAccess uno::Any SAL_CALL ScCellRangesObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -4679,7 +4602,6 @@ static bool lcl_FindEntryName( const ScNamedEntryArr_Impl& rNamedEntries, } uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4710,7 +4632,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getElementNames() } sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -4723,7 +4644,6 @@ sal_Bool SAL_CALL ScCellRangesObj::hasByName( const OUString& aName ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetCellRangesEnumeration")); @@ -4731,7 +4651,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellRangesObj::createEnumerat // XIndexAccess -sal_Int32 SAL_CALL ScCellRangesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScCellRangesObj::getCount() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -4739,8 +4659,6 @@ sal_Int32 SAL_CALL ScCellRangesObj::getCount() throw(uno::RuntimeException, std: } uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xRange(GetObjectByIndex_Impl(nIndex)); @@ -4750,13 +4668,13 @@ uno::Any SAL_CALL ScCellRangesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScCellRangesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellRangesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCellRange>::get(); } -sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellRangesObj::hasElements() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -4764,19 +4682,17 @@ sal_Bool SAL_CALL ScCellRangesObj::hasElements() throw(uno::RuntimeException, st } // XServiceInfo -OUString SAL_CALL ScCellRangesObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellRangesObj::getImplementationName() { return OUString( "ScCellRangesObj" ); } sal_Bool SAL_CALL ScCellRangesObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellRangesObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSHEETCELLRANGES_SERVICE, SCCELLPROPERTIES_SERVICE, @@ -4819,7 +4735,6 @@ void ScCellRangeObj::RefChanged() } uno::Any SAL_CALL ScCellRangeObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XCellRangeAddressable ) SC_QUERYINTERFACE( table::XCellRange ) @@ -4854,7 +4769,7 @@ void SAL_CALL ScCellRangeObj::release() throw() ScCellRangesBase::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -4890,7 +4805,6 @@ uno::Sequence<uno::Type> SAL_CALL ScCellRangeObj::getTypes() throw(uno::RuntimeE } uno::Sequence<sal_Int8> SAL_CALL ScCellRangeObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -4902,7 +4816,6 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangeObj::getImplementationId() uno::Reference<table::XCell> ScCellRangeObj::GetCellByPosition_Impl( sal_Int32 nColumn, sal_Int32 nRow ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException) { ScDocShell* pDocSh = GetDocShell(); if (!pDocSh) @@ -4925,7 +4838,6 @@ uno::Reference<table::XCell> ScCellRangeObj::GetCellByPosition_Impl( uno::Reference<table::XCell> SAL_CALL ScCellRangeObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4934,7 +4846,6 @@ uno::Reference<table::XCell> SAL_CALL ScCellRangeObj::getCellByPosition( uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -4962,13 +4873,13 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByPositio } uno::Reference<table::XCellRange> SAL_CALL ScCellRangeObj::getCellRangeByName( - const OUString& aName ) throw(uno::RuntimeException, std::exception) + const OUString& aName ) { return getCellRangeByName( aName, ScAddress::detailsOOOa1 ); } uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( - const OUString& aName, const ScAddress::Details& rDetails ) throw(uno::RuntimeException) + const OUString& aName, const ScAddress::Details& rDetails ) { // name refers to the whole document (with the range's table as default), // valid only if the range is within this range @@ -5020,7 +4931,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::getCellRangeByName( // XColumnRowRange -uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() throw(uno::RuntimeException, std::exception) +uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5032,7 +4943,7 @@ uno::Reference<table::XTableColumns> SAL_CALL ScCellRangeObj::getColumns() throw return nullptr; } -uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() throw(uno::RuntimeException, std::exception) +uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5046,7 +4957,7 @@ uno::Reference<table::XTableRows> SAL_CALL ScCellRangeObj::getRows() throw(uno:: // XAddressableCellRange -table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -5057,7 +4968,6 @@ table::CellRangeAddress SAL_CALL ScCellRangeObj::getRangeAddress() throw(uno::Ru // XSheetCellRange uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5070,7 +4980,7 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellRangeObj::getSpreadsheet() // XArrayFormulaRange -OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellRangeObj::getArrayFormula() { SolarMutexGuard aGuard; @@ -5104,7 +5014,6 @@ OUString SAL_CALL ScCellRangeObj::getArrayFormula() throw(uno::RuntimeException, void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar) - throw (uno::RuntimeException, std::exception) { ScDocShell* pDocSh = GetDocShell(); if (pDocSh) @@ -5131,7 +5040,6 @@ void ScCellRangeObj::SetArrayFormula_Impl(const OUString& rFormula, } void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // GRAM_API for API compatibility. @@ -5140,7 +5048,6 @@ void SAL_CALL ScCellRangeObj::setArrayFormula( const OUString& aFormula ) // XArrayFormulaTokens uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5174,7 +5081,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellRangeObj::getArrayTokens() return aSequence; } -void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5210,7 +5117,6 @@ void SAL_CALL ScCellRangeObj::setArrayTokens( const uno::Sequence<sheet::Formula // XCellRangeData uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5238,7 +5144,6 @@ uno::Sequence< uno::Sequence<uno::Any> > SAL_CALL ScCellRangeObj::getDataArray() void SAL_CALL ScCellRangeObj::setDataArray( const uno::Sequence< uno::Sequence<uno::Any> >& aArray ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5257,7 +5162,6 @@ void SAL_CALL ScCellRangeObj::setDataArray( // XCellRangeFormula uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArray() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5299,7 +5203,6 @@ uno::Sequence< uno::Sequence<OUString> > SAL_CALL ScCellRangeObj::getFormulaArra void SAL_CALL ScCellRangeObj::setFormulaArray( const uno::Sequence< uno::Sequence<OUString> >& aArray ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5323,7 +5226,6 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress& sheet::TableOperationMode nMode, const table::CellAddress& aColumnCell, const table::CellAddress& aRowCell ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5366,7 +5268,7 @@ void SAL_CALL ScCellRangeObj::setTableOperation( const table::CellRangeAddress& // XMergeable -void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5385,7 +5287,7 @@ void SAL_CALL ScCellRangeObj::merge( sal_Bool bMerge ) throw(uno::RuntimeExcepti } } -sal_Bool SAL_CALL ScCellRangeObj::getIsMerged() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellRangeObj::getIsMerged() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5396,7 +5298,7 @@ sal_Bool SAL_CALL ScCellRangeObj::getIsMerged() throw(uno::RuntimeException, std void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection, sheet::FillMode nFillMode, sheet::FillDateMode nFillDateMode, - double fStep, double fEndValue ) throw(uno::RuntimeException, std::exception) + double fStep, double fEndValue ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5471,7 +5373,7 @@ void SAL_CALL ScCellRangeObj::fillSeries( sheet::FillDirection nFillDirection, } void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection, - sal_Int32 nSourceCount ) throw(uno::RuntimeException, std::exception) + sal_Int32 nSourceCount ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5517,7 +5419,6 @@ void SAL_CALL ScCellRangeObj::fillAuto( sheet::FillDirection nFillDirection, // XAutoFormattable void SAL_CALL ScCellRangeObj::autoFormat( const OUString& aName ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5539,7 +5440,6 @@ void SAL_CALL ScCellRangeObj::autoFormat( const OUString& aName ) // XSortable uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSortParam aParam; @@ -5570,7 +5470,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createSortDescripto } void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& aDescriptor ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5625,7 +5524,7 @@ void SAL_CALL ScCellRangeObj::sort( const uno::Sequence<beans::PropertyValue>& a // XFilterable uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFilterDescriptor( - sal_Bool bEmpty ) throw(uno::RuntimeException, std::exception) + sal_Bool bEmpty ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5658,7 +5557,6 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil } void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDescriptor>& xDescriptor ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5736,7 +5634,6 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFilterDescriptorByObject( const uno::Reference<sheet::XSheetFilterable>& xObject ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5798,7 +5695,7 @@ uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScCellRangeObj::createFil // XSubTotalSource uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTotalDescriptor( - sal_Bool bEmpty ) throw(uno::RuntimeException, std::exception) + sal_Bool bEmpty ) { SolarMutexGuard aGuard; ScSubTotalDescriptor* pNew = new ScSubTotalDescriptor; @@ -5835,7 +5732,6 @@ uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScCellRangeObj::createSubTot void SAL_CALL ScCellRangeObj::applySubTotals( const uno::Reference<sheet::XSubTotalDescriptor>& xDescriptor, sal_Bool bReplace) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -5877,7 +5773,7 @@ void SAL_CALL ScCellRangeObj::applySubTotals( } } -void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellRangeObj::removeSubTotals() { SolarMutexGuard aGuard; @@ -5905,7 +5801,6 @@ void SAL_CALL ScCellRangeObj::removeSubTotals() throw(uno::RuntimeException, std } uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createImportDescriptor( sal_Bool bEmpty ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScImportParam aParam; @@ -5924,7 +5819,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScCellRangeObj::createImportDescrip } void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue>& aDescriptor ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5951,7 +5845,6 @@ void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue // XCellFormatRangesSupplier uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getCellFormatRanges() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5963,7 +5856,6 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getCellFormatRa // XUniqueCellFormatRangesSupplier uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getUniqueCellFormatRanges() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -5975,7 +5867,6 @@ uno::Reference<container::XIndexAccess> SAL_CALL ScCellRangeObj::getUniqueCellFo // XPropertySet erweitert fuer Range-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -5984,7 +5875,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellRangeObj::getPropertySetI } void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { // Range has only Position and Size in addition to ScCellRangesBase, both are ReadOnly // -> nothing to do here @@ -5993,7 +5883,6 @@ void ScCellRangeObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEnt } void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -6036,19 +5925,17 @@ const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap() // XServiceInfo -OUString SAL_CALL ScCellRangeObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellRangeObj::getImplementationName() { return OUString( "ScCellRangeObj" ); } sal_Bool SAL_CALL ScCellRangeObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSHEETCELLRANGE_SERVICE, SCCELLRANGE_SERVICE, @@ -6110,7 +5997,7 @@ void ScCellObj::RefChanged() } } -uno::Any SAL_CALL ScCellObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScCellObj::queryInterface( const uno::Type& rType ) { SC_QUERYINTERFACE( table::XCell ) SC_QUERYINTERFACE( table::XCell2 ) @@ -6138,7 +6025,7 @@ void SAL_CALL ScCellObj::release() throw() ScCellRangeObj::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -6165,7 +6052,7 @@ uno::Sequence<uno::Type> SAL_CALL ScCellObj::getTypes() throw(uno::RuntimeExcept return aTypes; } -uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId() throw(uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL ScCellObj::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -6283,7 +6170,6 @@ void ScCellObj::InputEnglishString( const OUString& rText ) // XText uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScCellTextCursor( *this ); @@ -6291,7 +6177,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursor() uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvxUnoTextCursor* pCursor = new ScCellTextCursor( *this ); @@ -6312,13 +6197,13 @@ uno::Reference<text::XTextCursor> SAL_CALL ScCellObj::createTextCursorByRange( return xCursor; } -OUString SAL_CALL ScCellObj::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellObj::getString() { SolarMutexGuard aGuard; return GetOutputString_Impl(); } -void SAL_CALL ScCellObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setString( const OUString& aText ) { SolarMutexGuard aGuard; SetString_Impl(aText, false, false); // immer Text @@ -6330,7 +6215,6 @@ void SAL_CALL ScCellObj::setString( const OUString& aText ) throw(uno::RuntimeEx void SAL_CALL ScCellObj::insertString( const uno::Reference<text::XTextRange>& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { // special handling for ScCellTextCursor is no longer needed, // SvxUnoText::insertString checks for SvxUnoTextRangeBase instead of SvxUnoTextRange @@ -6341,7 +6225,6 @@ void SAL_CALL ScCellObj::insertString( const uno::Reference<text::XTextRange>& x void SAL_CALL ScCellObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetUnoText().insertControlCharacter(xRange, nControlCharacter, bAbsorb); @@ -6350,7 +6233,6 @@ void SAL_CALL ScCellObj::insertControlCharacter( const uno::Reference<text::XTex void SAL_CALL ScCellObj::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; ScDocShell* pDocSh = GetDocShell(); @@ -6402,7 +6284,6 @@ void SAL_CALL ScCellObj::insertTextContent( const uno::Reference<text::XTextRang } void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xContent.is() ) @@ -6418,38 +6299,37 @@ void SAL_CALL ScCellObj::removeTextContent( const uno::Reference<text::XTextCont GetUnoText().removeTextContent(xContent); } -uno::Reference<text::XText> SAL_CALL ScCellObj::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScCellObj::getText() { SolarMutexGuard aGuard; return this; } -uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getStart() { SolarMutexGuard aGuard; return GetUnoText().getStart(); } -uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellObj::getEnd() { SolarMutexGuard aGuard; return GetUnoText().getEnd(); } uno::Reference<container::XEnumeration> SAL_CALL ScCellObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return GetUnoText().createEnumeration(); } -uno::Type SAL_CALL ScCellObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellObj::getElementType() { SolarMutexGuard aGuard; return GetUnoText().getElementType(); } -sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellObj::hasElements() { SolarMutexGuard aGuard; return GetUnoText().hasElements(); @@ -6457,31 +6337,31 @@ sal_Bool SAL_CALL ScCellObj::hasElements() throw(uno::RuntimeException, std::exc // XCell -OUString SAL_CALL ScCellObj::getFormula() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellObj::getFormula() { SolarMutexGuard aGuard; return GetInputString_Impl( true /* English */ ); } -void SAL_CALL ScCellObj::setFormula( const OUString& aFormula ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setFormula( const OUString& aFormula ) { SolarMutexGuard aGuard; SetString_Impl(aFormula, true, true); // Interpret as English } -double SAL_CALL ScCellObj::getValue() throw(uno::RuntimeException, std::exception) +double SAL_CALL ScCellObj::getValue() { SolarMutexGuard aGuard; return GetValue_Impl(); } -void SAL_CALL ScCellObj::setValue( double nValue ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setValue( double nValue ) { SolarMutexGuard aGuard; SetValue_Impl(nValue); } -void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) { SolarMutexGuard aGuard; ScDocShell *pDocSh = GetDocShell(); @@ -6492,7 +6372,7 @@ void SAL_CALL ScCellObj::setFormulaString( const OUString& aFormula) throw(uno:: pDocSh->GetDocFunc().SetFormulaCell(aCellPos, pCell, false); } } -void SAL_CALL ScCellObj::setFormulaResult( double nValue ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setFormulaResult( double nValue ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6509,7 +6389,7 @@ void SAL_CALL ScCellObj::setFormulaResult( double nValue ) throw(uno::RuntimeExc } } -table::CellContentType SAL_CALL ScCellObj::getType() throw(uno::RuntimeException, std::exception) +table::CellContentType SAL_CALL ScCellObj::getType() { SolarMutexGuard aGuard; table::CellContentType eRet = table::CellContentType_EMPTY; @@ -6556,7 +6436,7 @@ table::CellContentType ScCellObj::GetResultType_Impl() return getType(); // wenn keine Formel } -sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScCellObj::getError() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6577,7 +6457,6 @@ sal_Int32 SAL_CALL ScCellObj::getError() throw(uno::RuntimeException, std::excep // XFormulaTokens uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<sheet::FormulaToken> aSequence; @@ -6596,7 +6475,7 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScCellObj::getTokens() return aSequence; } -void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6613,7 +6492,7 @@ void SAL_CALL ScCellObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rT // XCellAddressable -table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeException, std::exception) +table::CellAddress SAL_CALL ScCellObj::getCellAddress() { SolarMutexGuard aGuard; table::CellAddress aAdr; @@ -6626,7 +6505,6 @@ table::CellAddress SAL_CALL ScCellObj::getCellAddress() throw(uno::RuntimeExcept // XSheetAnnotationAnchor uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6640,7 +6518,6 @@ uno::Reference<sheet::XSheetAnnotation> SAL_CALL ScCellObj::getAnnotation() // XFieldTypesSupplier uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellObj::getTextFields() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6654,7 +6531,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScCellObj::getTextFields( } uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters() - throw(uno::RuntimeException, std::exception) { // sowas gibts nicht im Calc (?) return nullptr; @@ -6663,7 +6539,6 @@ uno::Reference<container::XNameAccess> SAL_CALL ScCellObj::getTextFieldMasters() // XPropertySet erweitert fuer Zell-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -6672,7 +6547,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellObj::getPropertySetInfo() } void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -6694,7 +6568,6 @@ void ScCellObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, c } void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -6720,19 +6593,17 @@ const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap() // XServiceInfo -OUString SAL_CALL ScCellObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellObj::getImplementationName() { return OUString( "ScCellObj" ); } sal_Bool SAL_CALL ScCellObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSHEETCELL_SERVICE, SCCELL_SERVICE, @@ -6745,13 +6616,13 @@ uno::Sequence<OUString> SAL_CALL ScCellObj::getSupportedServiceNames() // XActionLockable -sal_Bool SAL_CALL ScCellObj::isActionLocked() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellObj::isActionLocked() { SolarMutexGuard aGuard; return nActionLockCount != 0; } -void SAL_CALL ScCellObj::addActionLock() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::addActionLock() { SolarMutexGuard aGuard; if (!nActionLockCount) @@ -6767,7 +6638,7 @@ void SAL_CALL ScCellObj::addActionLock() throw(uno::RuntimeException, std::excep nActionLockCount++; } -void SAL_CALL ScCellObj::removeActionLock() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::removeActionLock() { SolarMutexGuard aGuard; if (nActionLockCount > 0) @@ -6790,7 +6661,7 @@ void SAL_CALL ScCellObj::removeActionLock() throw(uno::RuntimeException, std::ex } } -void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) { SolarMutexGuard aGuard; if (mxUnoText.is()) @@ -6807,7 +6678,7 @@ void SAL_CALL ScCellObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeExc nActionLockCount = nLock; } -sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL ScCellObj::resetActionLocks() { SolarMutexGuard aGuard; sal_uInt16 nRet(nActionLockCount); @@ -6841,7 +6712,7 @@ void ScTableSheetObj::InitInsertSheet(ScDocShell* pDocSh, SCTAB nTab) InitInsertRange( pDocSh, ScRange(0,0,nTab, MAXCOL,MAXROW,nTab) ); } -uno::Any SAL_CALL ScTableSheetObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScTableSheetObj::queryInterface( const uno::Type& rType ) { SC_QUERYINTERFACE( sheet::XSpreadsheet ) SC_QUERYINTERFACE( container::XNamed ) @@ -6875,7 +6746,7 @@ void SAL_CALL ScTableSheetObj::release() throw() ScCellRangeObj::release(); } -uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -6911,7 +6782,7 @@ uno::Sequence<uno::Type> SAL_CALL ScTableSheetObj::getTypes() throw(uno::Runtime return aTypes; } -uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId() throw(uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL ScTableSheetObj::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } @@ -6932,7 +6803,7 @@ SCTAB ScTableSheetObj::GetTab_Impl() const // former XSheet -uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() throw(uno::RuntimeException, std::exception) +uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6944,7 +6815,6 @@ uno::Reference<table::XTableCharts> SAL_CALL ScTableSheetObj::getCharts() throw( } uno::Reference<sheet::XDataPilotTables> SAL_CALL ScTableSheetObj::getDataPilotTables() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6955,7 +6825,7 @@ uno::Reference<sheet::XDataPilotTables> SAL_CALL ScTableSheetObj::getDataPilotTa return nullptr; } -uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() throw(uno::RuntimeException, std::exception) +uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6968,7 +6838,6 @@ uno::Reference<sheet::XScenarios> SAL_CALL ScTableSheetObj::getScenarios() throw } uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotations() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -6981,14 +6850,13 @@ uno::Reference<sheet::XSheetAnnotations> SAL_CALL ScTableSheetObj::getAnnotation } uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByName( - const OUString& rRange ) throw(uno::RuntimeException, std::exception) + const OUString& rRange ) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName( rRange ); } uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7003,7 +6871,6 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursor() uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorByRange( const uno::Reference<sheet::XSheetCellRange>& xCellRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7023,7 +6890,6 @@ uno::Reference<sheet::XSheetCellCursor> SAL_CALL ScTableSheetObj::createCursorBy // XSheetCellRange uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return this; //!??? @@ -7033,7 +6899,6 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTableSheetObj::getSpreadsheet() uno::Reference<table::XCell> SAL_CALL ScTableSheetObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::GetCellByPosition_Impl(nColumn, nRow); @@ -7041,14 +6906,12 @@ uno::Reference<table::XCell> SAL_CALL ScTableSheetObj::getCellByPosition( uno::Reference<table::XCellRange> SAL_CALL ScTableSheetObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByPosition(nLeft,nTop,nRight,nBottom); } uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPageBreaks() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7094,7 +6957,6 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getColumnPage } uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBreaks() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7117,7 +6979,7 @@ uno::Sequence<sheet::TablePageBreakData> SAL_CALL ScTableSheetObj::getRowPageBre return uno::Sequence<sheet::TablePageBreakData>(0); } -void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7149,7 +7011,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc // XNamed -OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getName() { SolarMutexGuard aGuard; OUString aName; @@ -7160,7 +7022,6 @@ OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException, std::e } void SAL_CALL ScTableSheetObj::setName( const OUString& aNewName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7173,7 +7034,6 @@ void SAL_CALL ScTableSheetObj::setName( const OUString& aNewName ) // XDrawPageSupplier uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7197,7 +7057,7 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScTableSheetObj::getDrawPage() // XCellMovement void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRangeAddress, - sheet::CellInsertMode nMode ) throw(uno::RuntimeException, std::exception) + sheet::CellInsertMode nMode ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7228,7 +7088,7 @@ void SAL_CALL ScTableSheetObj::insertCells( const table::CellRangeAddress& rRang } void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRangeAddress, - sheet::CellDeleteMode nMode ) throw(uno::RuntimeException, std::exception) + sheet::CellDeleteMode nMode ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7260,7 +7120,6 @@ void SAL_CALL ScTableSheetObj::removeRange( const table::CellRangeAddress& rRang void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination, const table::CellRangeAddress& aSource ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7276,7 +7135,6 @@ void SAL_CALL ScTableSheetObj::moveRange( const table::CellAddress& aDestination void SAL_CALL ScTableSheetObj::copyRange( const table::CellAddress& aDestination, const table::CellRangeAddress& aSource ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7332,7 +7190,6 @@ void ScTableSheetObj::PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges ) } uno::Sequence<table::CellRangeAddress> SAL_CALL ScTableSheetObj::getPrintAreas() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7363,7 +7220,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScTableSheetObj::getPrintAreas() void SAL_CALL ScTableSheetObj::setPrintAreas( const uno::Sequence<table::CellRangeAddress>& aPrintAreas ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7394,7 +7250,7 @@ void SAL_CALL ScTableSheetObj::setPrintAreas( } } -sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7408,7 +7264,6 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleColumns() throw(uno::RuntimeExce } void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7436,7 +7291,7 @@ void SAL_CALL ScTableSheetObj::setPrintTitleColumns( sal_Bool bPrintTitleColumns } } -table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -7456,7 +7311,6 @@ table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleColumns() throw(uno::R } void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& aTitleColumns ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7475,7 +7329,7 @@ void SAL_CALL ScTableSheetObj::setTitleColumns( const table::CellRangeAddress& a } } -sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7489,7 +7343,6 @@ sal_Bool SAL_CALL ScTableSheetObj::getPrintTitleRows() throw(uno::RuntimeExcepti } void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7517,7 +7370,7 @@ void SAL_CALL ScTableSheetObj::setPrintTitleRows( sal_Bool bPrintTitleRows ) } } -table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -7537,7 +7390,6 @@ table::CellRangeAddress SAL_CALL ScTableSheetObj::getTitleRows() throw(uno::Runt } void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTitleRows ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7558,7 +7410,7 @@ void SAL_CALL ScTableSheetObj::setTitleRows( const table::CellRangeAddress& aTit // XSheetLinkable -sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() throw(uno::RuntimeException, std::exception) +sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() { SolarMutexGuard aGuard; sheet::SheetLinkMode eRet = sheet::SheetLinkMode_NONE; @@ -7575,7 +7427,6 @@ sheet::SheetLinkMode SAL_CALL ScTableSheetObj::getLinkMode() throw(uno::RuntimeE } void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -7587,7 +7438,7 @@ void SAL_CALL ScTableSheetObj::setLinkMode( sheet::SheetLinkMode nLinkMode ) link( aUrl, aSheet, "", "", nLinkMode ); } -OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getLinkUrl() { SolarMutexGuard aGuard; OUString aFile; @@ -7598,7 +7449,6 @@ OUString SAL_CALL ScTableSheetObj::getLinkUrl() throw(uno::RuntimeException, std } void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -7610,7 +7460,7 @@ void SAL_CALL ScTableSheetObj::setLinkUrl( const OUString& aLinkUrl ) link( aLinkUrl, aSheet, "", "", eMode ); } -OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getLinkSheetName() { SolarMutexGuard aGuard; OUString aSheet; @@ -7621,7 +7471,6 @@ OUString SAL_CALL ScTableSheetObj::getLinkSheetName() throw(uno::RuntimeExceptio } void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -7635,7 +7484,7 @@ void SAL_CALL ScTableSheetObj::setLinkSheetName( const OUString& aLinkSheetName void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aSheetName, const OUString& aFilterName, const OUString& aFilterOptions, - sheet::SheetLinkMode nMode ) throw(uno::RuntimeException, std::exception) + sheet::SheetLinkMode nMode ) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7700,7 +7549,6 @@ void SAL_CALL ScTableSheetObj::link( const OUString& aUrl, const OUString& aShee // XSheetAuditing sal_Bool SAL_CALL ScTableSheetObj::hideDependents( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7715,7 +7563,6 @@ sal_Bool SAL_CALL ScTableSheetObj::hideDependents( const table::CellAddress& aPo } sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7730,7 +7577,6 @@ sal_Bool SAL_CALL ScTableSheetObj::hidePrecedents( const table::CellAddress& aPo } sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7745,7 +7591,6 @@ sal_Bool SAL_CALL ScTableSheetObj::showDependents( const table::CellAddress& aPo } sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7760,7 +7605,6 @@ sal_Bool SAL_CALL ScTableSheetObj::showPrecedents( const table::CellAddress& aPo } sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7774,7 +7618,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showErrors( const table::CellAddress& aPositi return false; } -sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::showInvalid() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7783,7 +7627,7 @@ sal_Bool SAL_CALL ScTableSheetObj::showInvalid() throw(uno::RuntimeException, st return false; } -void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTableSheetObj::clearArrows() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7795,8 +7639,6 @@ void SAL_CALL ScTableSheetObj::clearArrows() throw(uno::RuntimeException, std::e void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange, table::TableOrientation nOrientation ) - throw (uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7812,8 +7654,6 @@ void SAL_CALL ScTableSheetObj::group( const table::CellRangeAddress& rGroupRange void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRange, table::TableOrientation nOrientation ) - throw (uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7828,7 +7668,6 @@ void SAL_CALL ScTableSheetObj::ungroup( const table::CellRangeAddress& rGroupRan } void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCellRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7842,7 +7681,6 @@ void SAL_CALL ScTableSheetObj::autoOutline( const table::CellRangeAddress& rCell } void SAL_CALL ScTableSheetObj::clearOutline() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7855,7 +7693,6 @@ void SAL_CALL ScTableSheetObj::clearOutline() } void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7869,7 +7706,6 @@ void SAL_CALL ScTableSheetObj::hideDetail( const table::CellRangeAddress& rCellR } void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7883,7 +7719,6 @@ void SAL_CALL ScTableSheetObj::showDetail( const table::CellRangeAddress& rCellR } void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientation nOrientation ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7899,7 +7734,6 @@ void SAL_CALL ScTableSheetObj::showLevel( sal_Int16 nLevel, table::TableOrientat // XProtectable void SAL_CALL ScTableSheetObj::protect( const OUString& aPassword ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7911,7 +7745,6 @@ void SAL_CALL ScTableSheetObj::protect( const OUString& aPassword ) } void SAL_CALL ScTableSheetObj::unprotect( const OUString& aPassword ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7923,7 +7756,7 @@ void SAL_CALL ScTableSheetObj::unprotect( const OUString& aPassword ) } } -sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::isProtected() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7936,7 +7769,7 @@ sal_Bool SAL_CALL ScTableSheetObj::isProtected() throw(uno::RuntimeException, st // XScenario -sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7946,7 +7779,7 @@ sal_Bool SAL_CALL ScTableSheetObj::getIsScenario() throw(uno::RuntimeException, return false; } -OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getScenarioComment() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7962,7 +7795,6 @@ OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeExcept } void SAL_CALL ScTableSheetObj::setScenarioComment( const OUString& aScenarioComment ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -7985,7 +7817,6 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const OUString& aScenarioComm } void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAddress>& rScenRanges ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8022,7 +7853,7 @@ void SAL_CALL ScTableSheetObj::addRanges( const uno::Sequence<table::CellRangeAd } } -void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTableSheetObj::apply() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8047,7 +7878,6 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException, std::excepti // XScenarioEnhanced uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges( ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8080,7 +7910,6 @@ uno::Sequence< table::CellRangeAddress > SAL_CALL ScTableSheetObj::getRanges( ) // XExternalSheetName void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSheetName ) - throw (container::ElementExistException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8099,7 +7928,7 @@ void ScTableSheetObj::setExternalName( const OUString& aUrl, const OUString& aSh // XEventsSupplier -uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() throw (uno::RuntimeException, std::exception) +uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -8112,7 +7941,6 @@ uno::Reference<container::XNameReplace> SAL_CALL ScTableSheetObj::getEvents() th // XPropertySet erweitert fuer Sheet-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableSheetObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -8121,8 +7949,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableSheetObj::getPropertySet } void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { if ( pEntry ) { @@ -8454,8 +8280,6 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, - std::exception) { if ( pEntry ) { @@ -8605,19 +8429,17 @@ const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap() // XServiceInfo -OUString SAL_CALL ScTableSheetObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableSheetObj::getImplementationName() { return OUString( "ScTableSheetObj" ); } sal_Bool SAL_CALL ScTableSheetObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSPREADSHEET_SERVICE, SCSHEETCELLRANGE_SERVICE, @@ -8631,7 +8453,7 @@ uno::Sequence<OUString> SAL_CALL ScTableSheetObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScTableSheetObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -8672,7 +8494,7 @@ ScTableColumnObj::~ScTableColumnObj() { } -uno::Any SAL_CALL ScTableColumnObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScTableColumnObj::queryInterface( const uno::Type& rType ) { SC_QUERYINTERFACE( container::XNamed ) @@ -8689,7 +8511,7 @@ void SAL_CALL ScTableColumnObj::release() throw() ScCellRangeObj::release(); } -uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -8708,14 +8530,14 @@ uno::Sequence<uno::Type> SAL_CALL ScTableColumnObj::getTypes() throw(uno::Runtim return aTypes; } -uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId() throw(uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL ScTableColumnObj::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XNamed -OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableColumnObj::getName() { SolarMutexGuard aGuard; @@ -8727,7 +8549,6 @@ OUString SAL_CALL ScTableColumnObj::getName() throw(uno::RuntimeException, std:: } void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; throw uno::RuntimeException(); // read-only @@ -8736,7 +8557,6 @@ void SAL_CALL ScTableColumnObj::setName( const OUString& /* aNewName */ ) // XPropertySet erweitert fuer Spalten-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -8745,8 +8565,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnObj::getPropertySe } void ScTableColumnObj::SetOnePropertyValue(const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue) - throw(lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { if ( pEntry ) { @@ -8810,7 +8628,6 @@ void ScTableColumnObj::SetOnePropertyValue(const SfxItemPropertySimpleEntry* pEn } void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -8876,7 +8693,6 @@ ScTableRowObj::~ScTableRowObj() // XPropertySet erweitert fuer Zeilen-Properties uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -8885,7 +8701,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowObj::getPropertySetIn } void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, const uno::Any& aValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -8960,7 +8775,6 @@ void ScTableRowObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr } void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry, uno::Any& rAny ) - throw(uno::RuntimeException, std::exception) { if ( pEntry ) { @@ -9048,7 +8862,6 @@ void ScCellsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScCellsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -9056,13 +8869,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellsObj::createEnumeration() return nullptr; } -uno::Type SAL_CALL ScCellsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCell>::get(); } -sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellsObj::hasElements() { SolarMutexGuard aGuard; bool bHas = false; @@ -9184,14 +8997,13 @@ void ScCellsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XEnumeration -sal_Bool SAL_CALL ScCellsEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellsEnumeration::hasMoreElements() { SolarMutexGuard aGuard; return !bAtEnd; } -uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScCellsEnumeration::nextElement() { SolarMutexGuard aGuard; if (pDocShell && !bAtEnd) @@ -9270,7 +9082,7 @@ ScCellRangeObj* ScCellFormatsObj::GetObjectByIndex_Impl(long nIndex) const // XIndexAccess -sal_Int32 SAL_CALL ScCellFormatsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScCellFormatsObj::getCount() { SolarMutexGuard aGuard; @@ -9292,8 +9104,6 @@ sal_Int32 SAL_CALL ScCellFormatsObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -9304,13 +9114,13 @@ uno::Any SAL_CALL ScCellFormatsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScCellFormatsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellFormatsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCellRange>::get(); } -sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellFormatsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); //! immer groesser 0 ?? @@ -9319,7 +9129,6 @@ sal_Bool SAL_CALL ScCellFormatsObj::hasElements() throw(uno::RuntimeException, s // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScCellFormatsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -9416,14 +9225,13 @@ void ScCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XEnumeration -sal_Bool SAL_CALL ScCellFormatsEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellFormatsEnumeration::hasMoreElements() { SolarMutexGuard aGuard; return !bAtEnd; } -uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() { SolarMutexGuard aGuard; @@ -9646,7 +9454,7 @@ ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange // XIndexAccess -sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount() { SolarMutexGuard aGuard; @@ -9654,8 +9462,6 @@ sal_Int32 SAL_CALL ScUniqueCellFormatsObj::getCount() throw(uno::RuntimeExceptio } uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -9665,13 +9471,13 @@ uno::Any SAL_CALL ScUniqueCellFormatsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScUniqueCellFormatsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScUniqueCellFormatsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSheetCellRangeContainer>::get(); } -sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() { SolarMutexGuard aGuard; return ( aRangeLists.size() != 0 ); @@ -9680,7 +9486,6 @@ sal_Bool SAL_CALL ScUniqueCellFormatsObj::hasElements() throw(uno::RuntimeExcept // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScUniqueCellFormatsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -9719,14 +9524,13 @@ void ScUniqueCellFormatsEnumeration::Notify( SfxBroadcaster&, const SfxHint& rHi // XEnumeration -sal_Bool SAL_CALL ScUniqueCellFormatsEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScUniqueCellFormatsEnumeration::hasMoreElements() { SolarMutexGuard aGuard; return static_cast<sal_uInt32>(nCurrentPosition) < aRangeLists.size(); } -uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement() throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScUniqueCellFormatsEnumeration::nextElement() { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 3b301d043372..eed7f3ecbdb2 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -95,7 +95,7 @@ namespace calc // for the cell) } - Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo( ) { return createPropertySetInfo( getInfoHelper() ) ; } @@ -124,7 +124,7 @@ namespace calc _rValue <<= xCellAddress->getCellAddress( ); } - Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes( ) throw (RuntimeException, std::exception) + Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes( ) { checkDisposed( ); checkInitialized( ); @@ -154,7 +154,7 @@ namespace calc return aTypes; } - sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) { checkDisposed( ); checkInitialized( ); @@ -170,7 +170,7 @@ namespace calc return false; } - Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException, std::exception) + Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) { checkDisposed( ); checkInitialized( ); @@ -255,7 +255,7 @@ namespace calc return aReturn; } - void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) { checkDisposed( ); checkInitialized( ); @@ -413,17 +413,17 @@ namespace calc } } - OUString SAL_CALL OCellValueBinding::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OCellValueBinding::getImplementationName( ) { return OUString( "com.sun.star.comp.sheet.OCellValueBinding" ); } - sal_Bool SAL_CALL OCellValueBinding::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OCellValueBinding::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OCellValueBinding::getSupportedServiceNames( ) { Sequence< OUString > aServices( m_bListPos ? 3 : 2 ); aServices[ 0 ] = "com.sun.star.table.CellValueBinding"; @@ -433,13 +433,13 @@ namespace calc return aServices; } - void SAL_CALL OCellValueBinding::addModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::addModifyListener( const Reference< XModifyListener >& _rxListener ) { if ( _rxListener.is() ) m_aModifyListeners.addInterface( _rxListener ); } - void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) { if ( _rxListener.is() ) m_aModifyListeners.removeInterface( _rxListener ); @@ -468,12 +468,12 @@ namespace calc } } - void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) { notifyModified(); } - void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) { Reference<XInterface> xCellInt( m_xCell, UNO_QUERY ); if ( xCellInt == aEvent.Source ) @@ -484,7 +484,7 @@ namespace calc } } - void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments ) { if ( m_bInitialized ) throw Exception(); diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 22ca062f50fb..4527177dbb49 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -91,21 +91,21 @@ namespace calc DECLARE_XTYPEPROVIDER() // XValueBinding - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getSupportedValueTypes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) throw (css::form::binding::IncompatibleTypesException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const css::uno::Any& aValue ) throw (css::form::binding::IncompatibleTypesException, css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getSupportedValueTypes( ) override; + virtual sal_Bool SAL_CALL supportsType( const css::uno::Type& aType ) override; + virtual css::uno::Any SAL_CALL getValue( const css::uno::Type& aType ) override; + virtual void SAL_CALL setValue( const css::uno::Any& aValue ) override; // OComponentHelper/XComponent virtual void SAL_CALL disposing() 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; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; @@ -115,15 +115,15 @@ namespace calc virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // XModifyListener - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; private: void checkDisposed( ) const; diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 76b594b8d0b4..4e751b3f6672 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -1020,7 +1020,6 @@ void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint } sal_Bool SAL_CALL ScChart2DataProvider::createDataSourcePossible( const uno::Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( ! m_pDocument ) @@ -1420,7 +1419,6 @@ void shrinkToDataRange(ScDocument* pDoc, vector<ScTokenRef>& rRefTokens) uno::Reference< chart2::data::XDataSource> SAL_CALL ScChart2DataProvider::createDataSource( const uno::Sequence< beans::PropertyValue >& aArguments ) - throw( lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( ! m_pDocument ) @@ -1780,7 +1778,6 @@ std::pair<OUString, OUString> constructKey(const uno::Reference< chart2::data::X uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArguments( const uno::Reference< chart2::data::XDataSource >& xDataSource ) - throw (uno::RuntimeException, std::exception) { ::std::vector< beans::PropertyValue > aResult; bool bRowSourceDetected = false; @@ -2044,7 +2041,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ScChart2DataProvider::detectArgum } sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& aRangeRepresentation ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( ! m_pDocument ) @@ -2060,8 +2056,6 @@ sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentationP uno::Reference< chart2::data::XDataSequence > SAL_CALL ScChart2DataProvider::createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< chart2::data::XDataSequence > xResult; @@ -2087,13 +2081,11 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL uno::Reference<chart2::data::XDataSequence> SAL_CALL ScChart2DataProvider::createDataSequenceByValueArray( const OUString& /*aRole*/, const OUString& /*aRangeRepresentation*/ ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) { return uno::Reference<chart2::data::XDataSequence>(); } uno::Reference< sheet::XRangeSelection > SAL_CALL ScChart2DataProvider::getRangeSelection() - throw (uno::RuntimeException, std::exception) { uno::Reference< sheet::XRangeSelection > xResult; @@ -2106,7 +2098,6 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL ScChart2DataProvider::getRange sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByFormulaTokensPossible( const Sequence<sheet::FormulaToken>& aTokens ) - throw (uno::RuntimeException, std::exception) { if (aTokens.getLength() <= 0) return false; @@ -2163,7 +2154,6 @@ sal_Bool SAL_CALL ScChart2DataProvider::createDataSequenceByFormulaTokensPossibl Reference<chart2::data::XDataSequence> SAL_CALL ScChart2DataProvider::createDataSequenceByFormulaTokens( const Sequence<sheet::FormulaToken>& aTokens ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { Reference<chart2::data::XDataSequence> xResult; if (aTokens.getLength() <= 0) @@ -2233,7 +2223,6 @@ ScChart2DataProvider::createDataSequenceByFormulaTokens( // XRangeXMLConversion --------------------------------------------------- OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRangeRepresentation ) - throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { OUString aRet; if (!m_pDocument) @@ -2258,7 +2247,6 @@ OUString SAL_CALL ScChart2DataProvider::convertRangeToXML( const OUString& sRang } OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXMLRange ) - throw ( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { if (!m_pDocument) { @@ -2302,7 +2290,7 @@ OUString SAL_CALL ScChart2DataProvider::convertRangeFromXML( const OUString& sXM // DataProvider XPropertySet ------------------------------------------------- uno::Reference< beans::XPropertySetInfo> SAL_CALL -ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException, std::exception) +ScChart2DataProvider::getPropertySetInfo() { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = @@ -2312,10 +2300,6 @@ ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException, std::ex void SAL_CALL ScChart2DataProvider::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS ) { @@ -2328,8 +2312,6 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue( uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( const OUString& rPropertyName) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRet; if ( rPropertyName == SC_UNONAME_INCLUDEHIDDENCELLS ) @@ -2347,8 +2329,6 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "Not yet implemented" ); } @@ -2356,8 +2336,6 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "Not yet implemented" ); } @@ -2365,8 +2343,6 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "Not yet implemented" ); } @@ -2374,8 +2350,6 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/ ) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL( "Not yet implemented" ); } @@ -2406,7 +2380,7 @@ void ScChart2DataSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint) } uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence> > SAL_CALL -ScChart2DataSource::getDataSequences() throw ( uno::RuntimeException, std::exception) +ScChart2DataSource::getDataSequences() { SolarMutexGuard aGuard; return comphelper::containerToSequence(m_aLabeledSequences); @@ -2964,7 +2938,6 @@ void ScChart2DataSequence::ExternalRefListener::addFileId(sal_uInt16 nFileId) } uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pDocument) @@ -2994,7 +2967,6 @@ uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() // XNumericalDataSequence -------------------------------------------------- uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pDocument) @@ -3020,7 +2992,6 @@ uno::Sequence< double > SAL_CALL ScChart2DataSequence::getNumericalData() // XTextualDataSequence -------------------------------------------------- uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<OUString> aSeq; @@ -3053,7 +3024,6 @@ uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::getTextualData() } OUString SAL_CALL ScChart2DataSequence::getSourceRangeRepresentation() - throw ( uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aStr; @@ -3168,7 +3138,6 @@ private: } uno::Sequence< OUString > SAL_CALL ScChart2DataSequence::generateLabel(chart2::data::LabelOrigin eOrigin) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( !m_pDocument) @@ -3223,7 +3192,6 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress& rPos) } ::sal_Int32 SAL_CALL ScChart2DataSequence::getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; BuildDataCache(); @@ -3257,7 +3225,6 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress& rPos) // XCloneable ================================================================ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3281,7 +3248,6 @@ uno::Reference< util::XCloneable > SAL_CALL ScChart2DataSequence::createClone() // XModifyBroadcaster ======================================================== void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { // like ScCellRangesBase::addModifyListener SolarMutexGuard aGuard; @@ -3321,7 +3287,6 @@ void SAL_CALL ScChart2DataSequence::addModifyListener( const uno::Reference< uti } void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { // like ScCellRangesBase::removeModifyListener @@ -3364,7 +3329,7 @@ void SAL_CALL ScChart2DataSequence::removeModifyListener( const uno::Reference< // DataSequence XPropertySet ------------------------------------------------- uno::Reference< beans::XPropertySetInfo> SAL_CALL -ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException, std::exception) +ScChart2DataSequence::getPropertySetInfo() { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = @@ -3374,10 +3339,6 @@ ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException, std::ex void SAL_CALL ScChart2DataSequence::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { if ( rPropertyName == SC_UNONAME_ROLE ) { @@ -3404,10 +3365,6 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue( } uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rPropertyName) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { uno::Any aRet; if ( rPropertyName == SC_UNONAME_ROLE ) @@ -3446,8 +3403,6 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rProper void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { // FIXME: real implementation OSL_FAIL( "Not yet implemented" ); @@ -3456,8 +3411,6 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { // FIXME: real implementation OSL_FAIL( "Not yet implemented" ); @@ -3466,8 +3419,6 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { // FIXME: real implementation OSL_FAIL( "Not yet implemented" ); @@ -3476,8 +3427,6 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) - throw( beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { // FIXME: real implementation OSL_FAIL( "Not yet implemented" ); @@ -3489,7 +3438,6 @@ void ScChart2DataSequence::setDataChangedHint(bool b) } sal_Bool ScChart2DataSequence::switchToNext(sal_Bool bWrap) - throw (uno::RuntimeException, std::exception) { if(!mbTimeBased) return true; @@ -3523,7 +3471,6 @@ sal_Bool ScChart2DataSequence::switchToNext(sal_Bool bWrap) } void ScChart2DataSequence::setRange(sal_Int32 nStart, sal_Int32 nEnd) - throw (uno::RuntimeException, std::exception) { mnTimeBasedStart = nStart; mnTimeBasedEnd = nEnd; @@ -3531,7 +3478,6 @@ void ScChart2DataSequence::setRange(sal_Int32 nStart, sal_Int32 nEnd) } sal_Bool ScChart2DataSequence::setToPointInTime(sal_Int32 nPoint) - throw (uno::RuntimeException, std::exception) { if(nPoint > mnTimeBasedEnd - mnTimeBasedStart) return false; diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 124245fddd08..b2c5bec2b25c 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -166,8 +166,6 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, const awt::Rectangle& aRect, const uno::Sequence<table::CellRangeAddress>& aRanges, sal_Bool bColumnHeaders, sal_Bool bRowHeaders ) - throw(css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -296,7 +294,6 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName, } void SAL_CALL ScChartsObj::removeByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SdrOle2Obj* pObj = lcl_FindChartObj( pDocShell, nTab, aName ); @@ -317,7 +314,6 @@ void SAL_CALL ScChartsObj::removeByName( const OUString& aName ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableChartsEnumeration")); @@ -325,7 +321,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScChartsObj::createEnumeration( // XIndexAccess -sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScChartsObj::getCount() { SolarMutexGuard aGuard; sal_Int32 nCount = 0; @@ -354,8 +350,6 @@ sal_Int32 SAL_CALL ScChartsObj::getCount() throw(uno::RuntimeException, std::exc } uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XTableChart> xChart(GetObjectByIndex_Impl(nIndex)); @@ -365,21 +359,19 @@ uno::Any SAL_CALL ScChartsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScChartsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScChartsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XTableChart>::get(); } -sal_Bool SAL_CALL ScChartsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScChartsObj::hasElements() { SolarMutexGuard aGuard; return getCount() != 0; } uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XTableChart> xChart(GetObjectByName_Impl(aName)); @@ -389,7 +381,7 @@ uno::Any SAL_CALL ScChartsObj::getByName( const OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() { SolarMutexGuard aGuard; if (pDocShell) @@ -434,7 +426,6 @@ uno::Sequence<OUString> SAL_CALL ScChartsObj::getElementNames() throw(uno::Runti } sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ( lcl_FindChartObj( pDocShell, nTab, aName ) != nullptr ); @@ -557,7 +548,6 @@ void ScChartObj::Update_Impl( const ScRangeListRef& rRanges, bool bColHeaders, b } void ScChartObj::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception, std::exception) { switch ( nHandle ) { @@ -651,7 +641,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( ScChartObj, ScChartObj_Base, ScChartObj_PBase // XTableChart -sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -661,8 +651,6 @@ sal_Bool SAL_CALL ScChartObj::getHasColumnHeaders() throw(uno::RuntimeException, } void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders ) - throw(uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -672,7 +660,7 @@ void SAL_CALL ScChartObj::setHasColumnHeaders( sal_Bool bHasColumnHeaders ) Update_Impl( xRanges, bHasColumnHeaders, bOldRowHeaders ); } -sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -682,7 +670,6 @@ sal_Bool SAL_CALL ScChartObj::getHasRowHeaders() throw(uno::RuntimeException, st } void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -692,7 +679,7 @@ void SAL_CALL ScChartObj::setHasRowHeaders( sal_Bool bHasRowHeaders ) Update_Impl( xRanges, bOldColHeaders, bHasRowHeaders ); } -uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(uno::RuntimeException, std::exception) +uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() { SolarMutexGuard aGuard; ScRangeListRef xRanges = new ScRangeList; @@ -725,7 +712,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScChartObj::getRanges() throw(un } void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress>& aRanges ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRangeListRef xOldRanges = new ScRangeList; @@ -752,7 +738,7 @@ void SAL_CALL ScChartObj::setRanges( const uno::Sequence<table::CellRangeAddress // XEmbeddedObjectSupplier -uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw(uno::RuntimeException, std::exception) +uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() { SolarMutexGuard aGuard; SdrOle2Obj* pObject = lcl_FindChartObj( pDocShell, nTab, aChartName ); @@ -767,13 +753,13 @@ uno::Reference<lang::XComponent> SAL_CALL ScChartObj::getEmbeddedObject() throw( // XNamed -OUString SAL_CALL ScChartObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScChartObj::getName() { SolarMutexGuard aGuard; return aChartName; } -void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) { SolarMutexGuard aGuard; throw uno::RuntimeException(); // name cannot be changed @@ -781,7 +767,7 @@ void SAL_CALL ScChartObj::setName( const OUString& /* aName */ ) throw(uno::Runt // XPropertySet -uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() throw (uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ) ; } diff --git a/sc/source/ui/unoobj/condformatuno.cxx b/sc/source/ui/unoobj/condformatuno.cxx index 58f6371bddcc..2e541a5912dd 100644 --- a/sc/source/ui/unoobj/condformatuno.cxx +++ b/sc/source/ui/unoobj/condformatuno.cxx @@ -331,7 +331,6 @@ void ScCondFormatsObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) } sal_Int32 ScCondFormatsObj::createByRange(const uno::Reference< sheet::XSheetCellRanges >& xRanges) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mpDocShell) @@ -362,7 +361,6 @@ sal_Int32 ScCondFormatsObj::createByRange(const uno::Reference< sheet::XSheetCel } void ScCondFormatsObj::removeByID(const sal_Int32 nID) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormatList* pFormatList = getCoreObject(); @@ -370,7 +368,6 @@ void ScCondFormatsObj::removeByID(const sal_Int32 nID) } uno::Sequence<uno::Reference<sheet::XConditionalFormat> > ScCondFormatsObj::getConditionalFormats() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormatList* pFormatList = getCoreObject(); @@ -386,7 +383,6 @@ uno::Sequence<uno::Reference<sheet::XConditionalFormat> > ScCondFormatsObj::getC } sal_Int32 ScCondFormatsObj::getLength() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormatList* pFormatList = getCoreObject(); @@ -469,7 +465,6 @@ ScDocShell* ScCondFormatObj::getDocShell() } void ScCondFormatObj::createEntry(const sal_Int32 nType, const sal_Int32 nPos) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormat* pFormat = getCoreObject(); @@ -508,7 +503,6 @@ void ScCondFormatObj::createEntry(const sal_Int32 nType, const sal_Int32 nPos) } void ScCondFormatObj::removeByIndex(const sal_Int32 nIndex) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (getCoreObject()->size() >= size_t(nIndex)) @@ -518,13 +512,11 @@ void ScCondFormatObj::removeByIndex(const sal_Int32 nIndex) } uno::Type ScCondFormatObj::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType<beans::XPropertySet>::get(); } sal_Bool ScCondFormatObj::hasElements() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormat* pFormat = getCoreObject(); @@ -532,7 +524,6 @@ sal_Bool ScCondFormatObj::hasElements() } sal_Int32 ScCondFormatObj::getCount() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScConditionalFormat* pFormat = getCoreObject(); @@ -541,7 +532,6 @@ sal_Int32 ScCondFormatObj::getCount() } uno::Any ScCondFormatObj::getByIndex(sal_Int32 nIndex) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (getCoreObject()->size() <= size_t(nIndex)) @@ -554,7 +544,6 @@ uno::Any ScCondFormatObj::getByIndex(sal_Int32 nIndex) } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -564,9 +553,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondFormatObj::getPropertySet void SAL_CALL ScCondFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -605,8 +591,6 @@ void SAL_CALL ScCondFormatObj::setPropertyValue( } uno::Any SAL_CALL ScCondFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -637,32 +621,24 @@ uno::Any SAL_CALL ScCondFormatObj::getPropertyValue( const OUString& aPropertyNa void SAL_CALL ScCondFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -704,13 +680,11 @@ ScCondFormatEntry* ScConditionEntryObj::getCoreObject() } sal_Int32 ScConditionEntryObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::CONDITION; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScConditionEntryObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( maPropSet.getPropertyMap() )); @@ -719,9 +693,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScConditionEntryObj::getPropert void SAL_CALL ScConditionEntryObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -783,8 +754,6 @@ void SAL_CALL ScConditionEntryObj::setPropertyValue( } uno::Any SAL_CALL ScConditionEntryObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -834,32 +803,24 @@ uno::Any SAL_CALL ScConditionEntryObj::getPropertyValue( const OUString& aProper void SAL_CALL ScConditionEntryObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScConditionEntryObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScConditionEntryObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScConditionEntryObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -886,13 +847,11 @@ ScColorScaleFormat* ScColorScaleFormatObj::getCoreObject() } sal_Int32 ScColorScaleFormatObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::COLORSCALE; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScColorScaleFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { static uno::Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo( maPropSet.getPropertyMap() )); @@ -939,9 +898,6 @@ void setColorScaleEntry(ScColorScaleEntry* pEntry, uno::Reference<sheet::XColorS void SAL_CALL ScColorScaleFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -977,8 +933,6 @@ void SAL_CALL ScColorScaleFormatObj::setPropertyValue( } uno::Any SAL_CALL ScColorScaleFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1010,32 +964,24 @@ uno::Any SAL_CALL ScColorScaleFormatObj::getPropertyValue( const OUString& aProp void SAL_CALL ScColorScaleFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScColorScaleFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScColorScaleFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScColorScaleFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -1061,20 +1007,17 @@ ScColorScaleEntry* ScColorScaleEntryObj::getCoreObject() } util::Color ScColorScaleEntryObj::getColor() - throw(uno::RuntimeException, std::exception) { Color aColor = getCoreObject()->GetColor(); return aColor.GetColor(); } void ScColorScaleEntryObj::setColor(util::Color aColor) - throw(uno::RuntimeException, std::exception) { getCoreObject()->SetColor(Color(aColor)); } sal_Int32 ScColorScaleEntryObj::getType() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); for (ColorScaleEntryTypeApiMap & rEntry : aColorScaleEntryTypeMap) @@ -1089,7 +1032,6 @@ sal_Int32 ScColorScaleEntryObj::getType() } void ScColorScaleEntryObj::setType(sal_Int32 nType) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); for (ColorScaleEntryTypeApiMap & rEntry : aColorScaleEntryTypeMap) @@ -1104,7 +1046,6 @@ void ScColorScaleEntryObj::setType(sal_Int32 nType) } OUString ScColorScaleEntryObj::getFormula() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1120,7 +1061,6 @@ OUString ScColorScaleEntryObj::getFormula() } void ScColorScaleEntryObj::setFormula(const OUString& rFormula) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1158,13 +1098,11 @@ ScDataBarFormat* ScDataBarFormatObj::getCoreObject() } sal_Int32 ScDataBarFormatObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::DATABAR; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDataBarFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1211,9 +1149,6 @@ void setDataBarEntry(ScColorScaleEntry* pEntry, uno::Reference<sheet::XDataBarEn void SAL_CALL ScDataBarFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1342,8 +1277,6 @@ void SAL_CALL ScDataBarFormatObj::setPropertyValue( } uno::Any SAL_CALL ScDataBarFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1420,32 +1353,24 @@ uno::Any SAL_CALL ScDataBarFormatObj::getPropertyValue( const OUString& aPropert void SAL_CALL ScDataBarFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScDataBarFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScDataBarFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScDataBarFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -1474,7 +1399,6 @@ ScColorScaleEntry* ScDataBarEntryObj::getCoreObject() } sal_Int32 ScDataBarEntryObj::getType() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); for (DataBarEntryTypeApiMap & rEntry : aDataBarEntryTypeMap) @@ -1489,7 +1413,6 @@ sal_Int32 ScDataBarEntryObj::getType() } void ScDataBarEntryObj::setType(sal_Int32 nType) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); for (DataBarEntryTypeApiMap & rEntry : aDataBarEntryTypeMap) @@ -1504,7 +1427,6 @@ void ScDataBarEntryObj::setType(sal_Int32 nType) } OUString ScDataBarEntryObj::getFormula() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1520,7 +1442,6 @@ OUString ScDataBarEntryObj::getFormula() } void ScDataBarEntryObj::setFormula(const OUString& rFormula) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1558,13 +1479,11 @@ ScIconSetFormat* ScIconSetFormatObj::getCoreObject() } sal_Int32 ScIconSetFormatObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::ICONSET; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScIconSetFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1612,9 +1531,6 @@ void setIconSetEntry(ScIconSetFormat* pFormat, uno::Reference<sheet::XIconSetEnt void SAL_CALL ScIconSetFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1687,8 +1603,6 @@ void SAL_CALL ScIconSetFormatObj::setPropertyValue( } uno::Any SAL_CALL ScIconSetFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1739,32 +1653,24 @@ uno::Any SAL_CALL ScIconSetFormatObj::getPropertyValue( const OUString& aPropert void SAL_CALL ScIconSetFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScIconSetFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScIconSetFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScIconSetFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } @@ -1790,7 +1696,6 @@ ScColorScaleEntry* ScIconSetEntryObj::getCoreObject() } sal_Int32 ScIconSetEntryObj::getType() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); // the first entry always is minimum @@ -1809,7 +1714,6 @@ sal_Int32 ScIconSetEntryObj::getType() } void ScIconSetEntryObj::setType(sal_Int32 nType) - throw(uno::RuntimeException, std::exception) { // first entry is always MIN if (mnPos == 0) @@ -1828,7 +1732,6 @@ void ScIconSetEntryObj::setType(sal_Int32 nType) } OUString ScIconSetEntryObj::getFormula() - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1844,7 +1747,6 @@ OUString ScIconSetEntryObj::getFormula() } void ScIconSetEntryObj::setFormula(const OUString& rFormula) - throw(uno::RuntimeException, std::exception) { ScColorScaleEntry* pEntry = getCoreObject(); switch (pEntry->GetType()) @@ -1881,13 +1783,11 @@ ScCondDateFormatEntry* ScCondDateFormatObj::getCoreObject() } sal_Int32 ScCondDateFormatObj::getType() - throw(uno::RuntimeException, std::exception) { return sheet::ConditionEntryType::DATE; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondDateFormatObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1897,9 +1797,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCondDateFormatObj::getPropert void SAL_CALL ScCondDateFormatObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1943,8 +1840,6 @@ void SAL_CALL ScCondDateFormatObj::setPropertyValue( } uno::Any SAL_CALL ScCondDateFormatObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1984,32 +1879,24 @@ uno::Any SAL_CALL ScCondDateFormatObj::getPropertyValue( const OUString& aProper void SAL_CALL ScCondDateFormatObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondDateFormatObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener>& /* aListener */) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondDateFormatObj::addVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } void SAL_CALL ScCondDateFormatObj::removeVetoableChangeListener( const OUString&, const uno::Reference<beans::XVetoableChangeListener>&) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_WARN("sc", "not implemented"); } diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index b4a43981531c..0285c94ea007 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -110,7 +110,6 @@ void ScDocumentConfiguration::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocumentConfiguration::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -120,9 +119,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocumentConfiguration::getPro void SAL_CALL ScDocumentConfiguration::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -360,8 +356,6 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue( } uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -527,19 +521,17 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocumentConfiguration ) // XServiceInfo -OUString SAL_CALL ScDocumentConfiguration::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDocumentConfiguration::getImplementationName() { return OUString( "ScDocumentConfiguration" ); } sal_Bool SAL_CALL ScDocumentConfiguration::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScDocumentConfiguration::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {"com.sun.star.comp.SpreadsheetSettings", "com.sun.star.document.Settings"}; diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index fd30a8a048c1..43a2a76e7a16 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -46,7 +46,7 @@ ScCellCursorObj::~ScCellCursorObj() { } -uno::Any SAL_CALL ScCellCursorObj::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScCellCursorObj::queryInterface( const uno::Type& rType ) { SC_QUERYINTERFACE( sheet::XSheetCellCursor ) SC_QUERYINTERFACE( sheet::XUsedAreaCursor ) @@ -65,7 +65,7 @@ void SAL_CALL ScCellCursorObj::release() throw() ScCellRangeObj::release(); } -uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -86,14 +86,14 @@ uno::Sequence<uno::Type> SAL_CALL ScCellCursorObj::getTypes() throw(uno::Runtime return aTypes; } -uno::Sequence<sal_Int8> SAL_CALL ScCellCursorObj::getImplementationId() throw(uno::RuntimeException, std::exception) +uno::Sequence<sal_Int8> SAL_CALL ScCellCursorObj::getImplementationId() { return css::uno::Sequence<sal_Int8>(); } // XSheetCellCursor -void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -119,7 +119,6 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentRegion() throw(uno::RuntimeExcep } void SAL_CALL ScCellCursorObj::collapseToCurrentArray() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -151,7 +150,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray() }*/ } -void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::collapseToMergedArea() { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -169,7 +168,7 @@ void SAL_CALL ScCellCursorObj::collapseToMergedArea() throw(uno::RuntimeExceptio } } -void SAL_CALL ScCellCursorObj::expandToEntireColumns() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::expandToEntireColumns() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -182,7 +181,7 @@ void SAL_CALL ScCellCursorObj::expandToEntireColumns() throw(uno::RuntimeExcepti SetNewRange( aNewRange ); } -void SAL_CALL ScCellCursorObj::expandToEntireRows() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::expandToEntireRows() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -196,7 +195,6 @@ void SAL_CALL ScCellCursorObj::expandToEntireRows() throw(uno::RuntimeException, } void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRows ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( nColumns <= 0 || nRows <= 0 ) @@ -232,7 +230,6 @@ void SAL_CALL ScCellCursorObj::collapseToSize( sal_Int32 nColumns, sal_Int32 nRo // XUsedAreaCursor void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea(sal_Bool bExpand) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -260,7 +257,6 @@ void SAL_CALL ScCellCursorObj::gotoStartOfUsedArea(sal_Bool bExpand) } void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDocShell* pDocSh = GetDocShell(); @@ -289,7 +285,7 @@ void SAL_CALL ScCellCursorObj::gotoEndOfUsedArea( sal_Bool bExpand ) // XCellCursor -void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::gotoStart() { // this is similar to collapseToCurrentRegion //! something like gotoEdge with 4 possible directions is needed @@ -317,7 +313,7 @@ void SAL_CALL ScCellCursorObj::gotoStart() throw(uno::RuntimeException, std::exc } } -void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::gotoEnd() { // this is similar to collapseToCurrentRegion //! something like gotoEdge with 4 possible directions is needed @@ -345,7 +341,7 @@ void SAL_CALL ScCellCursorObj::gotoEnd() throw(uno::RuntimeException, std::excep } } -void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::gotoNext() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -367,7 +363,7 @@ void SAL_CALL ScCellCursorObj::gotoNext() throw(uno::RuntimeException, std::exce SetNewRange( ScRange( nNewX, nNewY, nTab ) ); } -void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScCellCursorObj::gotoPrevious() { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -390,7 +386,6 @@ void SAL_CALL ScCellCursorObj::gotoPrevious() throw(uno::RuntimeException, std:: } void SAL_CALL ScCellCursorObj::gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nRowOffset ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScRangeList& rRanges = GetRangeList(); @@ -416,7 +411,6 @@ void SAL_CALL ScCellCursorObj::gotoOffset( sal_Int32 nColumnOffset, sal_Int32 nR // XSheetCellRange uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellCursorObj::getSpreadsheet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::getSpreadsheet(); @@ -426,7 +420,6 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScCellCursorObj::getSpreadsheet() uno::Reference<table::XCell> SAL_CALL ScCellCursorObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellByPosition(nColumn,nRow); @@ -434,14 +427,13 @@ uno::Reference<table::XCell> SAL_CALL ScCellCursorObj::getCellByPosition( uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom ) - throw(lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByPosition(nLeft,nTop,nRight,nBottom); } uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( - const OUString& rRange ) throw(uno::RuntimeException, std::exception) + const OUString& rRange ) { SolarMutexGuard aGuard; return ScCellRangeObj::getCellRangeByName(rRange); @@ -449,19 +441,17 @@ uno::Reference<table::XCellRange> SAL_CALL ScCellCursorObj::getCellRangeByName( // XServiceInfo -OUString SAL_CALL ScCellCursorObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellCursorObj::getImplementationName() { return OUString( "ScCellCursorObj" ); } sal_Bool SAL_CALL ScCellCursorObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { // get all service names from cell range uno::Sequence<OUString> aParentSeq(ScCellRangeObj::getSupportedServiceNames()); diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index ecff34578f60..b5d0bccf66eb 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -350,7 +350,6 @@ ScDataPilotTableObj* ScDataPilotTablesObj::GetObjectByName_Impl(const OUString& } Reference<XDataPilotDescriptor> SAL_CALL ScDataPilotTablesObj::createDataPilotDescriptor() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -398,7 +397,6 @@ static OUString lcl_GetOriginalName(const Reference< XNamed >& rDim) void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName, const CellAddress& aOutputAddress, const Reference<XDataPilotDescriptor>& xDescriptor ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!xDescriptor.is()) return; @@ -437,7 +435,6 @@ void SAL_CALL ScDataPilotTablesObj::insertNewByName( const OUString& aNewName, } void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject( pDocShell, nTab, aName ); @@ -452,7 +449,7 @@ void SAL_CALL ScDataPilotTablesObj::removeByName( const OUString& aName ) // XEnumerationAccess -Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() throw(RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotTablesEnumeration")); @@ -460,7 +457,7 @@ Reference< XEnumeration > SAL_CALL ScDataPilotTablesObj::createEnumeration() thr // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() { SolarMutexGuard aGuard; if ( pDocShell ) @@ -487,7 +484,6 @@ sal_Int32 SAL_CALL ScDataPilotTablesObj::getCount() throw(RuntimeException, std: } Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XDataPilotTable2> xTable(GetObjectByIndex_Impl(nIndex)); @@ -496,13 +492,13 @@ Any SAL_CALL ScDataPilotTablesObj::getByIndex( sal_Int32 nIndex ) return Any( xTable ); } -uno::Type SAL_CALL ScDataPilotTablesObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotTablesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XDataPilotTable2>::get(); } -sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -511,7 +507,6 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasElements() throw(RuntimeException, st // XNameAccess Any SAL_CALL ScDataPilotTablesObj::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XDataPilotTable2> xTable(GetObjectByName_Impl(aName)); @@ -521,7 +516,6 @@ Any SAL_CALL ScDataPilotTablesObj::getByName( const OUString& aName ) } Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -559,7 +553,6 @@ Sequence<OUString> SAL_CALL ScDataPilotTablesObj::getElementNames() } sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -597,7 +590,6 @@ ScDataPilotDescriptorBase::~ScDataPilotDescriptorBase() } Any SAL_CALL ScDataPilotDescriptorBase::queryInterface( const uno::Type& rType ) - throw(RuntimeException, std::exception) { SC_QUERYINTERFACE( XDataPilotDescriptor ) SC_QUERYINTERFACE( XPropertySet ) @@ -621,7 +613,6 @@ void SAL_CALL ScDataPilotDescriptorBase::release() throw() } Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes() - throw(RuntimeException, std::exception) { static Sequence< uno::Type > aTypes; if ( aTypes.getLength() == 0 ) @@ -639,7 +630,6 @@ Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes() } Sequence<sal_Int8> SAL_CALL ScDataPilotDescriptorBase::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -657,7 +647,6 @@ void ScDataPilotDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XDataPilotDescriptor CellRangeAddress SAL_CALL ScDataPilotDescriptorBase::getSourceRange() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -671,7 +660,7 @@ CellRangeAddress SAL_CALL ScDataPilotDescriptorBase::getSourceRange() return aRet; } -void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& aSourceRange ) throw(RuntimeException, std::exception) +void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& aSourceRange ) { SolarMutexGuard aGuard; @@ -691,49 +680,42 @@ void SAL_CALL ScDataPilotDescriptorBase::setSourceRange( const CellRangeAddress& } Reference<XSheetFilterDescriptor> SAL_CALL ScDataPilotDescriptorBase::getFilterDescriptor() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFilterDescriptor( pDocShell, this ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getDataPilotFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getColumnFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_COLUMN ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getRowFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_ROW ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getPageFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_PAGE ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getDataFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_DATA ); } Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getHiddenFields() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScDataPilotFieldsObj( *this, DataPilotFieldOrientation_HIDDEN ); @@ -741,7 +723,6 @@ Reference<XIndexAccess> SAL_CALL ScDataPilotDescriptorBase::getHiddenFields() // XPropertySet Reference< XPropertySetInfo > SAL_CALL ScDataPilotDescriptorBase::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; static Reference<XPropertySetInfo> aRef = @@ -750,8 +731,6 @@ Reference< XPropertySetInfo > SAL_CALL ScDataPilotDescriptorBase::getPropertySet } void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, - WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObject = GetDPObject(); @@ -895,8 +874,6 @@ void SAL_CALL ScDataPilotDescriptorBase::setPropertyValue( const OUString& aProp } Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; Any aRet; @@ -1007,32 +984,27 @@ Any SAL_CALL ScDataPilotDescriptorBase::getPropertyValue( const OUString& aPrope void SAL_CALL ScDataPilotDescriptorBase::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference<XPropertyChangeListener >& /* xListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotDescriptorBase::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference<XPropertyChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotDescriptorBase::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference<XVetoableChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotDescriptorBase::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference<XVetoableChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } // XDataPilotDataLayoutFieldSupplier Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutField() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if( ScDPObject* pDPObject = GetDPObject() ) @@ -1052,7 +1024,7 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotDescriptorBase::getDataLayoutFi // XUnoTunnel sal_Int64 SAL_CALL ScDataPilotDescriptorBase::getSomething( - const Sequence<sal_Int8 >& rId ) throw(RuntimeException, std::exception) + const Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -1095,7 +1067,6 @@ ScDataPilotTableObj::~ScDataPilotTableObj() } Any SAL_CALL ScDataPilotTableObj::queryInterface( const uno::Type& rType ) - throw(RuntimeException, std::exception) { // since we manually do resolve the query for XDataPilotTable2 // we also need to do the same for XDataPilotTable @@ -1116,7 +1087,7 @@ void SAL_CALL ScDataPilotTableObj::release() throw() ScDataPilotDescriptorBase::release(); } -Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeException, std::exception) +Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() { static Sequence< uno::Type > aTypes; if ( aTypes.getLength() == 0 ) @@ -1137,7 +1108,6 @@ Sequence< uno::Type > SAL_CALL ScDataPilotTableObj::getTypes() throw(RuntimeExce } Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId() - throw(RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1160,7 +1130,7 @@ void ScDataPilotTableObj::SetDPObject( ScDPObject* pDPObject ) // "rest of XDataPilotDescriptor" -OUString SAL_CALL ScDataPilotTableObj::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotTableObj::getName() { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1170,7 +1140,6 @@ OUString SAL_CALL ScDataPilotTableObj::getName() throw(RuntimeException, std::ex } void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1186,7 +1155,7 @@ void SAL_CALL ScDataPilotTableObj::setName( const OUString& aNewName ) } } -OUString SAL_CALL ScDataPilotTableObj::getTag() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotTableObj::getTag() { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1196,7 +1165,6 @@ OUString SAL_CALL ScDataPilotTableObj::getTag() throw(RuntimeException, std::exc } void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1211,7 +1179,7 @@ void SAL_CALL ScDataPilotTableObj::setTag( const OUString& aNewTag ) // XDataPilotTable -CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeException, std::exception) +CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() { SolarMutexGuard aGuard; CellRangeAddress aRet; @@ -1228,7 +1196,7 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRange() throw(RuntimeExc return aRet; } -void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException, std::exception) +void SAL_CALL ScDataPilotTableObj::refresh() { SolarMutexGuard aGuard; ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1240,7 +1208,6 @@ void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException, std::except } Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const CellAddress& aAddr) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; Sequence< Sequence<Any> > aTabData; @@ -1254,7 +1221,6 @@ Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const C } DataPilotTablePositionData SAL_CALL ScDataPilotTableObj::getPositionData(const CellAddress& aAddr) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; DataPilotTablePositionData aPosData; @@ -1268,7 +1234,6 @@ DataPilotTablePositionData SAL_CALL ScDataPilotTableObj::getPositionData(const C } void SAL_CALL ScDataPilotTableObj::insertDrillDownSheet(const CellAddress& aAddr) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = GetDPObject(); @@ -1285,7 +1250,6 @@ void SAL_CALL ScDataPilotTableObj::insertDrillDownSheet(const CellAddress& aAddr } CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRangeByType( sal_Int32 nType ) - throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nType < 0 || nType > DataPilotOutputRangeType::RESULT) @@ -1298,7 +1262,6 @@ CellRangeAddress SAL_CALL ScDataPilotTableObj::getOutputRangeByType( sal_Int32 n } void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util::XModifyListener>& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1311,7 +1274,6 @@ void SAL_CALL ScDataPilotTableObj::addModifyListener( const uno::Reference<util: } void SAL_CALL ScDataPilotTableObj::removeModifyListener( const uno::Reference<util::XModifyListener>& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1412,27 +1374,25 @@ void ScDataPilotDescriptor::SetDPObject( ScDPObject* pDPObject ) // "rest of XDataPilotDescriptor" -OUString SAL_CALL ScDataPilotDescriptor::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotDescriptor::getName() { SolarMutexGuard aGuard; return mpDPObject->GetName(); } void SAL_CALL ScDataPilotDescriptor::setName( const OUString& aNewName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; mpDPObject->SetName( aNewName ); } -OUString SAL_CALL ScDataPilotDescriptor::getTag() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotDescriptor::getTag() { SolarMutexGuard aGuard; return mpDPObject->GetTag(); } void SAL_CALL ScDataPilotDescriptor::setTag( const OUString& aNewTag ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; mpDPObject->SetTag( aNewTag ); @@ -1707,7 +1667,6 @@ ScDataPilotFieldObj* ScDataPilotFieldsObj::GetObjectByName_Impl(const OUString& // XEnumerationAccess Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotFieldsEnumeration")); @@ -1715,7 +1674,7 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldsObj::createEnumeration() // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() { SolarMutexGuard aGuard; // TODO @@ -1724,7 +1683,6 @@ sal_Int32 SAL_CALL ScDataPilotFieldsObj::getCount() throw(RuntimeException, std: } Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference< XPropertySet > xField( GetObjectByIndex_Impl( nIndex ) ); @@ -1733,20 +1691,19 @@ Any SAL_CALL ScDataPilotFieldsObj::getByIndex( sal_Int32 nIndex ) return Any( xField ); } -uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotFieldsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XPropertySet>::get(); } -sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } Any SAL_CALL ScDataPilotFieldsObj::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XPropertySet> xField(GetObjectByName_Impl(aName)); @@ -1756,7 +1713,6 @@ Any SAL_CALL ScDataPilotFieldsObj::getByName( const OUString& aName ) } Sequence<OUString> SAL_CALL ScDataPilotFieldsObj::getElementNames() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; // TODO @@ -1780,7 +1736,6 @@ Sequence<OUString> SAL_CALL ScDataPilotFieldsObj::getElementNames() } sal_Bool SAL_CALL ScDataPilotFieldsObj::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1809,7 +1764,6 @@ ScDataPilotFieldObj::~ScDataPilotFieldObj() // XNamed OUString SAL_CALL ScDataPilotFieldObj::getName() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aName; @@ -1829,7 +1783,6 @@ OUString SAL_CALL ScDataPilotFieldObj::getName() } void SAL_CALL ScDataPilotFieldObj::setName(const OUString& rName) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = nullptr; @@ -1844,7 +1797,6 @@ void SAL_CALL ScDataPilotFieldObj::setName(const OUString& rName) // XPropertySet Reference<XPropertySetInfo> SAL_CALL ScDataPilotFieldObj::getPropertySetInfo() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; static Reference<XPropertySetInfo> aRef( @@ -1853,9 +1805,6 @@ Reference<XPropertySetInfo> SAL_CALL ScDataPilotFieldObj::getPropertySetInfo() } void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aPropertyName == SC_UNONAME_FUNCTION ) @@ -1973,8 +1922,6 @@ void SAL_CALL ScDataPilotFieldObj::setPropertyValue( const OUString& aPropertyNa } Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; Any aRet; @@ -2068,7 +2015,6 @@ Any SAL_CALL ScDataPilotFieldObj::getPropertyValue( const OUString& aPropertyNam // XDatePilotField Reference<XIndexAccess> SAL_CALL ScDataPilotFieldObj::getItems() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxItems.is()) @@ -2563,8 +2509,6 @@ bool ScDataPilotFieldObj::HasString(const Sequence< OUString >& rItems, const OU // XDataPilotFieldGrouping Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( const Sequence< OUString >& rItems ) - throw (RuntimeException, IllegalArgumentException, - std::exception) { SolarMutexGuard aGuard; @@ -2733,8 +2677,6 @@ Reference< XDataPilotField > SAL_CALL ScDataPilotFieldObj::createNameGroup( cons } Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( const DataPilotFieldGroupInfo& rInfo ) - throw (RuntimeException, IllegalArgumentException, - std::exception) { SolarMutexGuard aGuard; using namespace ::com::sun::star::sheet::DataPilotFieldGroupBy; @@ -2900,7 +2842,6 @@ ScDataPilotFieldGroupsObj::~ScDataPilotFieldGroupsObj() // XNameAccess Any SAL_CALL ScDataPilotFieldGroupsObj::getByName( const OUString& rName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if( implFindByName( rName ) == maGroups.end() ) @@ -2908,7 +2849,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByName( const OUString& rName ) return Any( Reference< XNameAccess >( new ScDataPilotFieldGroupObj( *this, rName ) ) ); } -Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() { SolarMutexGuard aGuard; Sequence< OUString > aSeq; @@ -2922,7 +2863,7 @@ Sequence< OUString > SAL_CALL ScDataPilotFieldGroupsObj::getElementNames() throw return aSeq; } -sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName ) { SolarMutexGuard aGuard; return implFindByName( rName ) != maGroups.end(); @@ -2931,7 +2872,6 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasByName( const OUString& rName ) // XNameReplace void SAL_CALL ScDataPilotFieldGroupsObj::replaceByName( const OUString& rName, const Any& rElement ) - throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2954,7 +2894,6 @@ void SAL_CALL ScDataPilotFieldGroupsObj::replaceByName( const OUString& rName, c // XNameContainer void SAL_CALL ScDataPilotFieldGroupsObj::insertByName( const OUString& rName, const Any& rElement ) - throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2978,7 +2917,6 @@ void SAL_CALL ScDataPilotFieldGroupsObj::insertByName( const OUString& rName, co } void SAL_CALL ScDataPilotFieldGroupsObj::removeByName( const OUString& rName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2994,14 +2932,13 @@ void SAL_CALL ScDataPilotFieldGroupsObj::removeByName( const OUString& rName ) // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotFieldGroupsObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotFieldGroupsObj::getCount() { SolarMutexGuard aGuard; return static_cast< sal_Int32 >( maGroups.size() ); } Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if ((nIndex < 0) || (nIndex >= static_cast< sal_Int32 >( maGroups.size() ))) @@ -3011,7 +2948,7 @@ Any SAL_CALL ScDataPilotFieldGroupsObj::getByIndex( sal_Int32 nIndex ) // XEnumerationAccess -Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() throw(RuntimeException, std::exception) +Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() { SolarMutexGuard aGuard; return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupsEnumeration" ) ); @@ -3019,13 +2956,13 @@ Reference<XEnumeration> SAL_CALL ScDataPilotFieldGroupsObj::createEnumeration() // XElementAccess -uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotFieldGroupsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XNameAccess>::get(); } -sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() { SolarMutexGuard aGuard; return !maGroups.empty(); @@ -3033,7 +2970,7 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupsObj::hasElements() throw(RuntimeExceptio // implementation -ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName ) throw(RuntimeException) +ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName ) { SolarMutexGuard aGuard; ScFieldGroups::iterator aIt = implFindByName( rName ); @@ -3042,7 +2979,7 @@ ScFieldGroup& ScDataPilotFieldGroupsObj::getFieldGroup( const OUString& rName ) return *aIt; } -void ScDataPilotFieldGroupsObj::renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) throw(RuntimeException) +void ScDataPilotFieldGroupsObj::renameFieldGroup( const OUString& rOldName, const OUString& rNewName ) { SolarMutexGuard aGuard; ScFieldGroups::iterator aOldIt = implFindByName( rOldName ); @@ -3092,7 +3029,6 @@ ScDataPilotFieldGroupObj::~ScDataPilotFieldGroupObj() // XNameAccess Any SAL_CALL ScDataPilotFieldGroupObj::getByName( const OUString& rName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers; @@ -3102,13 +3038,13 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByName( const OUString& rName ) return Any( Reference< XNamed >( new ScDataPilotFieldGroupItemObj( *this, *aIt ) ) ); } -Sequence< OUString > SAL_CALL ScDataPilotFieldGroupObj::getElementNames() throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ScDataPilotFieldGroupObj::getElementNames() { SolarMutexGuard aGuard; return ::comphelper::containerToSequence( mrParent.getFieldGroup( maGroupName ).maMembers ); } -sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) { SolarMutexGuard aGuard; ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers; @@ -3118,7 +3054,6 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasByName( const OUString& rName ) t // XNameReplace void SAL_CALL ScDataPilotFieldGroupObj::replaceByName( const OUString& rName, const Any& rElement ) - throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3144,7 +3079,6 @@ void SAL_CALL ScDataPilotFieldGroupObj::replaceByName( const OUString& rName, co // XNameContainer void SAL_CALL ScDataPilotFieldGroupObj::insertByName( const OUString& rName, const Any& /*rElement*/ ) - throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3161,7 +3095,6 @@ void SAL_CALL ScDataPilotFieldGroupObj::insertByName( const OUString& rName, con } void SAL_CALL ScDataPilotFieldGroupObj::removeByName( const OUString& rName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -3177,14 +3110,13 @@ void SAL_CALL ScDataPilotFieldGroupObj::removeByName( const OUString& rName ) // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotFieldGroupObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotFieldGroupObj::getCount() { SolarMutexGuard aGuard; return static_cast< sal_Int32 >( mrParent.getFieldGroup( maGroupName ).maMembers.size() ); } Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; ScFieldGroupMembers& rMembers = mrParent.getFieldGroup( maGroupName ).maMembers; @@ -3195,7 +3127,7 @@ Any SAL_CALL ScDataPilotFieldGroupObj::getByIndex( sal_Int32 nIndex ) // XEnumerationAccess -Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() throw(RuntimeException, std::exception) +Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() { SolarMutexGuard aGuard; return new ScIndexEnumeration( this, OUString( "com.sun.star.sheet.DataPilotFieldGroupEnumeration" ) ); @@ -3203,13 +3135,13 @@ Reference< XEnumeration > SAL_CALL ScDataPilotFieldGroupObj::createEnumeration() // XElementAccess -uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotFieldGroupObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XNamed>::get(); } -sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() { SolarMutexGuard aGuard; return !mrParent.getFieldGroup( maGroupName ).maMembers.empty(); @@ -3217,13 +3149,13 @@ sal_Bool SAL_CALL ScDataPilotFieldGroupObj::hasElements() throw(RuntimeException // XNamed -OUString SAL_CALL ScDataPilotFieldGroupObj::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotFieldGroupObj::getName() { SolarMutexGuard aGuard; return maGroupName; } -void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) throw(RuntimeException, std::exception) +void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) { SolarMutexGuard aGuard; mrParent.renameFieldGroup( maGroupName, rName ); @@ -3245,13 +3177,13 @@ ScDataPilotFieldGroupItemObj::~ScDataPilotFieldGroupItemObj() // XNamed -OUString SAL_CALL ScDataPilotFieldGroupItemObj::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotFieldGroupItemObj::getName() { SolarMutexGuard aGuard; return maName; } -void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) throw(RuntimeException, std::exception) +void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) { SolarMutexGuard aGuard; mrParent.replaceByName( maName, Any( rName ) ); @@ -3279,7 +3211,6 @@ ScDataPilotItemObj* ScDataPilotItemsObj::GetObjectByIndex_Impl( sal_Int32 nIndex // XNameAccess Any SAL_CALL ScDataPilotItemsObj::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference<XNameAccess> xMembers = GetMembers(); @@ -3303,7 +3234,6 @@ Any SAL_CALL ScDataPilotItemsObj::getByName( const OUString& aName ) } Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; Sequence< OUString > aSeq; @@ -3313,7 +3243,6 @@ Sequence<OUString> SAL_CALL ScDataPilotItemsObj::getElementNames() } sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bFound = false; @@ -3338,7 +3267,6 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasByName( const OUString& aName ) // XEnumerationAccess Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DataPilotItemsEnumeration")); @@ -3346,14 +3274,13 @@ Reference<XEnumeration> SAL_CALL ScDataPilotItemsObj::createEnumeration() // XIndexAccess -sal_Int32 SAL_CALL ScDataPilotItemsObj::getCount() throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDataPilotItemsObj::getCount() { SolarMutexGuard aGuard; return GetMemberCount(); } Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex ) - throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference< XPropertySet > xItem( GetObjectByIndex_Impl( nIndex ) ); @@ -3362,13 +3289,13 @@ Any SAL_CALL ScDataPilotItemsObj::getByIndex( sal_Int32 nIndex ) return Any( xItem ); } -uno::Type SAL_CALL ScDataPilotItemsObj::getElementType() throw(RuntimeException, std::exception) +uno::Type SAL_CALL ScDataPilotItemsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<XPropertySet>::get(); } -sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -3386,7 +3313,7 @@ ScDataPilotItemObj::~ScDataPilotItemObj() } // XNamed -OUString SAL_CALL ScDataPilotItemObj::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL ScDataPilotItemObj::getName() { SolarMutexGuard aGuard; OUString sRet; @@ -3405,14 +3332,12 @@ OUString SAL_CALL ScDataPilotItemObj::getName() throw(RuntimeException, std::exc } void SAL_CALL ScDataPilotItemObj::setName( const OUString& /* aName */ ) - throw(RuntimeException, std::exception) { } // XPropertySet Reference< XPropertySetInfo > SAL_CALL ScDataPilotItemObj::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { SolarMutexGuard aGuard; static Reference<XPropertySetInfo> aRef = @@ -3421,9 +3346,6 @@ Reference< XPropertySetInfo > } void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) - throw (UnknownPropertyException, PropertyVetoException, - IllegalArgumentException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDPObject* pDPObj = nullptr; @@ -3475,8 +3397,6 @@ void SAL_CALL ScDataPilotItemObj::setPropertyValue( const OUString& aPropertyNam } Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName ) - throw (UnknownPropertyException, WrappedTargetException, - RuntimeException, std::exception) { SolarMutexGuard aGuard; Any aRet; @@ -3534,25 +3454,21 @@ Any SAL_CALL ScDataPilotItemObj::getPropertyValue( const OUString& aPropertyName void SAL_CALL ScDataPilotItemObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* xListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotItemObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference< XPropertyChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotItemObj::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } void SAL_CALL ScDataPilotItemObj::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< XVetoableChangeListener >& /* aListener */ ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { } diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index a955e551cb1d..a2a282e56c59 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -458,7 +458,7 @@ ScSubTotalFieldObj::~ScSubTotalFieldObj() // XSubTotalField -sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -467,7 +467,7 @@ sal_Int32 SAL_CALL ScSubTotalFieldObj::getGroupColumn() throw(uno::RuntimeExcept return aParam.nField[nPos]; } -void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -479,7 +479,6 @@ void SAL_CALL ScSubTotalFieldObj::setGroupColumn( sal_Int32 nGroupColumn ) throw } uno::Sequence<sheet::SubTotalColumn> SAL_CALL ScSubTotalFieldObj::getSubTotalColumns() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -499,7 +498,6 @@ uno::Sequence<sheet::SubTotalColumn> SAL_CALL ScSubTotalFieldObj::getSubTotalCol void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns( const uno::Sequence<sheet::SubTotalColumn>& aSubTotalColumns ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -551,7 +549,7 @@ ScSubTotalFieldObj* ScSubTotalDescriptorBase::GetObjectByIndex_Impl(sal_uInt16 n return nullptr; } -void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScSubTotalDescriptorBase::clear() { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -567,7 +565,7 @@ void SAL_CALL ScSubTotalDescriptorBase::clear() throw(uno::RuntimeException, std void SAL_CALL ScSubTotalDescriptorBase::addNew( const uno::Sequence<sheet::SubTotalColumn>& aSubTotalColumns, - sal_Int32 nGroupColumn ) throw(uno::RuntimeException, std::exception) + sal_Int32 nGroupColumn ) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -618,7 +616,6 @@ void SAL_CALL ScSubTotalDescriptorBase::addNew( // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SubTotalFieldsEnumeration")); @@ -626,7 +623,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScSubTotalDescriptorBase::creat // XIndexAccess -sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -639,8 +636,6 @@ sal_Int32 SAL_CALL ScSubTotalDescriptorBase::getCount() throw(uno::RuntimeExcept } uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSubTotalField> xField(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -650,13 +645,13 @@ uno::Any SAL_CALL ScSubTotalDescriptorBase::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScSubTotalDescriptorBase::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSubTotalField>::get(); } -sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -665,7 +660,6 @@ sal_Bool SAL_CALL ScSubTotalDescriptorBase::hasElements() throw(uno::RuntimeExce // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSubTotalDescriptorBase::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -675,9 +669,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSubTotalDescriptorBase::getPr void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -716,8 +707,6 @@ void SAL_CALL ScSubTotalDescriptorBase::setPropertyValue( } uno::Any SAL_CALL ScSubTotalDescriptorBase::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSubTotalParam aParam; @@ -752,7 +741,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSubTotalDescriptorBase ) // XUnoTunnel sal_Int64 SAL_CALL ScSubTotalDescriptorBase::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -841,21 +830,19 @@ void ScConsolidationDescriptor::SetParam( const ScConsolidateParam& rNew ) // XConsolidationDescriptor -sheet::GeneralFunction SAL_CALL ScConsolidationDescriptor::getFunction() throw(uno::RuntimeException, std::exception) +sheet::GeneralFunction SAL_CALL ScConsolidationDescriptor::getFunction() { SolarMutexGuard aGuard; return ScDataUnoConversion::SubTotalToGeneral(aParam.eFunction); } void SAL_CALL ScConsolidationDescriptor::setFunction( sheet::GeneralFunction nFunction ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.eFunction = ScDPUtil::toSubTotalFunc(nFunction); } uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSources() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = aParam.nDataAreaCount; @@ -882,7 +869,6 @@ uno::Sequence<table::CellRangeAddress> SAL_CALL ScConsolidationDescriptor::getSo void SAL_CALL ScConsolidationDescriptor::setSources( const uno::Sequence<table::CellRangeAddress>& aSources ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = (sal_uInt16)aSources.getLength(); @@ -906,7 +892,6 @@ void SAL_CALL ScConsolidationDescriptor::setSources( } table::CellAddress SAL_CALL ScConsolidationDescriptor::getStartOutputPosition() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; table::CellAddress aPos; @@ -918,7 +903,6 @@ table::CellAddress SAL_CALL ScConsolidationDescriptor::getStartOutputPosition() void SAL_CALL ScConsolidationDescriptor::setStartOutputPosition( const table::CellAddress& aStartOutputPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.nCol = (SCCOL)aStartOutputPosition.Column; @@ -926,40 +910,37 @@ void SAL_CALL ScConsolidationDescriptor::setStartOutputPosition( aParam.nTab = aStartOutputPosition.Sheet; } -sal_Bool SAL_CALL ScConsolidationDescriptor::getUseColumnHeaders() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScConsolidationDescriptor::getUseColumnHeaders() { SolarMutexGuard aGuard; return aParam.bByCol; } void SAL_CALL ScConsolidationDescriptor::setUseColumnHeaders( sal_Bool bUseColumnHeaders ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.bByCol = bUseColumnHeaders; } -sal_Bool SAL_CALL ScConsolidationDescriptor::getUseRowHeaders() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScConsolidationDescriptor::getUseRowHeaders() { SolarMutexGuard aGuard; return aParam.bByRow; } void SAL_CALL ScConsolidationDescriptor::setUseRowHeaders( sal_Bool bUseRowHeaders ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.bByRow = bUseRowHeaders; } -sal_Bool SAL_CALL ScConsolidationDescriptor::getInsertLinks() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScConsolidationDescriptor::getInsertLinks() { SolarMutexGuard aGuard; return aParam.bReferenceData; } void SAL_CALL ScConsolidationDescriptor::setInsertLinks( sal_Bool bInsertLinks ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aParam.bReferenceData = bInsertLinks; @@ -992,7 +973,6 @@ void ScFilterDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XSheetFilterDescriptor and XSheetFilterDescriptor2 uno::Sequence<sheet::TableFilterField> SAL_CALL ScFilterDescriptorBase::getFilterFields() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1209,7 +1189,6 @@ void fillQueryParam( } uno::Sequence<sheet::TableFilterField2> SAL_CALL ScFilterDescriptorBase::getFilterFields2() -throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1260,7 +1239,6 @@ throw(uno::RuntimeException, std::exception) } uno::Sequence<sheet::TableFilterField3> SAL_CALL ScFilterDescriptorBase::getFilterFields3() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1321,7 +1299,6 @@ uno::Sequence<sheet::TableFilterField3> SAL_CALL ScFilterDescriptorBase::getFilt void SAL_CALL ScFilterDescriptorBase::setFilterFields( const uno::Sequence<sheet::TableFilterField>& aFilterFields ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1387,7 +1364,6 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields( void SAL_CALL ScFilterDescriptorBase::setFilterFields2( const uno::Sequence<sheet::TableFilterField2>& aFilterFields ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1398,7 +1374,6 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields2( void SAL_CALL ScFilterDescriptorBase::setFilterFields3( const uno::Sequence<sheet::TableFilterField3>& aFilterFields ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1412,7 +1387,6 @@ void SAL_CALL ScFilterDescriptorBase::setFilterFields3( // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFilterDescriptorBase::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1422,9 +1396,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFilterDescriptorBase::getProp void SAL_CALL ScFilterDescriptorBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1469,8 +1440,6 @@ void SAL_CALL ScFilterDescriptorBase::setPropertyValue( } uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScQueryParam aParam; @@ -1667,14 +1636,13 @@ ScDBData* ScDatabaseRangeObj::GetDBData_Impl() const // XNamed -OUString SAL_CALL ScDatabaseRangeObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDatabaseRangeObj::getName() { SolarMutexGuard aGuard; return aName; } void SAL_CALL ScDatabaseRangeObj::setName( const OUString& aNewName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1688,7 +1656,7 @@ void SAL_CALL ScDatabaseRangeObj::setName( const OUString& aNewName ) // XDatabaseRange -table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() { SolarMutexGuard aGuard; table::CellRangeAddress aAddress; @@ -1707,7 +1675,6 @@ table::CellRangeAddress SAL_CALL ScDatabaseRangeObj::getDataArea() throw(uno::Ru } void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aDataArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDBData* pData = GetDBData_Impl(); @@ -1723,7 +1690,6 @@ void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aD } uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getSortDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSortParam aParam; @@ -1795,7 +1761,6 @@ void ScDatabaseRangeObj::SetQueryParam(const ScQueryParam& rQueryParam) } uno::Reference<sheet::XSheetFilterDescriptor> SAL_CALL ScDatabaseRangeObj::getFilterDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScRangeFilterDescriptor(pDocShell, this); @@ -1855,14 +1820,12 @@ void ScDatabaseRangeObj::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam) } uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScDatabaseRangeObj::getSubTotalDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScRangeSubTotalDescriptor(this); } uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getImportDescriptor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScImportParam aParam; @@ -1877,7 +1840,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getImportDescri // XRefreshable -void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDatabaseRangeObj::refresh() { SolarMutexGuard aGuard; ScDBData* pData = GetDBData_Impl(); @@ -1906,7 +1869,6 @@ void SAL_CALL ScDatabaseRangeObj::refresh() throw(uno::RuntimeException, std::ex void SAL_CALL ScDatabaseRangeObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRefreshListeners.push_back( uno::Reference<util::XRefreshListener>( xListener )); @@ -1918,7 +1880,6 @@ void SAL_CALL ScDatabaseRangeObj::addRefreshListener( void SAL_CALL ScDatabaseRangeObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = aRefreshListeners.size(); @@ -1946,7 +1907,6 @@ void ScDatabaseRangeObj::Refreshed_Impl() // XCellRangeSource uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aRange; @@ -1967,7 +1927,6 @@ uno::Reference<table::XCellRange> SAL_CALL ScDatabaseRangeObj::getReferredCells( // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDatabaseRangeObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1977,9 +1936,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDatabaseRangeObj::getProperty void SAL_CALL ScDatabaseRangeObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScDBData* pData = GetDBData_Impl(); @@ -2073,8 +2029,6 @@ void SAL_CALL ScDatabaseRangeObj::setPropertyValue( } uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -2157,19 +2111,17 @@ uno::Any SAL_CALL ScDatabaseRangeObj::getPropertyValue( const OUString& aPropert SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDatabaseRangeObj ) // XServiceInfo -OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDatabaseRangeObj::getImplementationName() { return OUString( "ScDatabaseRangeObj" ); } sal_Bool SAL_CALL ScDatabaseRangeObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {"com.sun.star.sheet.DatabaseRange", SCLINKTARGET_SERVICE}; @@ -2230,7 +2182,6 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const OUString& aN void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, const table::CellRangeAddress& aRange ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -2247,7 +2198,6 @@ void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, } void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -2263,7 +2213,6 @@ void SAL_CALL ScDatabaseRangesObj::removeByName( const OUString& aName ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DatabaseRangesEnumeration")); @@ -2271,7 +2220,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDatabaseRangesObj::createEnum // XIndexAccess -sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() { SolarMutexGuard aGuard; @@ -2287,8 +2236,6 @@ sal_Int32 SAL_CALL ScDatabaseRangesObj::getCount() throw(uno::RuntimeException, } uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nIndex < 0) @@ -2301,13 +2248,13 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScDatabaseRangesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDatabaseRangesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XDatabaseRange>::get(); } -sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -2316,8 +2263,6 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasElements() throw(uno::RuntimeException // XNameAccess uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XDatabaseRange> xRange(GetObjectByName_Impl(aName)); @@ -2329,7 +2274,6 @@ uno::Any SAL_CALL ScDatabaseRangesObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2353,7 +2297,6 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangesObj::getElementNames() } sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2395,8 +2338,6 @@ void ScUnnamedDatabaseRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XUnnamedDatabaseRanges void ScUnnamedDatabaseRangesObj::setByTable( const table::CellRangeAddress& aRange ) - throw( uno::RuntimeException, - lang::IndexOutOfBoundsException, std::exception ) { SolarMutexGuard aGuard; bool bDone = false; @@ -2416,9 +2357,6 @@ void ScUnnamedDatabaseRangesObj::setByTable( const table::CellRangeAddress& aRan } uno::Any ScUnnamedDatabaseRangesObj::getByTable( sal_Int32 nTab ) - throw(uno::RuntimeException, - lang::IndexOutOfBoundsException, - container::NoSuchElementException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -2437,8 +2375,6 @@ uno::Any ScUnnamedDatabaseRangesObj::getByTable( sal_Int32 nTab ) } sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab ) - throw (uno::RuntimeException, - lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index f7a6ba2888e3..e245b9dd5c27 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -108,7 +108,6 @@ void ScDocDefaultsObj::ItemsChanged() // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo( @@ -118,9 +117,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySe void SAL_CALL ScDocDefaultsObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -201,8 +197,6 @@ void SAL_CALL ScDocDefaultsObj::setPropertyValue( } uno::Any SAL_CALL ScDocDefaultsObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { // use pool default if set @@ -251,7 +245,6 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDocDefaultsObj ) // XPropertyState beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -286,7 +279,6 @@ beans::PropertyState SAL_CALL ScDocDefaultsObj::getPropertyState( const OUString uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates( const uno::Sequence<OUString>& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { // the simple way: call getPropertyState @@ -300,7 +292,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScDocDefaultsObj::getPropertyStates } void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -321,8 +312,6 @@ void SAL_CALL ScDocDefaultsObj::setPropertyToDefault( const OUString& aPropertyN } uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { // always use static default diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 24957eecc4a8..885cf33de385 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -91,7 +91,6 @@ void ScDispatchProviderInterceptor::Notify( SfxBroadcaster&, const SfxHint& rHin uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDispatch( const util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -116,7 +115,6 @@ uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDi uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL ScDispatchProviderInterceptor::queryDispatches( const uno::Sequence<frame::DispatchDescriptor>& aDescripts ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -135,7 +133,6 @@ uno::Sequence< uno::Reference<frame::XDispatch> > SAL_CALL uno::Reference<frame::XDispatchProvider> SAL_CALL ScDispatchProviderInterceptor::getSlaveDispatchProvider() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_xSlaveDispatcher; @@ -143,7 +140,6 @@ uno::Reference<frame::XDispatchProvider> SAL_CALL void SAL_CALL ScDispatchProviderInterceptor::setSlaveDispatchProvider( const uno::Reference<frame::XDispatchProvider>& xNewDispatchProvider ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; m_xSlaveDispatcher.set(xNewDispatchProvider); @@ -151,7 +147,6 @@ void SAL_CALL ScDispatchProviderInterceptor::setSlaveDispatchProvider( uno::Reference<frame::XDispatchProvider> SAL_CALL ScDispatchProviderInterceptor::getMasterDispatchProvider() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return m_xMasterDispatcher; @@ -159,7 +154,6 @@ uno::Reference<frame::XDispatchProvider> SAL_CALL void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider( const uno::Reference<frame::XDispatchProvider>& xNewSupplier ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; m_xMasterDispatcher.set(xNewSupplier); @@ -168,7 +162,6 @@ void SAL_CALL ScDispatchProviderInterceptor::setMasterDispatchProvider( // XEventListener void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject& /* Source */ ) - throw(css::uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -216,7 +209,6 @@ void ScDispatch::Notify( SfxBroadcaster&, const SfxHint& rHint ) void SAL_CALL ScDispatch::dispatch( const util::URL& aURL, const uno::Sequence<beans::PropertyValue>& aArgs ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -264,7 +256,6 @@ static void lcl_FillDataSource( frame::FeatureStateEvent& rEvent, const ScImport void SAL_CALL ScDispatch::addStatusListener( const uno::Reference<frame::XStatusListener>& xListener, const util::URL& aURL) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -302,7 +293,6 @@ void SAL_CALL ScDispatch::addStatusListener( void SAL_CALL ScDispatch::removeStatusListener( const uno::Reference<frame::XStatusListener>& xListener, const util::URL& aURL ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -332,7 +322,6 @@ void SAL_CALL ScDispatch::removeStatusListener( // XSelectionChangeListener void SAL_CALL ScDispatch::selectionChanged( const css::lang::EventObject& /* aEvent */ ) - throw (css::uno::RuntimeException, std::exception) { // currently only called for URL cURLDocDataSource @@ -367,7 +356,6 @@ void SAL_CALL ScDispatch::selectionChanged( const css::lang::EventObject& /* aEv // XEventListener void SAL_CALL ScDispatch::disposing( const css::lang::EventObject& rSource ) - throw (css::uno::RuntimeException, std::exception) { uno::Reference<view::XSelectionSupplier> xSupplier(rSource.Source, uno::UNO_QUERY); xSupplier->removeSelectionChangeListener(this); diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 9db139b88478..757cd8e71a07 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -1001,7 +1001,6 @@ void ScModelObj::initializeForTiledRendering(const css::uno::Sequence<css::beans } uno::Any SAL_CALL ScModelObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XSpreadsheetDocument ) SC_QUERYINTERFACE( document::XActionLockable ) @@ -1047,7 +1046,7 @@ void SAL_CALL ScModelObj::release() throw() SfxBaseModel::release(); } -uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -1101,7 +1100,6 @@ uno::Sequence<uno::Type> SAL_CALL ScModelObj::getTypes() throw(uno::RuntimeExcep } uno::Sequence<sal_Int8> SAL_CALL ScModelObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1156,7 +1154,7 @@ void ScModelObj::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) // XSpreadsheetDocument -uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() throw(uno::RuntimeException, std::exception) +uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() { SolarMutexGuard aGuard; if (pDocShell) @@ -1167,7 +1165,6 @@ uno::Reference<sheet::XSpreadsheets> SAL_CALL ScModelObj::getSheets() throw(uno: // XStyleFamiliesSupplier uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getStyleFamilies() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1458,7 +1455,6 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -1509,9 +1505,6 @@ static sal_Int32 lcl_GetRendererNum( sal_Int32 nSelRenderer, const OUString& rPa uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 nSelRenderer, const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -1619,9 +1612,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScModelObj::getRenderer( sal_Int32 void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions ) - throw(lang::IllegalArgumentException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -1817,7 +1807,7 @@ void SAL_CALL ScModelObj::render( sal_Int32 nSelRenderer, const uno::Any& aSelec // XLinkTargetSupplier -uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() throw(uno::RuntimeException, std::exception) +uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() { SolarMutexGuard aGuard; if (pDocShell) @@ -1827,7 +1817,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScModelObj::getLinks() throw(uno // XActionLockable -sal_Bool SAL_CALL ScModelObj::isActionLocked() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScModelObj::isActionLocked() { SolarMutexGuard aGuard; bool bLocked = false; @@ -1836,28 +1826,28 @@ sal_Bool SAL_CALL ScModelObj::isActionLocked() throw(uno::RuntimeException, std: return bLocked; } -void SAL_CALL ScModelObj::addActionLock() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::addActionLock() { SolarMutexGuard aGuard; if (pDocShell) pDocShell->LockDocument(); } -void SAL_CALL ScModelObj::removeActionLock() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::removeActionLock() { SolarMutexGuard aGuard; if (pDocShell) pDocShell->UnlockDocument(); } -void SAL_CALL ScModelObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::setActionLocks( sal_Int16 nLock ) { SolarMutexGuard aGuard; if (pDocShell) pDocShell->SetLockCount(nLock); } -sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL ScModelObj::resetActionLocks() { SolarMutexGuard aGuard; sal_uInt16 nRet = 0; @@ -1869,7 +1859,7 @@ sal_Int16 SAL_CALL ScModelObj::resetActionLocks() throw(uno::RuntimeException, s return nRet; } -void SAL_CALL ScModelObj::lockControllers() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::lockControllers() { SolarMutexGuard aGuard; SfxBaseModel::lockControllers(); @@ -1877,7 +1867,7 @@ void SAL_CALL ScModelObj::lockControllers() throw (css::uno::RuntimeException, s pDocShell->LockPaint(); } -void SAL_CALL ScModelObj::unlockControllers() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::unlockControllers() { SolarMutexGuard aGuard; if (hasControllersLocked()) @@ -1890,7 +1880,7 @@ void SAL_CALL ScModelObj::unlockControllers() throw (css::uno::RuntimeException, // XCalculate -void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::calculate() { SolarMutexGuard aGuard; if (pDocShell) @@ -1901,7 +1891,7 @@ void SAL_CALL ScModelObj::calculate() throw(uno::RuntimeException, std::exceptio } } -void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::calculateAll() { SolarMutexGuard aGuard; if (pDocShell) @@ -1912,7 +1902,7 @@ void SAL_CALL ScModelObj::calculateAll() throw(uno::RuntimeException, std::excep } } -sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() { SolarMutexGuard aGuard; if (pDocShell) @@ -1923,7 +1913,6 @@ sal_Bool SAL_CALL ScModelObj::isAutomaticCalculationEnabled() throw(uno::Runtime } void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabledIn ) - throw(uno::RuntimeException, std::exception) { bool bEnabled(bEnabledIn); SolarMutexGuard aGuard; @@ -1944,7 +1933,7 @@ void SAL_CALL ScModelObj::enableAutomaticCalculation( sal_Bool bEnabledIn ) // XProtectable -void SAL_CALL ScModelObj::protect( const OUString& aPassword ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::protect( const OUString& aPassword ) { SolarMutexGuard aGuard; // #i108245# if already protected, don't change anything @@ -1955,7 +1944,6 @@ void SAL_CALL ScModelObj::protect( const OUString& aPassword ) throw(uno::Runtim } void SAL_CALL ScModelObj::unprotect( const OUString& aPassword ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1966,7 +1954,7 @@ void SAL_CALL ScModelObj::unprotect( const OUString& aPassword ) } } -sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScModelObj::isProtected() { SolarMutexGuard aGuard; if (pDocShell) @@ -1978,7 +1966,7 @@ sal_Bool SAL_CALL ScModelObj::isProtected() throw(uno::RuntimeException, std::ex // XDrawPagesSupplier -uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() throw(uno::RuntimeException, std::exception) +uno::Reference<drawing::XDrawPages> SAL_CALL ScModelObj::getDrawPages() { SolarMutexGuard aGuard; if (pDocShell) @@ -1994,8 +1982,6 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( const table::CellAddress& aFormulaPosition, const table::CellAddress& aVariablePosition, const OUString& aGoalValue ) - throw (uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; sheet::GoalResult aResult; @@ -2019,7 +2005,7 @@ sheet::GoalResult SAL_CALL ScModelObj::seekGoal( // XConsolidatable uno::Reference<sheet::XConsolidationDescriptor> SAL_CALL ScModelObj::createConsolidationDescriptor( - sal_Bool bEmpty ) throw(uno::RuntimeException, std::exception) + sal_Bool bEmpty ) { SolarMutexGuard aGuard; ScConsolidationDescriptor* pNew = new ScConsolidationDescriptor; @@ -2035,7 +2021,6 @@ uno::Reference<sheet::XConsolidationDescriptor> SAL_CALL ScModelObj::createConso void SAL_CALL ScModelObj::consolidate( const uno::Reference<sheet::XConsolidationDescriptor>& xDescriptor ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // das koennte theoretisch ein fremdes Objekt sein, also nur das @@ -2061,7 +2046,7 @@ void SAL_CALL ScModelObj::consolidate( // XDocumentAuditing -void SAL_CALL ScModelObj::refreshArrows() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScModelObj::refreshArrows() { SolarMutexGuard aGuard; if (pDocShell) @@ -2070,7 +2055,6 @@ void SAL_CALL ScModelObj::refreshArrows() throw(uno::RuntimeException, std::exce // XViewDataSupplier uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) - throw (uno::RuntimeException, std::exception) { uno::Reference < container::XIndexAccess > xRet( SfxBaseModel::getViewData() ); @@ -2100,7 +2084,6 @@ uno::Reference< container::XIndexAccess > SAL_CALL ScModelObj::getViewData( ) //! auch an der Applikation anbieten? uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -2110,9 +2093,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScModelObj::getPropertySetInfo( void SAL_CALL ScModelObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2260,8 +2240,6 @@ void SAL_CALL ScModelObj::setPropertyValue( } uno::Any SAL_CALL ScModelObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -2532,7 +2510,6 @@ css::uno::Reference<css::uno::XInterface> ScModelObj::create( uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( const OUString& aServiceSpecifier ) - throw(uno::Exception, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return create(aServiceSpecifier, nullptr); @@ -2541,7 +2518,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstance( uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence<uno::Any>& aArgs ) - throw(uno::Exception, uno::RuntimeException, std::exception) { //! unterscheiden zwischen eigenen Services und denen vom Drawing-Layer? @@ -2561,7 +2537,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScModelObj::createInstanceWithArguments } uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -2576,7 +2551,7 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames() } // XServiceInfo -OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScModelObj::getImplementationName() { return OUString( "ScModelObj" ); /* // Matching the .component information: @@ -2585,13 +2560,11 @@ OUString SAL_CALL ScModelObj::getImplementationName() throw(uno::RuntimeExceptio } sal_Bool SAL_CALL ScModelObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCMODELOBJ_SERVICE, SCDOCSETTINGS_SERVICE, SCDOC_SERVICE}; } @@ -2599,7 +2572,7 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScModelObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -2658,14 +2631,12 @@ ScModelObj* ScModelObj::getImplementation(const uno::Reference<uno::XInterface>& // XChangesNotifier void ScModelObj::addChangesListener( const uno::Reference< util::XChangesListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maChangesListeners.addInterface( aListener ); } void ScModelObj::removeChangesListener( const uno::Reference< util::XChangesListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; maChangesListeners.removeInterface( aListener ); @@ -2826,13 +2797,11 @@ void ScModelObj::HandleCalculateEvents() // XOpenCLSelection sal_Bool ScModelObj::isOpenCLEnabled() - throw (uno::RuntimeException, std::exception) { return officecfg::Office::Common::Misc::UseOpenCL::get(); } void ScModelObj::enableOpenCL(sal_Bool bEnable) - throw (uno::RuntimeException, std::exception) { if (ScCalcConfig::isOpenCLEnabled() == static_cast<bool>(bEnable)) return; @@ -2856,7 +2825,6 @@ void ScModelObj::enableOpenCL(sal_Bool bEnable) } void ScModelObj::enableAutomaticDeviceSelection(sal_Bool bForce) - throw (uno::RuntimeException, std::exception) { ScCalcConfig aConfig = ScInterpreter::GetGlobalConfig(); aConfig.mbOpenCLAutoSelect = true; @@ -2872,7 +2840,6 @@ void ScModelObj::enableAutomaticDeviceSelection(sal_Bool bForce) } void ScModelObj::disableAutomaticDeviceSelection() - throw (uno::RuntimeException, std::exception) { ScCalcConfig aConfig = ScInterpreter::GetGlobalConfig(); aConfig.mbOpenCLAutoSelect = false; @@ -2883,7 +2850,6 @@ void ScModelObj::disableAutomaticDeviceSelection() } void ScModelObj::selectOpenCLDevice( sal_Int32 nPlatform, sal_Int32 nDevice ) - throw (uno::RuntimeException, std::exception) { if(nPlatform < 0 || nDevice < 0) throw uno::RuntimeException(); @@ -2905,7 +2871,6 @@ void ScModelObj::selectOpenCLDevice( sal_Int32 nPlatform, sal_Int32 nDevice ) } sal_Int32 ScModelObj::getPlatformID() - throw (uno::RuntimeException, std::exception) { #if !HAVE_FEATURE_OPENCL return -1; @@ -2918,7 +2883,6 @@ sal_Int32 ScModelObj::getPlatformID() } sal_Int32 ScModelObj::getDeviceID() - throw (uno::RuntimeException, std::exception) { #if !HAVE_FEATURE_OPENCL return -1; @@ -2931,7 +2895,6 @@ sal_Int32 ScModelObj::getDeviceID() } uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms() - throw (uno::RuntimeException, std::exception) { #if !HAVE_FEATURE_OPENCL return uno::Sequence<sheet::opencl::OpenCLPlatform>(); @@ -2963,7 +2926,6 @@ namespace { /// @throws css::uno::RuntimeException void setOpcodeSubsetTest(bool bFlag) - throw (uno::RuntimeException, std::exception) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); officecfg::Office::Calc::Formula::Calculation::OpenCLSubsetOnly::set(bFlag, batch); @@ -2973,25 +2935,21 @@ void setOpcodeSubsetTest(bool bFlag) } void ScModelObj::enableOpcodeSubsetTest() - throw (uno::RuntimeException, std::exception) { setOpcodeSubsetTest(true); } void ScModelObj::disableOpcodeSubsetTest() - throw (uno::RuntimeException, std::exception) { setOpcodeSubsetTest(false); } sal_Bool ScModelObj::isOpcodeSubsetTested() - throw (uno::RuntimeException, std::exception) { return officecfg::Office::Calc::Formula::Calculation::OpenCLSubsetOnly::get(); } void ScModelObj::setFormulaCellNumberLimit( sal_Int32 number ) - throw (uno::RuntimeException, std::exception) { std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create()); officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::set(number, batch); @@ -2999,7 +2957,6 @@ void ScModelObj::setFormulaCellNumberLimit( sal_Int32 number ) } sal_Int32 ScModelObj::getFormulaCellNumberLimit() - throw (uno::RuntimeException, std::exception) { return officecfg::Office::Calc::Formula::Calculation::OpenCLMinimumDataSize::get().get(); } @@ -3050,7 +3007,6 @@ uno::Reference<drawing::XDrawPage> ScDrawPagesObj::GetObjectByIndex_Impl(sal_Int // XDrawPages uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sal_Int32 nPos ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<drawing::XDrawPage> xRet; @@ -3066,7 +3022,6 @@ uno::Reference<drawing::XDrawPage> SAL_CALL ScDrawPagesObj::insertNewByIndex( sa } void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>& xPage ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SvxDrawPage* pImp = SvxDrawPage::getImplementation( xPage ); @@ -3083,7 +3038,7 @@ void SAL_CALL ScDrawPagesObj::remove( const uno::Reference<drawing::XDrawPage>& // XIndexAccess -sal_Int32 SAL_CALL ScDrawPagesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDrawPagesObj::getCount() { SolarMutexGuard aGuard; if (pDocShell) @@ -3092,8 +3047,6 @@ sal_Int32 SAL_CALL ScDrawPagesObj::getCount() throw(uno::RuntimeException, std:: } uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<drawing::XDrawPage> xPage(GetObjectByIndex_Impl(nIndex)); @@ -3103,13 +3056,13 @@ uno::Any SAL_CALL ScDrawPagesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScDrawPagesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDrawPagesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<drawing::XDrawPage>::get(); } -sal_Bool SAL_CALL ScDrawPagesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDrawPagesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -3161,7 +3114,6 @@ ScTableSheetObj* ScTableSheetsObj::GetObjectByName_Impl(const OUString& aName) c } void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int16 nPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3174,7 +3126,6 @@ void SAL_CALL ScTableSheetsObj::insertNewByName( const OUString& aName, sal_Int1 } void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDestination ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3190,7 +3141,6 @@ void SAL_CALL ScTableSheetsObj::moveByName( const OUString& aName, sal_Int16 nDe void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName, const OUString& aCopy, sal_Int16 nDestination ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3218,8 +3168,6 @@ void SAL_CALL ScTableSheetsObj::copyByName( const OUString& aName, } void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3269,8 +3217,6 @@ void SAL_CALL ScTableSheetsObj::insertByName( const OUString& aName, const uno:: } void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3320,8 +3266,6 @@ void SAL_CALL ScTableSheetsObj::replaceByName( const OUString& aName, const uno: } void SAL_CALL ScTableSheetsObj::removeByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3341,7 +3285,6 @@ void SAL_CALL ScTableSheetsObj::removeByName( const OUString& aName ) sal_Int32 ScTableSheetsObj::importSheet( const uno::Reference < sheet::XSpreadsheetDocument > & xDocSrc, const OUString& srcName, const sal_Int32 nDestPosition ) - throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { //pDocShell is the destination ScDocument& rDocDest = pDocShell->GetDocument(); @@ -3375,7 +3318,6 @@ sal_Int32 ScTableSheetsObj::importSheet( // XCellRangesAccess uno::Reference< table::XCell > SAL_CALL ScTableSheetsObj::getCellByPosition( sal_Int32 nColumn, sal_Int32 nRow, sal_Int32 nSheet ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((sal_uInt16)nSheet))); @@ -3386,7 +3328,6 @@ uno::Reference< table::XCell > SAL_CALL ScTableSheetsObj::getCellByPosition( sal } uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom, sal_Int32 nSheet ) - throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xSheet(static_cast<ScCellRangeObj*>(GetObjectByIndex_Impl((sal_uInt16)nSheet))); @@ -3397,7 +3338,6 @@ uno::Reference< table::XCellRange > SAL_CALL ScTableSheetsObj::getCellRangeByPos } uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj::getCellRangesByName( const OUString& aRange ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence < uno::Reference < table::XCellRange > > xRet; @@ -3428,7 +3368,6 @@ uno::Sequence < uno::Reference< table::XCellRange > > SAL_CALL ScTableSheetsObj: // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetsEnumeration")); @@ -3436,7 +3375,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableSheetsObj::createEnumera // XIndexAccess -sal_Int32 SAL_CALL ScTableSheetsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableSheetsObj::getCount() { SolarMutexGuard aGuard; if (pDocShell) @@ -3445,8 +3384,6 @@ sal_Int32 SAL_CALL ScTableSheetsObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSpreadsheet> xSheet(GetObjectByIndex_Impl(nIndex)); @@ -3457,13 +3394,13 @@ uno::Any SAL_CALL ScTableSheetsObj::getByIndex( sal_Int32 nIndex ) // return uno::Any(); } -uno::Type SAL_CALL ScTableSheetsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTableSheetsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSpreadsheet>::get(); } -sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableSheetsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -3472,8 +3409,6 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasElements() throw(uno::RuntimeException, s // XNameAccess uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSpreadsheet> xSheet(GetObjectByName_Impl(aName)); @@ -3484,7 +3419,6 @@ uno::Any SAL_CALL ScTableSheetsObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScTableSheetsObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3505,7 +3439,6 @@ uno::Sequence<OUString> SAL_CALL ScTableSheetsObj::getElementNames() } sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -3568,7 +3501,6 @@ ScTableColumnObj* ScTableColumnsObj::GetObjectByName_Impl(const OUString& aName) } void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3584,7 +3516,6 @@ void SAL_CALL ScTableColumnsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 n } void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3602,7 +3533,6 @@ void SAL_CALL ScTableColumnsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCou // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableColumnsEnumeration")); @@ -3610,15 +3540,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableColumnsObj::createEnumer // XIndexAccess -sal_Int32 SAL_CALL ScTableColumnsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableColumnsObj::getCount() { SolarMutexGuard aGuard; return nEndCol - nStartCol + 1; } uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xColumn(GetObjectByIndex_Impl(nIndex)); @@ -3628,21 +3556,19 @@ uno::Any SAL_CALL ScTableColumnsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScTableColumnsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTableColumnsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCellRange>::get(); } -sal_Bool SAL_CALL ScTableColumnsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableColumnsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xColumn(GetObjectByName_Impl(aName)); @@ -3653,7 +3579,6 @@ uno::Any SAL_CALL ScTableColumnsObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScTableColumnsObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCCOL nCount = nEndCol - nStartCol + 1; @@ -3666,7 +3591,6 @@ uno::Sequence<OUString> SAL_CALL ScTableColumnsObj::getElementNames() } sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCCOL nCol = 0; @@ -3680,7 +3604,6 @@ sal_Bool SAL_CALL ScTableColumnsObj::hasByName( const OUString& aName ) // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnsObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -3690,9 +3613,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableColumnsObj::getPropertyS void SAL_CALL ScTableColumnsObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -3736,8 +3656,6 @@ void SAL_CALL ScTableColumnsObj::setPropertyValue( } uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -3821,7 +3739,6 @@ ScTableRowObj* ScTableRowsObj::GetObjectByIndex_Impl(sal_Int32 nIndex) const } void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCount ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3837,7 +3754,6 @@ void SAL_CALL ScTableRowsObj::insertByIndex( sal_Int32 nPosition, sal_Int32 nCou } void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -3855,7 +3771,6 @@ void SAL_CALL ScTableRowsObj::removeByIndex( sal_Int32 nIndex, sal_Int32 nCount // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.table.TableRowsEnumeration")); @@ -3863,15 +3778,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableRowsObj::createEnumerati // XIndexAccess -sal_Int32 SAL_CALL ScTableRowsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableRowsObj::getCount() { SolarMutexGuard aGuard; return nEndRow - nStartRow + 1; } uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<table::XCellRange> xRow(GetObjectByIndex_Impl(nIndex)); @@ -3881,13 +3794,13 @@ uno::Any SAL_CALL ScTableRowsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScTableRowsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTableRowsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<table::XCellRange>::get(); } -sal_Bool SAL_CALL ScTableRowsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableRowsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -3896,7 +3809,6 @@ sal_Bool SAL_CALL ScTableRowsObj::hasElements() throw(uno::RuntimeException, std // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowsObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -3906,9 +3818,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableRowsObj::getPropertySetI void SAL_CALL ScTableRowsObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -4004,8 +3913,6 @@ void SAL_CALL ScTableRowsObj::setPropertyValue( } uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!pDocShell) @@ -4070,7 +3977,6 @@ ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj() // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { //! muss noch return nullptr; @@ -4078,16 +3984,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSpreadsheetSettingsObj::getPr void SAL_CALL ScSpreadsheetSettingsObj::setPropertyValue( const OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { //! muss noch } uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /* aPropertyName */ ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { //! muss noch return uno::Any(); @@ -4145,7 +4046,6 @@ ScAnnotationObj* ScAnnotationsObj::GetObjectByIndex_Impl( sal_Int32 nIndex ) con void SAL_CALL ScAnnotationsObj::insertNew( const table::CellAddress& aPosition, const OUString& rText ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -4156,7 +4056,7 @@ void SAL_CALL ScAnnotationsObj::insertNew( } } -void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) { SolarMutexGuard aGuard; if (pDocShell) @@ -4176,7 +4076,6 @@ void SAL_CALL ScAnnotationsObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Run // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { //! iterate directly (more efficiently)? @@ -4187,7 +4086,6 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAnnotationsObj::createEnumera // XIndexAccess sal_Int32 SAL_CALL ScAnnotationsObj::getCount() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_Int32 nCount = 0; @@ -4203,8 +4101,6 @@ sal_Int32 SAL_CALL ScAnnotationsObj::getCount() } uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSheetAnnotation> xAnnotation(GetObjectByIndex_Impl(nIndex)); @@ -4214,13 +4110,13 @@ uno::Any SAL_CALL ScAnnotationsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScAnnotationsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScAnnotationsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSheetAnnotation>::get(); } -sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAnnotationsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -4297,7 +4193,6 @@ ScTableSheetObj* ScScenariosObj::GetObjectByName_Impl(const OUString& aName) void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName, const uno::Sequence<table::CellRangeAddress>& aRanges, const OUString& aComment ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -4328,7 +4223,6 @@ void SAL_CALL ScScenariosObj::addNewByName( const OUString& aName, } void SAL_CALL ScScenariosObj::removeByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCTAB nIndex; @@ -4339,7 +4233,6 @@ void SAL_CALL ScScenariosObj::removeByName( const OUString& aName ) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.ScenariosEnumeration")); @@ -4347,7 +4240,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScScenariosObj::createEnumerati // XIndexAccess -sal_Int32 SAL_CALL ScScenariosObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScScenariosObj::getCount() { SolarMutexGuard aGuard; SCTAB nCount = 0; @@ -4369,8 +4262,6 @@ sal_Int32 SAL_CALL ScScenariosObj::getCount() throw(uno::RuntimeException, std:: } uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XScenario> xScen(GetObjectByIndex_Impl(nIndex)); @@ -4380,21 +4271,19 @@ uno::Any SAL_CALL ScScenariosObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScScenariosObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScScenariosObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XScenario>::get(); } -sal_Bool SAL_CALL ScScenariosObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScScenariosObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XScenario> xScen(GetObjectByName_Impl(aName)); @@ -4405,7 +4294,6 @@ uno::Any SAL_CALL ScScenariosObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScScenariosObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCTAB nCount = (SCTAB)getCount(); @@ -4425,7 +4313,6 @@ uno::Sequence<OUString> SAL_CALL ScScenariosObj::getElementNames() } sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SCTAB nIndex; diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 2eb4d60cca78..c3e24180a8cd 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -64,8 +64,6 @@ static ScSheetEventId lcl_GetEventFromName( const OUString& aName ) // XNameReplace void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mpDocShell) @@ -117,7 +115,6 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno: // XNameAccess uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScSheetEventId nEvent = lcl_GetEventFromName(aName); @@ -148,7 +145,7 @@ uno::Any SAL_CALL ScSheetEventsObj::getByName( const OUString& aName ) return aRet; } -uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() { SolarMutexGuard aGuard; uno::Sequence<OUString> aNames((int)ScSheetEventId::COUNT); @@ -157,7 +154,7 @@ uno::Sequence<OUString> SAL_CALL ScSheetEventsObj::getElementNames() throw(uno:: return aNames; } -sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) { SolarMutexGuard aGuard; ScSheetEventId nEvent = lcl_GetEventFromName(aName); @@ -166,13 +163,13 @@ sal_Bool SAL_CALL ScSheetEventsObj::hasByName( const OUString& aName ) throw(uno // XElementAccess -uno::Type SAL_CALL ScSheetEventsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScSheetEventsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<uno::Sequence<beans::PropertyValue>>::get(); } -sal_Bool SAL_CALL ScSheetEventsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScSheetEventsObj::hasElements() { SolarMutexGuard aGuard; if (mpDocShell) diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index 027febb19876..d0c72c57600b 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -27,17 +27,17 @@ using utl::MediaDescriptor; ScExcelBiffDetect::ScExcelBiffDetect( const uno::Reference<uno::XComponentContext>& /*xContext*/ ) {} ScExcelBiffDetect::~ScExcelBiffDetect() {} -OUString ScExcelBiffDetect::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString ScExcelBiffDetect::getImplementationName() { return OUString("com.sun.star.comp.calc.ExcelBiffFormatDetector"); } -sal_Bool ScExcelBiffDetect::supportsService( const OUString& aName ) throw (uno::RuntimeException, std::exception) +sal_Bool ScExcelBiffDetect::supportsService( const OUString& aName ) { return cppu::supportsService(this, aName); } -uno::Sequence<OUString> ScExcelBiffDetect::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +uno::Sequence<OUString> ScExcelBiffDetect::getSupportedServiceNames() { uno::Sequence<OUString> aNames { "com.sun.star.frame.ExtendedTypeDetection" }; return aNames; @@ -133,7 +133,6 @@ bool isTemplate(const OUString& rType) } OUString ScExcelBiffDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor ) - throw (uno::RuntimeException, std::exception) { MediaDescriptor aMediaDesc(lDescriptor); OUString aType; diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx index 9830ccd6deef..acb182533bbf 100644 --- a/sc/source/ui/unoobj/exceldetect.hxx +++ b/sc/source/ui/unoobj/exceldetect.hxx @@ -26,13 +26,12 @@ public: virtual ~ScExcelBiffDetect() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& aName ) 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& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XExtendedFilterDetection - virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) override; }; #endif diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index d397e05c0a10..178ef7a17996 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -341,7 +341,7 @@ uno::Reference<text::XTextField> ScCellFieldsObj::GetObjectByIndex_Impl(sal_Int3 return xRet; } -sal_Int32 SAL_CALL ScCellFieldsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScCellFieldsObj::getCount() { SolarMutexGuard aGuard; @@ -353,8 +353,6 @@ sal_Int32 SAL_CALL ScCellFieldsObj::getCount() throw(uno::RuntimeException, std: } uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XTextField> xField(GetObjectByIndex_Impl(nIndex)); @@ -364,20 +362,19 @@ uno::Any SAL_CALL ScCellFieldsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScCellFieldsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScCellFieldsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<text::XTextField>::get(); } -sal_Bool SAL_CALL ScCellFieldsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScCellFieldsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); @@ -385,21 +382,18 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFieldsObj::createEnumerat void SAL_CALL ScCellFieldsObj::addContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScCellFieldsObj::removeContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } // XRefreshable void SAL_CALL ScCellFieldsObj::refresh( ) - throw (uno::RuntimeException, std::exception) { if (mpRefreshListeners) { @@ -411,7 +405,6 @@ void SAL_CALL ScCellFieldsObj::refresh( ) } void SAL_CALL ScCellFieldsObj::addRefreshListener( const uno::Reference< util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -423,7 +416,6 @@ void SAL_CALL ScCellFieldsObj::addRefreshListener( const uno::Reference< util::X } void SAL_CALL ScCellFieldsObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -506,7 +498,7 @@ uno::Reference<text::XTextField> ScHeaderFieldsObj::GetObjectByIndex_Impl(sal_In return xRet; } -sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() { SolarMutexGuard aGuard; @@ -517,8 +509,6 @@ sal_Int32 SAL_CALL ScHeaderFieldsObj::getCount() throw(uno::RuntimeException, st } uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XTextField> xField(GetObjectByIndex_Impl(nIndex)); @@ -528,20 +518,19 @@ uno::Any SAL_CALL ScHeaderFieldsObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScHeaderFieldsObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScHeaderFieldsObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<text::XTextField>::get(); } -sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScHeaderFieldsObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.text.TextFieldEnumeration")); @@ -549,21 +538,18 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFieldsObj::createEnumer void SAL_CALL ScHeaderFieldsObj::addContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ScHeaderFieldsObj::removeContainerListener( const uno::Reference<container::XContainerListener>& /* xListener */ ) - throw(uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } // XRefreshable void SAL_CALL ScHeaderFieldsObj::refresh( ) - throw (uno::RuntimeException, std::exception) { if (mpRefreshListeners) { @@ -575,7 +561,6 @@ void SAL_CALL ScHeaderFieldsObj::refresh( ) } void SAL_CALL ScHeaderFieldsObj::addRefreshListener( const uno::Reference< util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -587,7 +572,6 @@ void SAL_CALL ScHeaderFieldsObj::addRefreshListener( const uno::Reference< util: } void SAL_CALL ScHeaderFieldsObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if (xListener.is()) { @@ -1162,7 +1146,6 @@ bool ScEditFieldObj::IsInserted() const // XTextField OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1201,7 +1184,6 @@ OUString SAL_CALL ScEditFieldObj::getPresentation( sal_Bool bShowCommand ) // XTextContent void SAL_CALL ScEditFieldObj::attach( const uno::Reference<text::XTextRange>& xTextRange ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (xTextRange.is()) @@ -1214,7 +1196,7 @@ void SAL_CALL ScEditFieldObj::attach( const uno::Reference<text::XTextRange>& xT } } -uno::Reference<text::XTextRange> SAL_CALL ScEditFieldObj::getAnchor() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScEditFieldObj::getAnchor() { SolarMutexGuard aGuard; return mpContent; @@ -1222,21 +1204,19 @@ uno::Reference<text::XTextRange> SAL_CALL ScEditFieldObj::getAnchor() throw(uno: // XComponent -void SAL_CALL ScEditFieldObj::dispose() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScEditFieldObj::dispose() { OComponentHelper::dispose(); } void SAL_CALL ScEditFieldObj::addEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { OComponentHelper::addEventListener( xListener ); } void SAL_CALL ScEditFieldObj::removeEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { OComponentHelper::removeEventListener( xListener ); } @@ -1244,7 +1224,6 @@ void SAL_CALL ScEditFieldObj::removeEventListener( // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScEditFieldObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<beans::XPropertySetInfo> aRef = pPropSet->getPropertySetInfo(); @@ -1253,9 +1232,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScEditFieldObj::getPropertySetI void SAL_CALL ScEditFieldObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (aPropertyName == SC_UNONAME_ANCHOR) @@ -1287,8 +1263,6 @@ void SAL_CALL ScEditFieldObj::setPropertyValue( } uno::Any SAL_CALL ScEditFieldObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (aPropertyName == SC_UNONAME_TEXTFIELD_TYPE) @@ -1339,7 +1313,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScEditFieldObj ) // XUnoTunnel sal_Int64 SAL_CALL ScEditFieldObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -1371,25 +1345,23 @@ ScEditFieldObj* ScEditFieldObj::getImplementation(const uno::Reference<text::XTe // XServiceInfo -OUString SAL_CALL ScEditFieldObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScEditFieldObj::getImplementationName() { return OUString("ScEditFieldObj"); } sal_Bool SAL_CALL ScEditFieldObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScEditFieldObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {"com.sun.star.text.TextField", "com.sun.star.text.TextContent"}; } -uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -1412,7 +1384,6 @@ uno::Sequence<uno::Type> SAL_CALL ScEditFieldObj::getTypes() throw(uno::RuntimeE } uno::Sequence<sal_Int8> SAL_CALL ScEditFieldObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index f11fc1ee18d5..be27823aaa70 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -117,7 +117,7 @@ Calc_FilterOptionsDialog_get_implementation(css::uno::XComponentContext*, css::u // XPropertyAccess -uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValues() throw(uno::RuntimeException, std::exception) +uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValues() { uno::Sequence<beans::PropertyValue> aRet(1); beans::PropertyValue* pArray = aRet.getArray(); @@ -129,8 +129,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScFilterOptionsObj::getPropertyValu } void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence<beans::PropertyValue>& aProps ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const beans::PropertyValue* pPropArray = aProps.getConstArray(); long nPropCount = aProps.getLength(); @@ -152,12 +150,12 @@ void SAL_CALL ScFilterOptionsObj::setPropertyValues( const uno::Sequence<beans:: // XExecutableDialog -void SAL_CALL ScFilterOptionsObj::setTitle( const OUString& /* aTitle */ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScFilterOptionsObj::setTitle( const OUString& /* aTitle */ ) { // not used } -sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL ScFilterOptionsObj::execute() { sal_Int16 nRet = ui::dialogs::ExecutableDialogResults::CANCEL; @@ -301,7 +299,6 @@ sal_Int16 SAL_CALL ScFilterOptionsObj::execute() throw(uno::RuntimeException, st // XImporter void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang::XComponent>& /* xDoc */ ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { bExport = false; } @@ -309,7 +306,6 @@ void SAL_CALL ScFilterOptionsObj::setTargetDocument( const uno::Reference<lang:: // XExporter void SAL_CALL ScFilterOptionsObj::setSourceDocument( const uno::Reference<lang::XComponent>& /* xDoc */ ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { bExport = true; } diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index edc5e48a3aa7..0a74f29beecf 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -245,7 +245,6 @@ ScTableConditionalEntry* ScTableConditionalFormat::GetObjectByIndex_Impl(sal_uIn void SAL_CALL ScTableConditionalFormat::addNew( const uno::Sequence<beans::PropertyValue >& aConditionalEntry ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScCondFormatEntryItem aEntry; @@ -340,7 +339,6 @@ void SAL_CALL ScTableConditionalFormat::addNew( } void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -350,7 +348,7 @@ void SAL_CALL ScTableConditionalFormat::removeByIndex( sal_Int32 nIndex ) } } -void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTableConditionalFormat::clear() { SolarMutexGuard aGuard; maEntries.clear(); @@ -359,7 +357,6 @@ void SAL_CALL ScTableConditionalFormat::clear() throw(uno::RuntimeException, std // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.TableConditionalEntryEnumeration")); @@ -367,15 +364,13 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTableConditionalFormat::creat // XIndexAccess -sal_Int32 SAL_CALL ScTableConditionalFormat::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableConditionalFormat::getCount() { SolarMutexGuard aGuard; return maEntries.size(); } uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XSheetConditionalEntry> xEntry(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -385,13 +380,13 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScTableConditionalFormat::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTableConditionalFormat::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XSheetConditionalEntry>::get(); } -sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTableConditionalFormat::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -408,8 +403,6 @@ static OUString lcl_GetEntryNameFromIndex( sal_Int32 nIndex ) } uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -429,7 +422,6 @@ uno::Any SAL_CALL ScTableConditionalFormat::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScTableConditionalFormat::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -443,7 +435,6 @@ uno::Sequence<OUString> SAL_CALL ScTableConditionalFormat::getElementNames() } sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -458,7 +449,7 @@ sal_Bool SAL_CALL ScTableConditionalFormat::hasByName( const OUString& aName ) // XUnoTunnel sal_Int64 SAL_CALL ScTableConditionalFormat::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -506,60 +497,54 @@ void ScTableConditionalEntry::GetData(ScCondFormatEntryItem& rData) const // XSheetCondition sheet::ConditionOperator SAL_CALL ScTableConditionalEntry::getOperator() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return lcl_ConditionModeToOperator( aData.meMode ); } void SAL_CALL ScTableConditionalEntry::setOperator( sheet::ConditionOperator nOperator ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.meMode = lcl_ConditionOperatorToMode( nOperator ); } sal_Int32 SAL_CALL ScTableConditionalEntry::getConditionOperator() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return lcl_ConditionModeToOperatorNew( aData.meMode ); } void SAL_CALL ScTableConditionalEntry::setConditionOperator( sal_Int32 nOperator ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.meMode = ScConditionEntry::GetModeFromApi( nOperator ); } -OUString SAL_CALL ScTableConditionalEntry::getFormula1() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableConditionalEntry::getFormula1() { SolarMutexGuard aGuard; return aData.maExpr1; } void SAL_CALL ScTableConditionalEntry::setFormula1( const OUString& aFormula1 ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.maExpr1 = aFormula1; } -OUString SAL_CALL ScTableConditionalEntry::getFormula2() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableConditionalEntry::getFormula2() { SolarMutexGuard aGuard; return aData.maExpr2; } void SAL_CALL ScTableConditionalEntry::setFormula2( const OUString& aFormula2 ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.maExpr2 = aFormula2; } -table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() throw(uno::RuntimeException, std::exception) +table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() { SolarMutexGuard aGuard; table::CellAddress aRet; @@ -570,7 +555,6 @@ table::CellAddress SAL_CALL ScTableConditionalEntry::getSourcePosition() throw(u } void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddress& aSourcePosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.maPos.Set( (SCCOL)aSourcePosition.Column, (SCROW)aSourcePosition.Row, aSourcePosition.Sheet ); @@ -578,14 +562,13 @@ void SAL_CALL ScTableConditionalEntry::setSourcePosition( const table::CellAddre // XSheetConditionalEntry -OUString SAL_CALL ScTableConditionalEntry::getStyleName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableConditionalEntry::getStyleName() { SolarMutexGuard aGuard; return ScStyleNameConversion::DisplayToProgrammaticName( aData.maStyle, SfxStyleFamily::Para ); } void SAL_CALL ScTableConditionalEntry::setStyleName( const OUString& aStyleName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aData.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStyleName, SfxStyleFamily::Para ); @@ -702,60 +685,54 @@ ScTableValidationObj::~ScTableValidationObj() // XSheetCondition sheet::ConditionOperator SAL_CALL ScTableValidationObj::getOperator() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return lcl_ConditionModeToOperator( (ScConditionMode)nMode ); } void SAL_CALL ScTableValidationObj::setOperator( sheet::ConditionOperator nOperator ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; nMode = sal::static_int_cast<sal_uInt16>( lcl_ConditionOperatorToMode( nOperator ) ); } sal_Int32 SAL_CALL ScTableValidationObj::getConditionOperator() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return lcl_ConditionModeToOperatorNew( (ScConditionMode)nMode ); } void SAL_CALL ScTableValidationObj::setConditionOperator( sal_Int32 nOperator ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; nMode = sal::static_int_cast<sal_uInt16>( ScConditionEntry::GetModeFromApi( nOperator ) ); } -OUString SAL_CALL ScTableValidationObj::getFormula1() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableValidationObj::getFormula1() { SolarMutexGuard aGuard; return aExpr1; } void SAL_CALL ScTableValidationObj::setFormula1( const OUString& aFormula1 ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aExpr1 = aFormula1; } -OUString SAL_CALL ScTableValidationObj::getFormula2() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTableValidationObj::getFormula2() { SolarMutexGuard aGuard; return aExpr2; } void SAL_CALL ScTableValidationObj::setFormula2( const OUString& aFormula2 ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aExpr2 = aFormula2; } -table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() throw(uno::RuntimeException, std::exception) +table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() { SolarMutexGuard aGuard; table::CellAddress aRet; @@ -766,14 +743,12 @@ table::CellAddress SAL_CALL ScTableValidationObj::getSourcePosition() throw(uno: } void SAL_CALL ScTableValidationObj::setSourcePosition( const table::CellAddress& aSourcePosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aSrcPos.Set( (SCCOL)aSourcePosition.Column, (SCROW)aSourcePosition.Row, aSourcePosition.Sheet ); } uno::Sequence<sheet::FormulaToken> SAL_CALL ScTableValidationObj::getTokens( sal_Int32 nIndex ) - throw(uno::RuntimeException,lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; if (nIndex >= 2 || nIndex < 0) @@ -783,7 +758,6 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScTableValidationObj::getTokens( sal } void SAL_CALL ScTableValidationObj::setTokens( sal_Int32 nIndex, const uno::Sequence<sheet::FormulaToken>& aTokens ) - throw(uno::RuntimeException,lang::IndexOutOfBoundsException, std::exception) { SolarMutexGuard aGuard; if (nIndex >= 2 || nIndex < 0) @@ -801,13 +775,12 @@ void SAL_CALL ScTableValidationObj::setTokens( sal_Int32 nIndex, const uno::Sequ } } -sal_Int32 SAL_CALL ScTableValidationObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTableValidationObj::getCount() { return 2; } uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableValidationObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -817,9 +790,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTableValidationObj::getProper void SAL_CALL ScTableValidationObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -930,8 +900,6 @@ void SAL_CALL ScTableValidationObj::setPropertyValue( } uno::Any SAL_CALL ScTableValidationObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -981,7 +949,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableValidationObj ) // XUnoTunnel sal_Int64 SAL_CALL ScTableValidationObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 5fae65828bf0..1f90c52d0525 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -211,19 +211,17 @@ ScFunctionAcceess_get_implementation(css::uno::XComponentContext*, css::uno::Seq } // XServiceInfo -OUString SAL_CALL ScFunctionAccess::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScFunctionAccess::getImplementationName() { return OUString("stardiv.StarCalc.ScFunctionAccess"); } sal_Bool SAL_CALL ScFunctionAccess::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCFUNCTIONACCESS_SERVICE, SCDOCSETTINGS_SERVICE}; } @@ -231,7 +229,6 @@ uno::Sequence<OUString> SAL_CALL ScFunctionAccess::getSupportedServiceNames() // XPropertySet (document settings) uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -241,9 +238,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySe void SAL_CALL ScFunctionAccess::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -266,8 +260,6 @@ void SAL_CALL ScFunctionAccess::setPropertyValue( } uno::Any SAL_CALL ScFunctionAccess::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -459,8 +451,6 @@ static void processSequences( ScDocument* pDoc, const uno::Any& rArg, ScTokenArr uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, const uno::Sequence<uno::Any>& aArguments ) - throw (container::NoSuchElementException, lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index d001bd989c93..64528ab62133 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -126,13 +126,13 @@ ScTableLink* ScSheetLinkObj::GetLink_Impl() const // XNamed -OUString SAL_CALL ScSheetLinkObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScSheetLinkObj::getName() { SolarMutexGuard aGuard; return getFileName(); // Name ist der Dateiname (URL) } -void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) { SolarMutexGuard aGuard; setFileName(aName); // Name ist der Dateiname (URL) @@ -141,7 +141,6 @@ void SAL_CALL ScSheetLinkObj::setName( const OUString& aName ) throw(uno::Runtim // XRefreshable void SAL_CALL ScSheetLinkObj::refresh() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTableLink* pLink = GetLink_Impl(); @@ -151,7 +150,6 @@ void SAL_CALL ScSheetLinkObj::refresh() void SAL_CALL ScSheetLinkObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRefreshListeners.push_back( xListener ); @@ -163,7 +161,6 @@ void SAL_CALL ScSheetLinkObj::addRefreshListener( void SAL_CALL ScSheetLinkObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nCount = aRefreshListeners.size(); @@ -198,7 +195,6 @@ void ScSheetLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh ) // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSheetLinkObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -208,9 +204,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScSheetLinkObj::getPropertySetI void SAL_CALL ScSheetLinkObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aValStr; @@ -244,8 +237,6 @@ void SAL_CALL ScSheetLinkObj::setPropertyValue( } uno::Any SAL_CALL ScSheetLinkObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -442,14 +433,13 @@ ScSheetLinkObj* ScSheetLinksObj::GetObjectByName_Impl(const OUString& aName) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScSheetLinksObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SheetLinksEnumeration")); } // XIndexAccess -sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScSheetLinksObj::getCount() { typedef std::unordered_set<OUString, OUStringHash> StrSetType; @@ -475,8 +465,6 @@ sal_Int32 SAL_CALL ScSheetLinksObj::getCount() throw(uno::RuntimeException, std: } uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<beans::XPropertySet> xLink(GetObjectByIndex_Impl(nIndex)); @@ -486,21 +474,19 @@ uno::Any SAL_CALL ScSheetLinksObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScSheetLinksObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScSheetLinksObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScSheetLinksObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScSheetLinksObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<beans::XPropertySet> xLink(GetObjectByName_Impl(aName)); @@ -512,7 +498,6 @@ uno::Any SAL_CALL ScSheetLinksObj::getByName( const OUString& aName ) } sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // Name ist der Dateiname @@ -533,7 +518,7 @@ sal_Bool SAL_CALL ScSheetLinksObj::hasByName( const OUString& aName ) return false; } -uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() { typedef std::unordered_set<OUString, OUStringHash> StrSetType; @@ -679,7 +664,6 @@ void ScAreaLinkObj::ModifyRefreshDelay_Impl( sal_Int32 nRefresh ) // XRefreshable void SAL_CALL ScAreaLinkObj::refresh() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos); @@ -689,7 +673,6 @@ void SAL_CALL ScAreaLinkObj::refresh() void SAL_CALL ScAreaLinkObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRefreshListeners.push_back( xListener ); @@ -701,7 +684,6 @@ void SAL_CALL ScAreaLinkObj::addRefreshListener( void SAL_CALL ScAreaLinkObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nCount = aRefreshListeners.size(); @@ -732,7 +714,6 @@ void ScAreaLinkObj::Refreshed_Impl() // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAreaLinkObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -742,9 +723,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScAreaLinkObj::getPropertySetIn void SAL_CALL ScAreaLinkObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aValStr; @@ -778,8 +756,6 @@ void SAL_CALL ScAreaLinkObj::setPropertyValue( } uno::Any SAL_CALL ScAreaLinkObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -866,7 +842,7 @@ void ScAreaLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) // XAreaLink -OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAreaLinkObj::getSourceArea() { SolarMutexGuard aGuard; OUString aRet; @@ -877,13 +853,12 @@ OUString SAL_CALL ScAreaLinkObj::getSourceArea() throw(uno::RuntimeException, st } void SAL_CALL ScAreaLinkObj::setSourceArea( const OUString& aSourceArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Modify_Impl( nullptr, nullptr, nullptr, &aSourceArea, nullptr ); } -table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() throw(uno::RuntimeException, std::exception) +table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -894,7 +869,6 @@ table::CellRangeAddress SAL_CALL ScAreaLinkObj::getDestArea() throw(uno::Runtime } void SAL_CALL ScAreaLinkObj::setDestArea( const table::CellRangeAddress& aDestArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; Modify_Impl( nullptr, nullptr, nullptr, nullptr, &aDestArea ); @@ -939,7 +913,6 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP const OUString& aSourceArea, const OUString& aFilter, const OUString& aFilterOptions ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -954,7 +927,7 @@ void SAL_CALL ScAreaLinksObj::insertAtPosition( const table::CellAddress& aDestP } } -void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) { SolarMutexGuard aGuard; ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, (size_t)nIndex); @@ -970,7 +943,6 @@ void SAL_CALL ScAreaLinksObj::removeByIndex( sal_Int32 nIndex ) throw(uno::Runti // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.CellAreaLinksEnumeration")); @@ -978,7 +950,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScAreaLinksObj::createEnumerati // XIndexAccess -sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScAreaLinksObj::getCount() { SolarMutexGuard aGuard; sal_Int32 nAreaCount = 0; @@ -997,8 +969,6 @@ sal_Int32 SAL_CALL ScAreaLinksObj::getCount() throw(uno::RuntimeException, std:: } uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XAreaLink> xLink(GetObjectByIndex_Impl(nIndex)); @@ -1008,13 +978,13 @@ uno::Any SAL_CALL ScAreaLinksObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScAreaLinksObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScAreaLinksObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XAreaLink>::get(); } -sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAreaLinksObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -1068,13 +1038,13 @@ static OUString lcl_BuildDDEName( const OUString& rAppl, const OUString& rTopic, return aRet; } -OUString SAL_CALL ScDDELinkObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDDELinkObj::getName() { SolarMutexGuard aGuard; return lcl_BuildDDEName( aAppl, aTopic, aItem ); } -void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) { // name can't be changed (formulas wouldn't find the link) throw uno::RuntimeException(); @@ -1082,7 +1052,7 @@ void SAL_CALL ScDDELinkObj::setName( const OUString& /* aName */ ) throw(uno::Ru // XDDELink -OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDDELinkObj::getApplication() { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1090,7 +1060,7 @@ OUString SAL_CALL ScDDELinkObj::getApplication() throw(uno::RuntimeException, st return aAppl; } -OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDDELinkObj::getTopic() { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1098,7 +1068,7 @@ OUString SAL_CALL ScDDELinkObj::getTopic() throw(uno::RuntimeException, std::exc return aTopic; } -OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScDDELinkObj::getItem() { SolarMutexGuard aGuard; //! Test, ob Link noch im Dokument enthalten? @@ -1108,7 +1078,7 @@ OUString SAL_CALL ScDDELinkObj::getItem() throw(uno::RuntimeException, std::exce // XRefreshable -void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScDDELinkObj::refresh() { SolarMutexGuard aGuard; if (pDocShell) @@ -1120,7 +1090,6 @@ void SAL_CALL ScDDELinkObj::refresh() throw(uno::RuntimeException, std::exceptio void SAL_CALL ScDDELinkObj::addRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRefreshListeners.push_back( xListener ); @@ -1132,7 +1101,6 @@ void SAL_CALL ScDDELinkObj::addRefreshListener( void SAL_CALL ScDDELinkObj::removeRefreshListener( const uno::Reference<util::XRefreshListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nCount = aRefreshListeners.size(); @@ -1152,7 +1120,6 @@ void SAL_CALL ScDDELinkObj::removeRefreshListener( // XDDELinkResults uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence< uno::Sequence< uno::Any > > aReturn; @@ -1187,7 +1154,6 @@ uno::Sequence< uno::Sequence< uno::Any > > ScDDELinkObj::getResults( ) } void ScDDELinkObj::setResults( const uno::Sequence< uno::Sequence< uno::Any > >& aResults ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bSuccess = false; @@ -1276,7 +1242,6 @@ ScDDELinkObj* ScDDELinksObj::GetObjectByName_Impl(const OUString& aName) // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.DDELinksEnumeration")); @@ -1284,7 +1249,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScDDELinksObj::createEnumeratio // XIndexAccess -sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScDDELinksObj::getCount() { SolarMutexGuard aGuard; sal_Int32 nAreaCount = 0; @@ -1294,8 +1259,6 @@ sal_Int32 SAL_CALL ScDDELinksObj::getCount() throw(uno::RuntimeException, std::e } uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XDDELink> xLink(GetObjectByIndex_Impl(nIndex)); @@ -1305,21 +1268,19 @@ uno::Any SAL_CALL ScDDELinksObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScDDELinksObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScDDELinksObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XDDELink>::get(); } -sal_Bool SAL_CALL ScDDELinksObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScDDELinksObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XDDELink> xLink(GetObjectByName_Impl(aName)); @@ -1329,7 +1290,7 @@ uno::Any SAL_CALL ScDDELinksObj::getByName( const OUString& aName ) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::RuntimeException, std::exception) +uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() { SolarMutexGuard aGuard; if (pDocShell) @@ -1352,7 +1313,6 @@ uno::Sequence<OUString> SAL_CALL ScDDELinksObj::getElementNames() throw(uno::Run } sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1376,7 +1336,6 @@ sal_Bool SAL_CALL ScDDELinksObj::hasByName( const OUString& aName ) uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( const OUString& aApplication, const OUString& aTopic, const OUString& aItem, css::sheet::DDELinkMode nMode ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< sheet::XDDELink > xLink; @@ -1436,7 +1395,6 @@ ScExternalSheetCacheObj::~ScExternalSheetCacheObj() } void SAL_CALL ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nRow, const Any& rValue) - throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nRow < 0 || nCol < 0) @@ -1461,7 +1419,6 @@ void SAL_CALL ScExternalSheetCacheObj::setCellValue(sal_Int32 nCol, sal_Int32 nR } Any SAL_CALL ScExternalSheetCacheObj::getCellValue(sal_Int32 nCol, sal_Int32 nRow) - throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nRow < 0 || nCol < 0) @@ -1493,7 +1450,6 @@ Any SAL_CALL ScExternalSheetCacheObj::getCellValue(sal_Int32 nCol, sal_Int32 nRo } Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllRows() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; vector<SCROW> aRows; @@ -1507,7 +1463,6 @@ Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllRows() } Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllColumns(sal_Int32 nRow) - throw (IllegalArgumentException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nRow < 0) @@ -1524,7 +1479,6 @@ Sequence< sal_Int32 > SAL_CALL ScExternalSheetCacheObj::getAllColumns(sal_Int32 } sal_Int32 SAL_CALL ScExternalSheetCacheObj::getTokenIndex() - throw (RuntimeException, std::exception) { return static_cast< sal_Int32 >( mnIndex ); } @@ -1540,7 +1494,6 @@ ScExternalDocLinkObj::~ScExternalDocLinkObj() Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetCache( const OUString& aSheetName, sal_Bool bDynamicCache ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nIndex = 0; @@ -1554,7 +1507,6 @@ Reference< sheet::XExternalSheetCache > SAL_CALL ScExternalDocLinkObj::addSheetC } Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName) - throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; size_t nIndex = 0; @@ -1568,7 +1520,6 @@ Any SAL_CALL ScExternalDocLinkObj::getByName(const OUString &aName) } Sequence< OUString > SAL_CALL ScExternalDocLinkObj::getElementNames() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; vector<OUString> aTabNames; @@ -1588,7 +1539,6 @@ Sequence< OUString > SAL_CALL ScExternalDocLinkObj::getElementNames() } sal_Bool SAL_CALL ScExternalDocLinkObj::hasByName(const OUString &aName) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1598,7 +1548,6 @@ sal_Bool SAL_CALL ScExternalDocLinkObj::hasByName(const OUString &aName) } sal_Int32 SAL_CALL ScExternalDocLinkObj::getCount() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1607,7 +1556,6 @@ sal_Int32 SAL_CALL ScExternalDocLinkObj::getCount() } Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nApiIndex) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1628,7 +1576,6 @@ Any SAL_CALL ScExternalDocLinkObj::getByIndex(sal_Int32 nApiIndex) } Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumeration() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( @@ -1638,14 +1585,12 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinkObj::createEnumer } uno::Type SAL_CALL ScExternalDocLinkObj::getElementType() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XExternalDocLink>::get(); } sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1654,7 +1599,6 @@ sal_Bool SAL_CALL ScExternalDocLinkObj::hasElements() } sal_Int32 SAL_CALL ScExternalDocLinkObj::getTokenIndex() - throw (RuntimeException, std::exception) { return static_cast<sal_Int32>(mnFileId); } @@ -1671,7 +1615,6 @@ ScExternalDocLinksObj::~ScExternalDocLinksObj() Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( const OUString& aDocName ) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aDocUrl( ScGlobal::GetAbsDocName( aDocName, mpDocShell)); @@ -1681,7 +1624,6 @@ Reference< sheet::XExternalDocLink > SAL_CALL ScExternalDocLinksObj::addDocLink( } Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName) - throw (container::NoSuchElementException, lang::WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aDocUrl( ScGlobal::GetAbsDocName( aName, mpDocShell)); @@ -1695,7 +1637,6 @@ Any SAL_CALL ScExternalDocLinksObj::getByName(const OUString &aName) } Sequence< OUString > SAL_CALL ScExternalDocLinksObj::getElementNames() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 n = mpRefMgr->getExternalFileCount(); @@ -1710,21 +1651,18 @@ Sequence< OUString > SAL_CALL ScExternalDocLinksObj::getElementNames() } sal_Bool SAL_CALL ScExternalDocLinksObj::hasByName(const OUString &aName) - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpRefMgr->hasExternalFile(aName); } sal_Int32 SAL_CALL ScExternalDocLinksObj::getCount() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpRefMgr->getExternalFileCount(); } Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex) - throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, RuntimeException, std::exception) { SolarMutexGuard aGuard; if (nIndex > ::std::numeric_limits<sal_uInt16>::max() || nIndex < ::std::numeric_limits<sal_uInt16>::min()) @@ -1740,7 +1678,6 @@ Any SAL_CALL ScExternalDocLinksObj::getByIndex(sal_Int32 nIndex) } Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnumeration() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; Reference< container::XEnumeration > aRef( @@ -1750,14 +1687,12 @@ Reference< container::XEnumeration > SAL_CALL ScExternalDocLinksObj::createEnume } uno::Type SAL_CALL ScExternalDocLinksObj::getElementType() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XExternalDocLinks>::get(); } sal_Bool SAL_CALL ScExternalDocLinksObj::hasElements() - throw (RuntimeException, std::exception) { SolarMutexGuard aGuard; return mpRefMgr->getExternalFileCount() > 0; diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index bb9a8ac68203..d3920166ad40 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -200,14 +200,13 @@ ScIndexEnumeration::~ScIndexEnumeration() // XEnumeration -sal_Bool SAL_CALL ScIndexEnumeration::hasMoreElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScIndexEnumeration::hasMoreElements() { SolarMutexGuard aGuard; return ( nPos < xIndex->getCount() ); } -uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScIndexEnumeration::nextElement() { SolarMutexGuard aGuard; uno::Any aReturn; @@ -223,20 +222,17 @@ uno::Any SAL_CALL ScIndexEnumeration::nextElement() throw(container::NoSuchEleme } OUString SAL_CALL ScIndexEnumeration::getImplementationName() - throw(css::uno::RuntimeException, std::exception) { return OUString("ScIndexEnumeration"); } sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceName ) - throw(css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< OUString > SAL_CALL ScIndexEnumeration::getSupportedServiceNames() - throw(css::uno::RuntimeException, std::exception) { css::uno::Sequence<OUString> aRet { sServiceName }; return aRet; @@ -258,15 +254,12 @@ ScNameToIndexAccess::~ScNameToIndexAccess() // XIndexAccess -sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) throw(css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScNameToIndexAccess::getCount( ) { return aNames.getLength(); } css::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if ( xNameAccess.is() && nIndex >= 0 && nIndex < aNames.getLength() ) return xNameAccess->getByName( aNames.getConstArray()[nIndex] ); @@ -277,7 +270,6 @@ css::uno::Any SAL_CALL ScNameToIndexAccess::getByIndex( sal_Int32 nIndex ) // XElementAccess css::uno::Type SAL_CALL ScNameToIndexAccess::getElementType( ) - throw(css::uno::RuntimeException, std::exception) { if ( xNameAccess.is() ) return xNameAccess->getElementType(); @@ -285,7 +277,7 @@ css::uno::Type SAL_CALL ScNameToIndexAccess::getElementType( ) return uno::Type(); } -sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) { return getCount() > 0; } diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index b71f9f56925f..5fc43a4c174a 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -210,14 +210,13 @@ void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray* } } -OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScNamedRangeObj::getName() { SolarMutexGuard aGuard; return aName; } void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //! adapt formulas ????? @@ -230,7 +229,7 @@ void SAL_CALL ScNamedRangeObj::setName( const OUString& aNewName ) throw uno::RuntimeException(); // no other exceptions specified } -OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScNamedRangeObj::getContent() { SolarMutexGuard aGuard; OUString aContent; @@ -242,7 +241,6 @@ OUString SAL_CALL ScNamedRangeObj::getContent() throw(uno::RuntimeException, std } void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aContStr(aContent); @@ -251,7 +249,6 @@ void SAL_CALL ScNamedRangeObj::setContent( const OUString& aContent ) } table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAddress aPos; @@ -277,7 +274,6 @@ table::CellAddress SAL_CALL ScNamedRangeObj::getReferencePosition() } void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& aReferencePosition ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAddress aPos( (SCCOL)aReferencePosition.Column, (SCROW)aReferencePosition.Row, aReferencePosition.Sheet ); @@ -285,7 +281,7 @@ void SAL_CALL ScNamedRangeObj::setReferencePosition( const table::CellAddress& a Modify_Impl( nullptr, nullptr, nullptr, &aPos, nullptr,formula::FormulaGrammar::GRAM_API ); } -sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScNamedRangeObj::getType() { SolarMutexGuard aGuard; sal_Int32 nType=0; @@ -302,7 +298,6 @@ sal_Int32 SAL_CALL ScNamedRangeObj::getType() throw(uno::RuntimeException, std:: } void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRangeData::Type nNewType = ScRangeData::Type::Name; @@ -318,7 +313,6 @@ void SAL_CALL ScNamedRangeObj::setType( sal_Int32 nUnoType ) // XFormulaTokens uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<sheet::FormulaToken> aSequence; @@ -333,7 +327,6 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScNamedRangeObj::getTokens() } void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToken>& rTokens ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( pDocShell ) @@ -348,7 +341,6 @@ void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToke // XCellRangeSource uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aRange; @@ -368,7 +360,6 @@ uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells() // beans::XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetNamedRangeMap() )); @@ -377,9 +368,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangeObj::getPropertySet void SAL_CALL ScNamedRangeObj::setPropertyValue( const OUString& rPropertyName, const uno::Any& /*aValue*/ ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( rPropertyName == SC_UNONAME_ISSHAREDFMLA ) @@ -389,8 +377,6 @@ void SAL_CALL ScNamedRangeObj::setPropertyValue( } uno::Any SAL_CALL ScNamedRangeObj::getPropertyValue( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -420,19 +406,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangeObj ) // lang::XServiceInfo -OUString SAL_CALL ScNamedRangeObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScNamedRangeObj::getImplementationName() { return OUString( "ScNamedRangeObj" ); } sal_Bool SAL_CALL ScNamedRangeObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCNAMEDRANGEOBJ_SERVICE, SCLINKTARGET_SERVICE}; } @@ -440,7 +424,7 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScNamedRangeObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -491,7 +475,6 @@ void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, const OUString& aContent, const table::CellAddress& aPosition, sal_Int32 nUnoType ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAddress aPos( (SCCOL)aPosition.Column, (SCROW)aPosition.Row, aPosition.Sheet ); @@ -531,7 +514,7 @@ void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, } void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& aSource, - sheet::Border aBorder ) throw(uno::RuntimeException, std::exception) + sheet::Border aBorder ) { SolarMutexGuard aGuard; //! this cannot be an enum, because multiple bits can be set !!! @@ -555,7 +538,6 @@ void SAL_CALL ScNamedRangesObj::addNewFromTitles( const table::CellRangeAddress& } void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -580,7 +562,6 @@ void SAL_CALL ScNamedRangesObj::removeByName( const OUString& aName ) } void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScAddress aPos( (SCCOL)aOutputPosition.Column, (SCROW)aOutputPosition.Row, aOutputPosition.Sheet ); @@ -591,7 +572,6 @@ void SAL_CALL ScNamedRangesObj::outputList( const table::CellAddress& aOutputPos // container::XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.NamedRangesEnumeration")); @@ -599,7 +579,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScNamedRangesObj::createEnumera // container::XIndexAccess -sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScNamedRangesObj::getCount() { SolarMutexGuard aGuard; long nRet = 0; @@ -618,8 +598,6 @@ sal_Int32 SAL_CALL ScNamedRangesObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< sheet::XNamedRange > xRange(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -629,20 +607,19 @@ uno::Any SAL_CALL ScNamedRangesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScNamedRangesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScNamedRangesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XNamedRange>::get(); // must be suitable for getByIndex } -sal_Bool SAL_CALL ScNamedRangesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScNamedRangesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); } Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangesObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { static Reference<beans::XPropertySetInfo> aRef( new SfxItemPropertySetInfo(lcl_GetNamedRangesMap())); @@ -651,9 +628,6 @@ Reference<beans::XPropertySetInfo> SAL_CALL ScNamedRangesObj::getPropertySetInfo void SAL_CALL ScNamedRangesObj::setPropertyValue( const OUString& rPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { if ( rPropertyName == SC_UNO_MODIFY_BROADCAST ) { @@ -662,8 +636,6 @@ void SAL_CALL ScNamedRangesObj::setPropertyValue( } Any SAL_CALL ScNamedRangesObj::getPropertyValue( const OUString& rPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { Any aRet; if ( rPropertyName == SC_UNO_MODIFY_BROADCAST ) @@ -677,8 +649,6 @@ Any SAL_CALL ScNamedRangesObj::getPropertyValue( const OUString& rPropertyName ) SC_IMPL_DUMMY_PROPERTY_LISTENER( ScNamedRangesObj ) uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< sheet::XNamedRange > xRange(GetObjectByName_Impl(aName)); @@ -689,7 +659,6 @@ uno::Any SAL_CALL ScNamedRangesObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -714,7 +683,6 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangesObj::getElementNames() } sal_Bool SAL_CALL ScNamedRangesObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -744,13 +712,13 @@ void ScNamedRangesObj::unlock() // document::XActionLockable -sal_Bool ScNamedRangesObj::isActionLocked() throw(uno::RuntimeException, std::exception) +sal_Bool ScNamedRangesObj::isActionLocked() { SolarMutexGuard aGuard; return pDocShell->GetDocument().GetNamedRangesLockCount() != 0; } -void ScNamedRangesObj::addActionLock() throw(uno::RuntimeException, std::exception) +void ScNamedRangesObj::addActionLock() { SolarMutexGuard aGuard; ScDocument& rDoc = pDocShell->GetDocument(); @@ -763,7 +731,7 @@ void ScNamedRangesObj::addActionLock() throw(uno::RuntimeException, std::excepti rDoc.SetNamedRangesLockCount( nLockCount ); } -void ScNamedRangesObj::removeActionLock() throw(uno::RuntimeException, std::exception) +void ScNamedRangesObj::removeActionLock() { SolarMutexGuard aGuard; ScDocument& rDoc = pDocShell->GetDocument(); @@ -779,7 +747,7 @@ void ScNamedRangesObj::removeActionLock() throw(uno::RuntimeException, std::exce } } -void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeException, std::exception) +void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) { SolarMutexGuard aGuard; if ( nLock >= 0 ) @@ -798,7 +766,7 @@ void ScNamedRangesObj::setActionLocks( sal_Int16 nLock ) throw(uno::RuntimeExcep } } -sal_Int16 ScNamedRangesObj::resetActionLocks() throw(uno::RuntimeException, std::exception) +sal_Int16 ScNamedRangesObj::resetActionLocks() { SolarMutexGuard aGuard; ScDocument& rDoc = pDocShell->GetDocument(); @@ -1003,7 +971,6 @@ void ScLabelRangeObj::Modify_Impl( const ScRange* pLabel, const ScRange* pData ) // sheet::XLabelRange table::CellRangeAddress SAL_CALL ScLabelRangeObj::getLabelArea() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -1014,7 +981,6 @@ table::CellRangeAddress SAL_CALL ScLabelRangeObj::getLabelArea() } void SAL_CALL ScLabelRangeObj::setLabelArea( const table::CellRangeAddress& aLabelArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aLabelRange; @@ -1023,7 +989,6 @@ void SAL_CALL ScLabelRangeObj::setLabelArea( const table::CellRangeAddress& aLab } table::CellRangeAddress SAL_CALL ScLabelRangeObj::getDataArea() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; table::CellRangeAddress aRet; @@ -1034,7 +999,6 @@ table::CellRangeAddress SAL_CALL ScLabelRangeObj::getDataArea() } void SAL_CALL ScLabelRangeObj::setDataArea( const table::CellRangeAddress& aDataArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScRange aDataRange; @@ -1087,7 +1051,6 @@ ScLabelRangeObj* ScLabelRangesObj::GetObjectByIndex_Impl(size_t nIndex) void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelArea, const table::CellRangeAddress& aDataArea ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pDocShell) @@ -1119,7 +1082,6 @@ void SAL_CALL ScLabelRangesObj::addNew( const table::CellRangeAddress& aLabelAre } void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -1158,7 +1120,6 @@ void SAL_CALL ScLabelRangesObj::removeByIndex( sal_Int32 nIndex ) // container::XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.LabelRangesEnumeration")); @@ -1166,7 +1127,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScLabelRangesObj::createEnumera // container::XIndexAccess -sal_Int32 SAL_CALL ScLabelRangesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScLabelRangesObj::getCount() { SolarMutexGuard aGuard; if (pDocShell) @@ -1180,8 +1141,6 @@ sal_Int32 SAL_CALL ScLabelRangesObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< sheet::XLabelRange > xRange(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -1191,14 +1150,14 @@ uno::Any SAL_CALL ScLabelRangesObj::getByIndex( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -uno::Type SAL_CALL ScLabelRangesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScLabelRangesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XLabelRange>::get(); // must be suitable for getByIndex } -sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScLabelRangesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index ec1d5956043f..c21b1a62cff7 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -89,7 +89,7 @@ void ScAnnotationObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // XChild -uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno::RuntimeException, std::exception) +uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() { SolarMutexGuard aGuard; @@ -103,7 +103,6 @@ uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno: } void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>& /* Parent */ ) - throw(lang::NoSupportException, uno::RuntimeException, std::exception) { // hamma nich //! Exception oder so ??! @@ -112,7 +111,6 @@ void SAL_CALL ScAnnotationObj::setParent( const uno::Reference<uno::XInterface>& // XSimpleText uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // Notizen brauchen keine Extrawurst @@ -121,20 +119,19 @@ uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursor() uno::Reference<text::XTextCursor> SAL_CALL ScAnnotationObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // Notizen brauchen keine Extrawurst return GetUnoText().createTextCursorByRange(aTextPosition); } -OUString SAL_CALL ScAnnotationObj::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScAnnotationObj::getString() { SolarMutexGuard aGuard; return GetUnoText().getString(); } -void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) { SolarMutexGuard aGuard; GetUnoText().setString(aText); @@ -142,7 +139,6 @@ void SAL_CALL ScAnnotationObj::setString( const OUString& aText ) throw(uno::Run void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRange>& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetUnoText().insertString( xRange, aString, bAbsorb ); @@ -150,25 +146,24 @@ void SAL_CALL ScAnnotationObj::insertString( const uno::Reference<text::XTextRan void SAL_CALL ScAnnotationObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetUnoText().insertControlCharacter( xRange, nControlCharacter, bAbsorb ); } -uno::Reference<text::XText> SAL_CALL ScAnnotationObj::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScAnnotationObj::getText() { SolarMutexGuard aGuard; return GetUnoText().getText(); } -uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getStart() { SolarMutexGuard aGuard; return GetUnoText().getStart(); } -uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() { SolarMutexGuard aGuard; return GetUnoText().getEnd(); @@ -176,7 +171,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScAnnotationObj::getEnd() throw(uno::R // XSheetAnnotation -table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeException, std::exception) +table::CellAddress SAL_CALL ScAnnotationObj::getPosition() { SolarMutexGuard aGuard; table::CellAddress aAdr; @@ -187,7 +182,6 @@ table::CellAddress SAL_CALL ScAnnotationObj::getPosition() throw(uno::RuntimeExc } OUString SAL_CALL ScAnnotationObj::getAuthor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); @@ -195,21 +189,20 @@ OUString SAL_CALL ScAnnotationObj::getAuthor() } OUString SAL_CALL ScAnnotationObj::getDate() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); return pNote ? pNote->GetDate() : OUString(); } -sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScAnnotationObj::getIsVisible() { SolarMutexGuard aGuard; const ScPostIt* pNote = ImplGetNote(); return pNote && pNote->IsCaptionShown(); } -void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) { SolarMutexGuard aGuard; // show/hide note with undo action @@ -219,8 +212,6 @@ void SAL_CALL ScAnnotationObj::setIsVisible( sal_Bool bIsVisible ) throw(uno::Ru // XSheetAnnotationShapeSupplier uno::Reference < drawing::XShape > SAL_CALL ScAnnotationObj::getAnnotationShape() - throw(css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; uno::Reference < drawing::XShape > xShape; diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index ff479fe92677..0731ef75cb06 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -198,9 +198,6 @@ ScDocOptionsObj::~ScDocOptionsObj() void SAL_CALL ScDocOptionsObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -211,8 +208,6 @@ void SAL_CALL ScDocOptionsObj::setPropertyValue( } uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index a1566c7d397c..c2b49d86ed19 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -34,7 +34,6 @@ ScPageObj::~ScPageObj() throw() } uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const - throw (css::uno::RuntimeException, std::exception) { uno::Reference<drawing::XShape> xShape(SvxFmDrawPage::CreateShape( pObj )); @@ -44,19 +43,16 @@ uno::Reference<drawing::XShape > ScPageObj::CreateShape( SdrObject *pObj ) const } OUString SAL_CALL ScPageObj::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("ScPageObj"); } sal_Bool SAL_CALL ScPageObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScPageObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { uno::Sequence<OUString> aRet { "com.sun.star.sheet.SpreadsheetDrawPage" }; return aRet; diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 6e3318bdddc8..f0372bae38c7 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -261,7 +261,6 @@ static bool lcl_MayBeDBase( SvStream& rStream ) } OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& lDescriptor ) - throw( uno::RuntimeException, std::exception ) { MediaDescriptor aMediaDesc( lDescriptor ); OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() ); @@ -328,19 +327,17 @@ OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>& l return aTypeName; } -OUString SAL_CALL ScFilterDetect::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScFilterDetect::getImplementationName() { return OUString("com.sun.star.comp.calc.FormatDetector"); } sal_Bool ScFilterDetect::supportsService( const OUString& sServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, sServiceName); } css::uno::Sequence<OUString> ScFilterDetect::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence<OUString> seqServiceNames { "com.sun.star.frame.ExtendedTypeDetection" }; return seqServiceNames; diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index f5e00db299d6..e97bfbf416d2 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -43,14 +43,13 @@ public: virtual ~ScFilterDetect() override; /* XServiceInfo */ - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) 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& sServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XExtendedFilterDetect - virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL detect( css::uno::Sequence<css::beans::PropertyValue>& lDescriptor ) override; }; #endif diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 6511c5abb31f..0f15c36fdf64 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -92,7 +92,7 @@ public: maWorkbook <<= ooo::vba::createVBAUnoAPIServiceWithArgs( mpDocShell, "ooo.vba.excel.Workbook", aArgs ); } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (css::uno::RuntimeException, std::exception ) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { SolarMutexGuard aGuard; maCachedObject = uno::Any(); // clear cached object @@ -135,14 +135,14 @@ public: return maCachedObject.hasValue(); } - css::uno::Any SAL_CALL getByName( const OUString& aName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + css::uno::Any SAL_CALL getByName( const OUString& aName ) override { SolarMutexGuard aGuard; if ( !hasByName( aName ) ) throw css::container::NoSuchElementException(); return maCachedObject; } - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (css::uno::RuntimeException, std::exception) override + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override { SolarMutexGuard aGuard; ScDocument& rDoc = mpDocShell->GetDocument(); @@ -159,8 +159,8 @@ public: return aNames; } // XElemenAccess - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override { return uno::Type(); } - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception ) override { return true; } + virtual css::uno::Type SAL_CALL getElementType( ) override { return uno::Type(); } + virtual sal_Bool SAL_CALL hasElements( ) override { return true; } }; @@ -170,7 +170,7 @@ class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper< document::XCodeName public: explicit ScVbaCodeNameProvider( ScDocShell& rDocShell ) : mrDocShell(rDocShell) {} // XCodeNameQuery - OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) throw( uno::RuntimeException, std::exception ) override + OUString SAL_CALL getCodeNameForObject( const uno::Reference< uno::XInterface >& xIf ) override { SolarMutexGuard aGuard; OUString sCodeName; @@ -209,8 +209,7 @@ public: return sCodeName; } - OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) - throw( uno::RuntimeException, std::exception ) override + OUString SAL_CALL getCodeNameForContainer( const uno::Reference<uno::XInterface>& xContainer ) override { SolarMutexGuard aGuard; uno::Reference<drawing::XDrawPagesSupplier> xSupplier(mrDocShell.GetModel(), uno::UNO_QUERY_THROW); diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index eb850fae4082..ec65204dab54 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -136,7 +136,6 @@ ScShapeObj::~ScShapeObj() // XInterface uno::Any SAL_CALL ScShapeObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { uno::Any aRet = ScShapeObj_Base::queryInterface( rType ); @@ -225,7 +224,6 @@ static uno::Reference<text::XTextRange> lcl_GetTextRange( const uno::Reference<u // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -321,9 +319,6 @@ static awt::Point lcl_GetRelativePos( uno::Reference< drawing::XShape >& xShape, } void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const uno::Any& aValue) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -652,8 +647,6 @@ void SAL_CALL ScShapeObj::setPropertyValue(const OUString& aPropertyName, const } uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -838,8 +831,6 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const OUString& aPropertyName ) void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XPropertyChangeListener>& aListener) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -862,8 +853,6 @@ void SAL_CALL ScShapeObj::addPropertyChangeListener( const OUString& aPropertyNa void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XPropertyChangeListener>& aListener) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -874,8 +863,6 @@ void SAL_CALL ScShapeObj::removePropertyChangeListener( const OUString& aPropert void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XVetoableChangeListener>& aListener) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -886,8 +873,6 @@ void SAL_CALL ScShapeObj::addVetoableChangeListener( const OUString& aPropertyNa void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropertyName, const uno::Reference<beans::XVetoableChangeListener>& aListener) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -899,7 +884,6 @@ void SAL_CALL ScShapeObj::removeVetoableChangeListener( const OUString& aPropert // XPropertyState beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -932,7 +916,6 @@ beans::PropertyState SAL_CALL ScShapeObj::getPropertyState( const OUString& aPro uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( const uno::Sequence<OUString>& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -947,8 +930,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScShapeObj::getPropertyStates( } void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; @@ -978,8 +959,6 @@ void SAL_CALL ScShapeObj::setPropertyToDefault( const OUString& aPropertyName ) } uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1003,7 +982,6 @@ uno::Any SAL_CALL ScShapeObj::getPropertyDefault( const OUString& aPropertyName // XTextContent void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTextRange */ ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1011,7 +989,6 @@ void SAL_CALL ScShapeObj::attach( const uno::Reference<text::XTextRange>& /* xTe } uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1052,7 +1029,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getAnchor() // XComponent -void SAL_CALL ScShapeObj::dispose() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScShapeObj::dispose() { SolarMutexGuard aGuard; @@ -1063,7 +1040,6 @@ void SAL_CALL ScShapeObj::dispose() throw(uno::RuntimeException, std::exception) void SAL_CALL ScShapeObj::addEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1074,7 +1050,6 @@ void SAL_CALL ScShapeObj::addEventListener( void SAL_CALL ScShapeObj::removeEventListener( const uno::Reference<lang::XEventListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1102,7 +1077,6 @@ static void lcl_CopyOneProperty( beans::XPropertySet& rDest, beans::XPropertySet void SAL_CALL ScShapeObj::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; @@ -1130,7 +1104,6 @@ void SAL_CALL ScShapeObj::insertTextContent( const uno::Reference<text::XTextRan } void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1145,7 +1118,6 @@ void SAL_CALL ScShapeObj::removeTextContent( const uno::Reference<text::XTextCon // Use own SvxUnoTextCursor subclass - everything is just passed to aggregated object uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1163,7 +1135,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursor() uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1187,7 +1158,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScShapeObj::createTextCursorByRange( void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1200,7 +1170,6 @@ void SAL_CALL ScShapeObj::insertString( const uno::Reference<text::XTextRange>& void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1214,13 +1183,13 @@ void SAL_CALL ScShapeObj::insertControlCharacter( const uno::Reference<text::XTe // XTextRange // (parent of XSimpleText) -uno::Reference<text::XText> SAL_CALL ScShapeObj::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScShapeObj::getText() { SolarMutexGuard aGuard; return this; } -uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() { SolarMutexGuard aGuard; @@ -1233,7 +1202,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getStart() throw(uno::Runt // return uno::Reference<text::XTextRange>(); } -uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() { SolarMutexGuard aGuard; @@ -1246,7 +1215,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScShapeObj::getEnd() throw(uno::Runtim // return uno::Reference<text::XTextRange>(); } -OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScShapeObj::getString() { SolarMutexGuard aGuard; @@ -1259,7 +1228,7 @@ OUString SAL_CALL ScShapeObj::getString() throw(uno::RuntimeException, std::exce // return OUString(); } -void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScShapeObj::setString( const OUString& aText ) { SolarMutexGuard aGuard; @@ -1272,7 +1241,7 @@ void SAL_CALL ScShapeObj::setString( const OUString& aText ) throw(uno::RuntimeE // XChild -uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() throw (uno::RuntimeException, std::exception) +uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() { SolarMutexGuard aGuard; @@ -1307,14 +1276,14 @@ uno::Reference< uno::XInterface > SAL_CALL ScShapeObj::getParent() throw (uno::R return nullptr; } -void SAL_CALL ScShapeObj::setParent( const uno::Reference< uno::XInterface >& ) throw (lang::NoSupportException, uno::RuntimeException, std::exception) +void SAL_CALL ScShapeObj::setParent( const uno::Reference< uno::XInterface >& ) { throw lang::NoSupportException(); } // XTypeProvider -uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() { uno::Sequence< uno::Type > aBaseTypes( ScShapeObj_Base::getTypes() ); @@ -1335,7 +1304,6 @@ uno::Sequence<uno::Type> SAL_CALL ScShapeObj::getTypes() throw(uno::RuntimeExcep } uno::Sequence<sal_Int8> SAL_CALL ScShapeObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -1372,10 +1340,7 @@ public: } // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw (lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, - std::exception) override + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override { if ( !hasByName( aName ) ) throw container::NoSuchElementException(); @@ -1411,9 +1376,7 @@ public: } // XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw (container::NoSuchElementException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) override + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override { uno::Sequence< beans::PropertyValue > aProperties; ScMacroInfo* pInfo = getInfo(false); @@ -1437,24 +1400,24 @@ public: return uno::Any( aProperties ); } - virtual uno::Sequence< OUString > SAL_CALL getElementNames() throw(uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getElementNames() override { uno::Sequence<OUString> aSeq { SC_EVENTACC_ONCLICK }; return aSeq; } - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override { return aName == SC_EVENTACC_ONCLICK; } // XElementAccess - virtual uno::Type SAL_CALL getElementType() throw(uno::RuntimeException, std::exception) override + virtual uno::Type SAL_CALL getElementType() override { return cppu::UnoType<uno::Sequence< beans::PropertyValue >>::get(); } - virtual sal_Bool SAL_CALL hasElements() throw(uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements() override { // elements are always present (but contained property sequences may be empty) return true; @@ -1462,22 +1425,22 @@ public: }; ::uno::Reference< container::XNameReplace > SAL_CALL -ScShapeObj::getEvents( ) throw(uno::RuntimeException, std::exception) +ScShapeObj::getEvents( ) { return new ShapeUnoEventAccessImpl( this ); } -OUString SAL_CALL ScShapeObj::getImplementationName( ) throw (uno::RuntimeException, std::exception) +OUString SAL_CALL ScShapeObj::getImplementationName( ) { return OUString( "com.sun.star.comp.sc.ScShapeObj" ); } -sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScShapeObj::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL ScShapeObj::getSupportedServiceNames( ) { uno::Reference<lang::XServiceInfo> xSI; if ( mxShapeAgg.is() ) diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 7fe453fe8c57..e572f669b758 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -95,14 +95,13 @@ ScCellSearchObj::~ScCellSearchObj() // XSearchDescriptor -OUString SAL_CALL ScCellSearchObj::getSearchString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellSearchObj::getSearchString() { SolarMutexGuard aGuard; return pSearchItem->GetSearchString(); } void SAL_CALL ScCellSearchObj::setSearchString( const OUString& aString ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; pSearchItem->SetSearchString( aString ); @@ -110,14 +109,13 @@ void SAL_CALL ScCellSearchObj::setSearchString( const OUString& aString ) // XReplaceDescriptor -OUString SAL_CALL ScCellSearchObj::getReplaceString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellSearchObj::getReplaceString() { SolarMutexGuard aGuard; return pSearchItem->GetReplaceString(); } void SAL_CALL ScCellSearchObj::setReplaceString( const OUString& aReplaceString ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; pSearchItem->SetReplaceString( aReplaceString ); @@ -126,7 +124,6 @@ void SAL_CALL ScCellSearchObj::setReplaceString( const OUString& aReplaceString // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellSearchObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -136,9 +133,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScCellSearchObj::getPropertySet void SAL_CALL ScCellSearchObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -160,8 +154,6 @@ void SAL_CALL ScCellSearchObj::setPropertyValue( } uno::Any SAL_CALL ScCellSearchObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -189,19 +181,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScCellSearchObj ) // XServiceInfo -OUString SAL_CALL ScCellSearchObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScCellSearchObj::getImplementationName() { return OUString( "ScCellSearchObj" ); } sal_Bool SAL_CALL ScCellSearchObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCSEARCHDESCRIPTOR_SERVICE, SCREPLACEDESCRIPTOR_SERVICE}; } @@ -209,7 +199,7 @@ uno::Sequence<OUString> SAL_CALL ScCellSearchObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScCellSearchObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index e646e70e5dfd..1b27d6f6e2fb 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -457,14 +457,12 @@ ScStyleFamilyObj* ScStyleFamiliesObj::GetObjectByName_Impl(const OUString& aName // container::XIndexAccess -sal_Int32 SAL_CALL ScStyleFamiliesObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScStyleFamiliesObj::getCount() { return SC_STYLE_FAMILY_COUNT; } uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< container::XNameContainer > xFamily(GetObjectByIndex_Impl(nIndex)); @@ -475,13 +473,13 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByIndex( sal_Int32 nIndex ) // return uno::Any(); } -uno::Type SAL_CALL ScStyleFamiliesObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScStyleFamiliesObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<container::XNameContainer>::get(); // muss zu getByIndex passen } -sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -490,8 +488,6 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasElements() throw(uno::RuntimeException, // container::XNameAccess uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< container::XNameContainer > xFamily(GetObjectByName_Impl(aName)); @@ -503,13 +499,11 @@ uno::Any SAL_CALL ScStyleFamiliesObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScStyleFamiliesObj::getElementNames() - throw(uno::RuntimeException, std::exception) { return {SC_FAMILYNAME_CELL, SC_FAMILYNAME_PAGE}; } sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { return aName == SC_FAMILYNAME_CELL || aName == SC_FAMILYNAME_PAGE; } @@ -518,7 +512,6 @@ sal_Bool SAL_CALL ScStyleFamiliesObj::hasByName( const OUString& aName ) void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const OUString& aURL, const uno::Sequence<beans::PropertyValue>& aOptions ) - throw(io::IOException, uno::RuntimeException, std::exception) { //! use aOptions (like Writer) //! set flag to disable filter option dialogs when importing @@ -533,7 +526,6 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromURL( const OUString& aURL, } uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderOptions() - throw(uno::RuntimeException, std::exception) { // return defaults for options (?) @@ -556,7 +548,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO void SAL_CALL ScStyleFamiliesObj::loadStylesFromDocument( const uno::Reference < lang::XComponent > & aSourceComponent, const uno::Sequence<beans::PropertyValue>& aOptions ) - throw(io::IOException, uno::RuntimeException, std::exception) { // Source document docShell if ( !aSourceComponent.is() ) @@ -571,7 +562,6 @@ void SAL_CALL ScStyleFamiliesObj::loadStylesFromDocument( const uno::Reference < void ScStyleFamiliesObj::loadStylesFromDocShell( ScDocShell* pSource, const uno::Sequence<beans::PropertyValue>& aOptions ) - throw(io::IOException, uno::RuntimeException, std::exception) { if ( pSource && pDocShell ) @@ -662,8 +652,6 @@ ScStyleObj* ScStyleFamilyObj::GetObjectByName_Impl(const OUString& aName) } void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; bool bDone = false; @@ -709,8 +697,6 @@ void SAL_CALL ScStyleFamilyObj::insertByName( const OUString& aName, const uno:: } void SAL_CALL ScStyleFamilyObj::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; //! zusammenfassen? @@ -719,10 +705,6 @@ void SAL_CALL ScStyleFamilyObj::replaceByName( const OUString& aName, const uno: } void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; bool bFound = false; @@ -777,7 +759,7 @@ void SAL_CALL ScStyleFamilyObj::removeByName( const OUString& aName ) // container::XIndexAccess -sal_Int32 SAL_CALL ScStyleFamilyObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScStyleFamilyObj::getCount() { SolarMutexGuard aGuard; if ( pDocShell ) @@ -792,8 +774,6 @@ sal_Int32 SAL_CALL ScStyleFamilyObj::getCount() throw(uno::RuntimeException, std } uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< style::XStyle > xObj(GetObjectByIndex_Impl(nIndex)); @@ -804,13 +784,13 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByIndex( sal_Int32 nIndex ) // return uno::Any(); } -uno::Type SAL_CALL ScStyleFamilyObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScStyleFamilyObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<style::XStyle>::get(); // muss zu getByIndex passen } -sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -819,8 +799,6 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasElements() throw(uno::RuntimeException, s // container::XNameAccess uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName ) - throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference< style::XStyle > xObj( @@ -833,7 +811,6 @@ uno::Any SAL_CALL ScStyleFamilyObj::getByName( const OUString& aName ) } uno::Sequence<OUString> SAL_CALL ScStyleFamilyObj::getElementNames() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -862,7 +839,6 @@ uno::Sequence<OUString> SAL_CALL ScStyleFamilyObj::getElementNames() } sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( pDocShell ) @@ -879,18 +855,18 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const OUString& aName ) // XPropertySet -uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getPropertySetInfo( ) throw (uno::RuntimeException, std::exception) +uno::Reference< beans::XPropertySetInfo > SAL_CALL ScStyleFamilyObj::getPropertySetInfo( ) { OSL_FAIL( "###unexpected!" ); return uno::Reference< beans::XPropertySetInfo >(); } -void SAL_CALL ScStyleFamilyObj::setPropertyValue( const OUString&, const uno::Any& ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::setPropertyValue( const OUString&, const uno::Any& ) { OSL_FAIL( "###unexpected!" ); } -uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyName ) { uno::Any aRet; @@ -921,22 +897,22 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const OUString& sPropertyN return aRet; } -void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) { OSL_FAIL( "###unexpected!" ); } -void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) +void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) { OSL_FAIL( "###unexpected!" ); } @@ -977,7 +953,7 @@ ScStyleObj::~ScStyleObj() // XUnoTunnel sal_Int64 SAL_CALL ScStyleObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -1034,7 +1010,7 @@ SfxStyleSheetBase* ScStyleObj::GetStyle_Impl( bool bUseCachedValue ) // style::XStyle -sal_Bool SAL_CALL ScStyleObj::isUserDefined() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScStyleObj::isUserDefined() { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1043,7 +1019,7 @@ sal_Bool SAL_CALL ScStyleObj::isUserDefined() throw(uno::RuntimeException, std:: return false; } -sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScStyleObj::isInUse() { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1052,7 +1028,7 @@ sal_Bool SAL_CALL ScStyleObj::isInUse() throw(uno::RuntimeException, std::except return false; } -OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScStyleObj::getParentStyle() { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1062,9 +1038,6 @@ OUString SAL_CALL ScStyleObj::getParentStyle() throw(uno::RuntimeException, std: } void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle ) - throw(container::NoSuchElementException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1113,7 +1086,7 @@ void SAL_CALL ScStyleObj::setParentStyle( const OUString& rParentStyle ) // container::XNamed -OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScStyleObj::getName() { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1123,7 +1096,6 @@ OUString SAL_CALL ScStyleObj::getName() throw(uno::RuntimeException, std::except } void SAL_CALL ScStyleObj::setName( const OUString& aNewName ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; SfxStyleSheetBase* pStyle = GetStyle_Impl(); @@ -1201,7 +1173,6 @@ const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const OUString& rPropName, } beans::PropertyState ScStyleObj::getPropertyState_Impl( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState eRet = beans::PropertyState_DIRECT_VALUE; @@ -1240,7 +1211,6 @@ beans::PropertyState ScStyleObj::getPropertyState_Impl( const OUString& aPropert } beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1249,7 +1219,6 @@ beans::PropertyState SAL_CALL ScStyleObj::getPropertyState( const OUString& aPro } uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( const uno::Sequence<OUString>& aPropertyNames ) - throw(beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1263,8 +1232,6 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScStyleObj::getPropertyStates( cons } void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1277,7 +1244,6 @@ void SAL_CALL ScStyleObj::setPropertyToDefault( const OUString& aPropertyName ) } uno::Any ScStyleObj::getPropertyDefault_Impl( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aAny; @@ -1364,7 +1330,6 @@ uno::Any ScStyleObj::getPropertyDefault_Impl( const OUString& aPropertyName ) } uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1373,7 +1338,6 @@ uno::Any SAL_CALL ScStyleObj::getPropertyDefault( const OUString& aPropertyName } uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( const uno::Sequence<OUString>& aPropertyNames ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1389,9 +1353,6 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyDefaults( const uno::Seq void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< OUString >& aPropertyNames, const uno::Sequence< uno::Any >& aValues ) -throw (beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1410,7 +1371,6 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException, } uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( const uno::Sequence< OUString >& aPropertyNames ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1424,21 +1384,18 @@ uno::Sequence<uno::Any> SAL_CALL ScStyleObj::getPropertyValues( const uno::Seque void SAL_CALL ScStyleObj::addPropertiesChangeListener( const uno::Sequence<OUString>& /* aPropertyNames */, const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { // no bound properties } void SAL_CALL ScStyleObj::removePropertiesChangeListener( const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { // no bound properties } void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<OUString>& /* aPropertyNames */, const uno::Reference<beans::XPropertiesChangeListener>& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { // no bound properties } @@ -1447,7 +1404,6 @@ void SAL_CALL ScStyleObj::firePropertiesChangeEvent( const uno::Sequence<OUStrin // getPropertyStates already defined for XPropertyState void SAL_CALL ScStyleObj::setAllPropertiesToDefault() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1497,7 +1453,6 @@ void SAL_CALL ScStyleObj::setAllPropertiesToDefault() } void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<OUString>& aPropertyNames ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1514,16 +1469,12 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<OUString>& // beans::XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScStyleObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return pPropSet->getPropertySetInfo(); } void SAL_CALL ScStyleObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1536,7 +1487,6 @@ void SAL_CALL ScStyleObj::setPropertyValue( const OUString& aPropertyName, const } void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const SfxItemPropertySimpleEntry* pEntry, const uno::Any* pValue ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SfxStyleSheetBase* pStyle = GetStyle_Impl( true ); if ( pStyle && pEntry ) @@ -1844,7 +1794,6 @@ void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const Sfx } uno::Any ScStyleObj::getPropertyValue_Impl( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aAny; SfxStyleSheetBase* pStyle = GetStyle_Impl( true ); @@ -1976,7 +1925,6 @@ uno::Any ScStyleObj::getPropertyValue_Impl( const OUString& aPropertyName ) } uno::Any SAL_CALL ScStyleObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; GetStyle_Impl(); @@ -1988,19 +1936,17 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj ) // lang::XServiceInfo -OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScStyleObj::getImplementationName() { return OUString("ScStyleObj" ); } sal_Bool SAL_CALL ScStyleObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { const bool bPage = ( eFamily == SfxStyleFamily::Page ); diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 8a270a261c34..3da7da4c739a 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -90,7 +90,6 @@ void ScLinkTargetTypesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // container::XNameAccess uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if (pDocShell) { @@ -102,7 +101,7 @@ uno::Any SAL_CALL ScLinkTargetTypesObj::getByName(const OUString& aName) throw container::NoSuchElementException(); } -uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() { uno::Sequence<OUString> aRet(SC_LINKTARGETTYPE_COUNT); OUString* pArray = aRet.getArray(); @@ -111,7 +110,7 @@ uno::Sequence<OUString> SAL_CALL ScLinkTargetTypesObj::getElementNames() throw( return aRet; } -sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) { for (const auto & i : aNames) if ( i == aName ) @@ -121,12 +120,12 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasByName(const OUString& aName) throw( // container::XElementAccess -uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL ScLinkTargetTypesObj::getElementType() { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements() { return true; } @@ -155,7 +154,7 @@ void ScLinkTargetTypeObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) // document::XLinkTargetSupplier -uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks() throw( uno::RuntimeException, std::exception ) +uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks() { uno::Reference< container::XNameAccess > xCollection; @@ -186,7 +185,7 @@ uno::Reference< container::XNameAccess > SAL_CALL ScLinkTargetTypeObj::getLinks // beans::XPropertySet -uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) +uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getPropertySetInfo() { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetLinkTargetMap() )); @@ -195,11 +194,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScLinkTargetTypeObj::getProp void SAL_CALL ScLinkTargetTypeObj::setPropertyValue(const OUString& /* aPropertyName */, const uno::Any& /* aValue */) - throw( beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { // everything is read-only //! exception? @@ -228,7 +222,6 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType } uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& PropertyName) - throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Any aRet; if ( PropertyName == SC_UNO_LINKDISPBIT ) @@ -254,7 +247,6 @@ ScLinkTargetsObj::~ScLinkTargetsObj() // container::XNameAccess uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { uno::Reference< beans::XPropertySet > xProp( ScUnoHelpFunctions::AnyToInterface( xCollection->getByName(aName) ), uno::UNO_QUERY ); if (xProp.is()) @@ -264,24 +256,24 @@ uno::Any SAL_CALL ScLinkTargetsObj::getByName(const OUString& aName) // return uno::Any(); } -uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence<OUString> SAL_CALL ScLinkTargetsObj::getElementNames() { return xCollection->getElementNames(); } -sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetsObj::hasByName(const OUString& aName) { return xCollection->hasByName(aName); } // container::XElementAccess -uno::Type SAL_CALL ScLinkTargetsObj::getElementType() throw( uno::RuntimeException, std::exception ) +uno::Type SAL_CALL ScLinkTargetsObj::getElementType() { return cppu::UnoType<beans::XPropertySet>::get(); } -sal_Bool SAL_CALL ScLinkTargetsObj::hasElements() throw( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL ScLinkTargetsObj::hasElements() { return xCollection->hasElements(); } diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 5d61fd03794b..4af1cc4be2a5 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -116,7 +116,6 @@ const EditTextObject* ScHeaderFooterContentObj::GetRightEditObject() const // XHeaderFooterContent uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getLeftText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XText> xInt(*mxLeftText, uno::UNO_QUERY); @@ -124,7 +123,6 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getLeftText() } uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getCenterText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XText> xInt(*mxCenterText, uno::UNO_QUERY); @@ -132,7 +130,6 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getCenterText() } uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<text::XText> xInt(*mxRightText, uno::UNO_QUERY); @@ -142,7 +139,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterContentObj::getRightText() // XUnoTunnel sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -296,7 +293,6 @@ const SvxUnoText& ScHeaderFooterTextObj::GetUnoText() // XText uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCursor() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScHeaderFooterTextCursor( this ); @@ -304,7 +300,6 @@ uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCurs uno::Reference<text::XTextCursor> SAL_CALL ScHeaderFooterTextObj::createTextCursorByRange( const uno::Reference<text::XTextRange>& aTextPosition ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -324,7 +319,7 @@ void ScHeaderFooterTextObj::FillDummyFieldData( ScHeaderFieldData& rData ) rData.nTotalPages = 99; } -OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScHeaderFooterTextObj::getString() { SolarMutexGuard aGuard; OUString aRet; @@ -368,7 +363,7 @@ OUString SAL_CALL ScHeaderFooterTextObj::getString() throw(uno::RuntimeException return aRet; } -void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(uno::RuntimeException, std::exception) +void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) { SolarMutexGuard aGuard; @@ -380,7 +375,6 @@ void SAL_CALL ScHeaderFooterTextObj::setString( const OUString& aText ) throw(un void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XTextRange>& xRange, const OUString& aString, sal_Bool bAbsorb ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -391,7 +385,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertString( const uno::Reference<text::XT void SAL_CALL ScHeaderFooterTextObj::insertControlCharacter( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb ) - throw(lang::IllegalArgumentException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -403,7 +396,6 @@ void SAL_CALL ScHeaderFooterTextObj::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; if ( xContent.is() && xRange.is() ) @@ -474,7 +466,6 @@ void SAL_CALL ScHeaderFooterTextObj::insertTextContent( void SAL_CALL ScHeaderFooterTextObj::removeTextContent( const uno::Reference<text::XTextContent>& xContent ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( xContent.is() ) @@ -492,7 +483,7 @@ void SAL_CALL ScHeaderFooterTextObj::removeTextContent( mxUnoText->removeTextContent( xContent ); } -uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -500,7 +491,7 @@ uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextObj::getText() throw(uno: return mxUnoText->getText(); } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -508,7 +499,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getStart() thro return mxUnoText->getStart(); } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -519,7 +510,6 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextObj::getEnd() throw( // XTextFieldsSupplier uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::getTextFields() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; // all fields @@ -527,7 +517,6 @@ uno::Reference<container::XEnumerationAccess> SAL_CALL ScHeaderFooterTextObj::ge } uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFieldMasters() - throw(uno::RuntimeException, std::exception) { // sowas gibts nicht im Calc (?) return nullptr; @@ -538,7 +527,6 @@ uno::Reference<container::XNameAccess> SAL_CALL ScHeaderFooterTextObj::getTextFi void SAL_CALL ScHeaderFooterTextObj::moveTextRange( const uno::Reference<text::XTextRange>& xRange, sal_Int16 nParagraphs ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -549,7 +537,6 @@ void SAL_CALL ScHeaderFooterTextObj::moveTextRange( // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -559,7 +546,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScHeaderFooterTextObj::createEn // XElementAccess -uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -567,7 +554,7 @@ uno::Type SAL_CALL ScHeaderFooterTextObj::getElementType() throw(uno::RuntimeExc return mxUnoText->getElementType(); } -sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() { SolarMutexGuard aGuard; if (!mxUnoText.is()) @@ -596,13 +583,13 @@ ScCellTextCursor::~ScCellTextCursor() throw() // SvxUnoTextCursor methods reimplemented here to return the right objects: -uno::Reference<text::XText> SAL_CALL ScCellTextCursor::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScCellTextCursor::getText() { SolarMutexGuard aGuard; return &rTextObj; } -uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() { SolarMutexGuard aGuard; @@ -619,7 +606,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getStart() throw(uno return xRange; } -uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -639,7 +626,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScCellTextCursor::getEnd() throw(uno:: // XUnoTunnel sal_Int64 SAL_CALL ScCellTextCursor::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -678,13 +665,13 @@ ScHeaderFooterTextCursor::~ScHeaderFooterTextCursor() throw() {}; // SvxUnoTextCursor methods reimplemented here to return the right objects: -uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextCursor::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScHeaderFooterTextCursor::getText() { SolarMutexGuard aGuard; return rTextObj.get(); } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() { SolarMutexGuard aGuard; @@ -701,7 +688,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getStart() t return xRange; } -uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -721,7 +708,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScHeaderFooterTextCursor::getEnd() thr // XUnoTunnel sal_Int64 SAL_CALL ScHeaderFooterTextCursor::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -772,13 +759,13 @@ ScDrawTextCursor::~ScDrawTextCursor() throw() // SvxUnoTextCursor methods reimplemented here to return the right objects: -uno::Reference<text::XText> SAL_CALL ScDrawTextCursor::getText() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XText> SAL_CALL ScDrawTextCursor::getText() { SolarMutexGuard aGuard; return xParentText; } -uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() { SolarMutexGuard aGuard; @@ -795,7 +782,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getStart() throw(uno return xRange; } -uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno::RuntimeException, std::exception) +uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() { SolarMutexGuard aGuard; @@ -815,7 +802,7 @@ uno::Reference<text::XTextRange> SAL_CALL ScDrawTextCursor::getEnd() throw(uno:: // XUnoTunnel sal_Int64 SAL_CALL ScDrawTextCursor::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index e080b0488558..5197da10b98e 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -123,7 +123,6 @@ void ScFormulaParserObj::SetCompilerFlags( ScCompiler& rCompiler ) const uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( const OUString& aFormula, const table::CellAddress& rReferencePos ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Sequence<sheet::FormulaToken> aRet; @@ -149,7 +148,6 @@ uno::Sequence<sheet::FormulaToken> SAL_CALL ScFormulaParserObj::parseFormula( OUString SAL_CALL ScFormulaParserObj::printFormula( const uno::Sequence<sheet::FormulaToken>& aTokens, const table::CellAddress& rReferencePos ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; OUString aRet; @@ -176,7 +174,6 @@ OUString SAL_CALL ScFormulaParserObj::printFormula( // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFormulaParserObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > aRef(new SfxItemPropertySetInfo( lcl_GetFormulaParserMap() )); @@ -185,9 +182,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFormulaParserObj::getProperty void SAL_CALL ScFormulaParserObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if ( aPropertyName == SC_UNO_COMPILEFAP ) @@ -243,8 +237,6 @@ void SAL_CALL ScFormulaParserObj::setPropertyValue( } uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index 641d556feb79..c56f4e5deccb 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -43,7 +43,7 @@ uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw() } uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & /* rSMgr */, SfxModelFlags _nCreationFlags ) throw( uno::Exception, std::exception ) + const uno::Reference< lang::XMultiServiceFactory > & /* rSMgr */, SfxModelFlags _nCreationFlags ) { SolarMutexGuard aGuard; ScDLL::Init(); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 0a7b17577caf..11a76fcd020e 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -141,7 +141,6 @@ void ScViewPaneBase::Notify( SfxBroadcaster&, const SfxHint& rHint ) } uno::Any SAL_CALL ScViewPaneBase::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XViewPane ) SC_QUERYINTERFACE( sheet::XCellRangeReferrer ) @@ -153,7 +152,7 @@ uno::Any SAL_CALL ScViewPaneBase::queryInterface( const uno::Type& rType ) return uno::Any(); // OWeakObject is in derived objects } -uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -170,14 +169,13 @@ uno::Sequence<uno::Type> SAL_CALL ScViewPaneBase::getTypes() throw(uno::RuntimeE } uno::Sequence<sal_Int8> SAL_CALL ScViewPaneBase::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } // XViewPane -sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() { SolarMutexGuard aGuard; if (pViewShell) @@ -195,7 +193,6 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleColumn() throw(uno::RuntimeExc } void SAL_CALL ScViewPaneBase::setFirstVisibleColumn(sal_Int32 nFirstVisibleColumn) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pViewShell) @@ -211,7 +208,7 @@ void SAL_CALL ScViewPaneBase::setFirstVisibleColumn(sal_Int32 nFirstVisibleColum } } -sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() { SolarMutexGuard aGuard; if (pViewShell) @@ -229,7 +226,6 @@ sal_Int32 SAL_CALL ScViewPaneBase::getFirstVisibleRow() throw(uno::RuntimeExcept } void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pViewShell) @@ -246,7 +242,6 @@ void SAL_CALL ScViewPaneBase::setFirstVisibleRow( sal_Int32 nFirstVisibleRow ) } table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; table::CellRangeAddress aAdr; @@ -279,7 +274,6 @@ table::CellRangeAddress SAL_CALL ScViewPaneBase::getVisibleRange() // XCellRangeSource uno::Reference<table::XCellRange> SAL_CALL ScViewPaneBase::getReferredCells() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if (pViewShell) @@ -317,7 +311,7 @@ namespace } // XFormLayerAccess -uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException, std::exception) +uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFormController( const uno::Reference< form::XForm >& Form ) { SolarMutexGuard aGuard; @@ -332,7 +326,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFor return xController; } -sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode( ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode( ) { SolarMutexGuard aGuard; @@ -345,7 +339,7 @@ sal_Bool SAL_CALL ScViewPaneBase::isFormDesignMode( ) throw (uno::RuntimeExcept return bIsFormDesignMode; } -void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool DesignMode ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool DesignMode ) { SolarMutexGuard aGuard; @@ -360,7 +354,6 @@ void SAL_CALL ScViewPaneBase::setFormDesignMode( sal_Bool DesignMode ) throw (un uno::Reference<awt::XControl> SAL_CALL ScViewPaneBase::getControl( const uno::Reference<awt::XControlModel>& xModel ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -422,7 +415,6 @@ ScViewPaneObj::~ScViewPaneObj() } uno::Any SAL_CALL ScViewPaneObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { // ScViewPaneBase has everything except OWeakObject @@ -476,7 +468,6 @@ ScTabViewObj::~ScTabViewObj() } uno::Any SAL_CALL ScTabViewObj::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE( sheet::XSpreadsheetView ) SC_QUERYINTERFACE( sheet::XEnhancedMouseClickBroadcaster ) @@ -584,7 +575,7 @@ void ScTabViewObj::SheetChanged( bool bSameTabButMoved ) nPreviousTab = nNewTab; } -uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() { static uno::Sequence<uno::Type> aTypes; if ( aTypes.getLength() == 0 ) @@ -624,7 +615,6 @@ uno::Sequence<uno::Type> SAL_CALL ScTabViewObj::getTypes() throw(uno::RuntimeExc } uno::Sequence<sal_Int8> SAL_CALL ScTabViewObj::getImplementationId() - throw(uno::RuntimeException, std::exception) { return css::uno::Sequence<sal_Int8>(); } @@ -676,8 +666,6 @@ static void lcl_ShowObject( ScTabViewShell& rViewSh, ScDrawView& rDrawView, SdrO } sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) - throw(lang::IllegalArgumentException, uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -860,7 +848,6 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) } uno::Any SAL_CALL ScTabViewObj::getSelection() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -970,7 +957,6 @@ uno::Any SAL_CALL ScTabViewObj::getSelection() // XEnumerationAccess uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; return new ScIndexEnumeration(this, OUString("com.sun.star.sheet.SpreadsheetViewPanesEnumeration")); @@ -978,7 +964,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScTabViewObj::createEnumeration // XIndexAccess -sal_Int32 SAL_CALL ScTabViewObj::getCount() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTabViewObj::getCount() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -996,8 +982,6 @@ sal_Int32 SAL_CALL ScTabViewObj::getCount() throw(uno::RuntimeException, std::ex } uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex ) - throw(lang::IndexOutOfBoundsException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference<sheet::XViewPane> xPane(GetObjectByIndex_Impl((sal_uInt16)nIndex)); @@ -1008,13 +992,13 @@ uno::Any SAL_CALL ScTabViewObj::getByIndex( sal_Int32 nIndex ) // return uno::Any(); } -uno::Type SAL_CALL ScTabViewObj::getElementType() throw(uno::RuntimeException, std::exception) +uno::Type SAL_CALL ScTabViewObj::getElementType() { SolarMutexGuard aGuard; return cppu::UnoType<sheet::XViewPane>::get(); } -sal_Bool SAL_CALL ScTabViewObj::hasElements() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTabViewObj::hasElements() { SolarMutexGuard aGuard; return ( getCount() != 0 ); @@ -1070,7 +1054,6 @@ ScViewPaneObj* ScTabViewObj::GetObjectByIndex_Impl(sal_uInt16 nIndex) const } uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1085,7 +1068,6 @@ uno::Reference<sheet::XSpreadsheet> SAL_CALL ScTabViewObj::getActiveSheet() // support expand (but not replace) the active sheet void SAL_CALL ScTabViewObj::setActiveSheet( const uno::Reference<sheet::XSpreadsheet>& xActiveSheet ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1177,7 +1159,6 @@ bool ScTabViewObj::IsMouseListening() const } bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) - throw (::uno::RuntimeException) { bool bReturn(false); if ( e.Buttons == css::awt::MouseButton::LEFT ) @@ -1271,7 +1252,6 @@ bool ScTabViewObj::MousePressed( const awt::MouseEvent& e ) } bool ScTabViewObj::MouseReleased( const awt::MouseEvent& e ) - throw (uno::RuntimeException) { if ( e.Buttons == css::awt::MouseButton::LEFT ) { @@ -1366,7 +1346,6 @@ void ScTabViewObj::EndActivationListening() } void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference< awt::XEnhancedMouseClickHandler >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1377,7 +1356,6 @@ void SAL_CALL ScTabViewObj::addEnhancedMouseClickHandler( const uno::Reference< } void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Reference< awt::XEnhancedMouseClickHandler >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = aMouseClickHandlers.size(); @@ -1395,7 +1373,6 @@ void SAL_CALL ScTabViewObj::removeEnhancedMouseClickHandler( const uno::Referenc // XActivationBroadcaster void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sheet::XActivationEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1406,7 +1383,6 @@ void SAL_CALL ScTabViewObj::addActivationEventListener( const uno::Reference< sh } void SAL_CALL ScTabViewObj::removeActivationEventListener( const uno::Reference< sheet::XActivationEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; sal_uInt16 nCount = aActivationListeners.size(); @@ -1541,7 +1517,7 @@ void ScTabViewObj::SetZoomType(sal_Int16 aZoomType) } } -sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() { SolarMutexGuard aGuard; // wie Menue-Slot SID_WINDOW_SPLIT @@ -1557,7 +1533,7 @@ sal_Bool SAL_CALL ScTabViewObj::getIsWindowSplit() throw(uno::RuntimeException, return false; } -sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() { SolarMutexGuard aGuard; // wie Menue-Slot SID_WINDOW_FIX @@ -1573,7 +1549,7 @@ sal_Bool SAL_CALL ScTabViewObj::hasFrozenPanes() throw(uno::RuntimeException, st return false; } -sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1586,7 +1562,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitHorizontal() throw(uno::RuntimeExceptio return 0; } -sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1600,7 +1576,6 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitVertical() throw(uno::RuntimeException, } sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1625,7 +1600,7 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitColumn() return 0; } -sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1648,7 +1623,6 @@ sal_Int32 SAL_CALL ScTabViewObj::getSplitRow() throw(uno::RuntimeException, std: } void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixelY ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1661,7 +1635,6 @@ void SAL_CALL ScTabViewObj::splitAtPosition( sal_Int32 nPixelX, sal_Int32 nPixel } void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRows ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -1688,7 +1661,6 @@ void SAL_CALL ScTabViewObj::freezeAtPosition( sal_Int32 nColumns, sal_Int32 nRow void SAL_CALL ScTabViewObj::addSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener>& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aSelectionChgListeners.push_back( xListener ); @@ -1696,7 +1668,6 @@ void SAL_CALL ScTabViewObj::addSelectionChangeListener( void SAL_CALL ScTabViewObj::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener >& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; for (XSelectionChangeListenerVector::iterator it = aSelectionChgListeners.begin(); @@ -1770,7 +1741,6 @@ void ScTabViewObj::SelectionChanged() //! auch an der Applikation anbieten? uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; static uno::Reference<beans::XPropertySetInfo> aRef( @@ -1780,9 +1750,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScTabViewObj::getPropertySetInf void SAL_CALL ScTabViewObj::setPropertyValue( const OUString& aPropertyName, const uno::Any& aValue ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1903,8 +1870,6 @@ void SAL_CALL ScTabViewObj::setPropertyValue( } uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Any aRet; @@ -1963,10 +1928,6 @@ uno::Any SAL_CALL ScTabViewObj::getPropertyValue( const OUString& aPropertyName void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; aPropertyChgListeners.push_back( xListener ); @@ -1974,9 +1935,6 @@ void SAL_CALL ScTabViewObj::addPropertyChangeListener( const OUString& /* aPrope void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference<beans::XPropertyChangeListener >& xListener ) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; for (XViewPropertyChangeListenerVector::iterator it = aPropertyChgListeners.begin(); @@ -1992,17 +1950,11 @@ void SAL_CALL ScTabViewObj::removePropertyChangeListener( const OUString& /* aPr void SAL_CALL ScTabViewObj::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ ) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } void SAL_CALL ScTabViewObj::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference<beans::XVetoableChangeListener >& /* aListener */ ) - throw(beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { } @@ -2018,7 +1970,6 @@ void ScTabViewObj::VisAreaChanged() void SAL_CALL ScTabViewObj::startRangeSelection( const uno::Sequence<beans::PropertyValue>& aArguments ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -2059,7 +2010,7 @@ void SAL_CALL ScTabViewObj::startRangeSelection( } } -void SAL_CALL ScTabViewObj::abortRangeSelection() throw(uno::RuntimeException, std::exception) +void SAL_CALL ScTabViewObj::abortRangeSelection() { SolarMutexGuard aGuard; ScTabViewShell* pViewSh = GetViewShell(); @@ -2069,7 +2020,6 @@ void SAL_CALL ScTabViewObj::abortRangeSelection() throw(uno::RuntimeException, s void SAL_CALL ScTabViewObj::addRangeSelectionListener( const uno::Reference<sheet::XRangeSelectionListener>& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRangeSelListeners.push_back( xListener ); @@ -2077,7 +2027,6 @@ void SAL_CALL ScTabViewObj::addRangeSelectionListener( void SAL_CALL ScTabViewObj::removeRangeSelectionListener( const uno::Reference<sheet::XRangeSelectionListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; for (XRangeSelectionListenerVector::iterator it = aRangeSelListeners.begin(); @@ -2093,7 +2042,6 @@ void SAL_CALL ScTabViewObj::removeRangeSelectionListener( void SAL_CALL ScTabViewObj::addRangeSelectionChangeListener( const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; aRangeChgListeners.push_back( xListener ); @@ -2101,7 +2049,6 @@ void SAL_CALL ScTabViewObj::addRangeSelectionChangeListener( void SAL_CALL ScTabViewObj::removeRangeSelectionChangeListener( const uno::Reference<sheet::XRangeSelectionChangeListener>& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; for (XRangeSelectionChangeListenerVector::iterator it = aRangeChgListeners.begin(); @@ -2155,19 +2102,17 @@ void ScTabViewObj::RangeSelChanged( const OUString& rText ) } // XServiceInfo -OUString SAL_CALL ScTabViewObj::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ScTabViewObj::getImplementationName() { return OUString( "ScTabViewObj" ); } sal_Bool SAL_CALL ScTabViewObj::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return {SCTABVIEWOBJ_SERVICE, SCVIEWSETTINGS_SERVICE}; } @@ -2175,7 +2120,7 @@ uno::Sequence<OUString> SAL_CALL ScTabViewObj::getSupportedServiceNames() // XUnoTunnel sal_Int64 SAL_CALL ScTabViewObj::getSomething( - const uno::Sequence<sal_Int8 >& rId ) throw(uno::RuntimeException, std::exception) + const uno::Sequence<sal_Int8 >& rId ) { if ( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), @@ -2206,8 +2151,6 @@ ScTabViewObj* ScTabViewObj::getImplementation(const uno::Reference<uno::XInterfa } css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL ScTabViewObj::getTransferable() - throw (css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScEditShell* pShell = dynamic_cast<ScEditShell*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); @@ -2234,9 +2177,6 @@ css::uno::Reference< css::datatransfer::XTransferable > SAL_CALL ScTabViewObj::g } void SAL_CALL ScTabViewObj::insertTransferable( const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) - throw (css::datatransfer::UnsupportedFlavorException, - css::uno::RuntimeException, - std::exception) { SolarMutexGuard aGuard; ScEditShell* pShell = dynamic_cast<ScEditShell*>( GetViewShell()->GetViewFrame()->GetDispatcher()->GetShell(0) ); @@ -2276,7 +2216,6 @@ uno::Sequence<sal_Int32> toSequence(const ScMarkData::MarkedTabsType& rSelected) } uno::Sequence<sal_Int32> ScTabViewObj::getSelectedSheets() - throw (uno::RuntimeException, std::exception) { ScTabViewShell* pViewSh = GetViewShell(); if (!pViewSh) @@ -2312,7 +2251,6 @@ ScPreviewObj::~ScPreviewObj() } uno::Any ScPreviewObj::queryInterface(const uno::Type& rType) - throw(uno::RuntimeException, std::exception) { SC_QUERYINTERFACE(sheet::XSelectedSheetsSupplier) return SfxBaseController::queryInterface(rType); @@ -2335,7 +2273,6 @@ void ScPreviewObj::Notify(SfxBroadcaster&, const SfxHint& rHint) } uno::Sequence<sal_Int32> ScPreviewObj::getSelectedSheets() - throw (uno::RuntimeException, std::exception) { ScPreview* p = mpViewShell ? mpViewShell->GetPreview() : nullptr; if (!p) |