From e57ca02849c3d87142ff5ff9099a212e72b8139c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jan 2017 12:28:58 +0100 Subject: Remove dynamic exception specifications ...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at "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 Reviewed-by: Stephan Bergmann --- chart2/source/tools/CachedDataSequence.cxx | 16 +-- chart2/source/tools/ConfigColorScheme.cxx | 4 - chart2/source/tools/DataSource.cxx | 5 - chart2/source/tools/ErrorBar.cxx | 22 ---- .../tools/ExponentialRegressionCurveCalculator.cxx | 5 - chart2/source/tools/InternalDataProvider.cxx | 61 ++--------- chart2/source/tools/LabeledDataSequence.cxx | 10 -- chart2/source/tools/LifeTime.cxx | 4 - .../tools/LinearRegressionCurveCalculator.cxx | 3 - .../tools/LogarithmicRegressionCurveCalculator.cxx | 5 - .../tools/MeanValueRegressionCurveCalculator.cxx | 5 - chart2/source/tools/ModifyListenerHelper.cxx | 4 - .../MovingAverageRegressionCurveCalculator.cxx | 5 - chart2/source/tools/NameContainer.cxx | 12 --- chart2/source/tools/OPropertySet.cxx | 31 ------ .../tools/PolynomialRegressionCurveCalculator.cxx | 3 - .../tools/PotentialRegressionCurveCalculator.cxx | 5 - chart2/source/tools/RangeHighlighter.cxx | 5 - chart2/source/tools/RegressionCurveCalculator.cxx | 6 -- chart2/source/tools/RegressionCurveModel.cxx | 38 ------- chart2/source/tools/RegressionCurveModel.hxx | 114 +++++++-------------- chart2/source/tools/RegressionEquation.cxx | 12 --- chart2/source/tools/RegressionEquation.hxx | 31 ++---- chart2/source/tools/Scaling.cxx | 24 ----- chart2/source/tools/UncachedDataSequence.cxx | 29 ------ chart2/source/tools/WeakListenerAdapter.cxx | 2 - chart2/source/tools/WrappedDefaultProperty.cxx | 7 -- chart2/source/tools/WrappedDirectStateProperty.cxx | 2 - chart2/source/tools/WrappedIgnoreProperty.cxx | 5 - chart2/source/tools/WrappedProperty.cxx | 5 - chart2/source/tools/WrappedPropertySet.cxx | 19 ---- 31 files changed, 59 insertions(+), 440 deletions(-) (limited to 'chart2/source/tools') diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 14792358c3b1..c702a1ab2489 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -226,7 +226,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( CachedDataSequence, CachedDataSequence_Base, O // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -248,19 +247,16 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet } OUString SAL_CALL CachedDataSequence::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL CachedDataSequence::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, @@ -272,7 +268,6 @@ css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceN // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -284,7 +279,6 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -296,34 +290,28 @@ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL CachedDataSequence::getData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return Impl_getMixedData(); } OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException, std::exception) { return m_sRole; } Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::LabelOrigin /*eLabelOrigin*/ ) - throw (uno::RuntimeException, std::exception) { // return empty label, as we have no range representaions to determine something useful return Sequence< OUString >(); } ::sal_Int32 SAL_CALL CachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 /*nIndex*/ ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { return 0; } Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() - throw (uno::RuntimeException, std::exception) { CachedDataSequence * pNewSeq = new CachedDataSequence( *this ); @@ -331,7 +319,6 @@ Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() } void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -345,7 +332,6 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod } void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -359,7 +345,7 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X } // lang::XInitialization: -void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) +void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) { ::comphelper::SequenceAsHashMap aMap(_aArguments); m_aNumericalSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aNumericalSequence); diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index e1b842dda7ac..2926cc0eabf2 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -139,7 +139,6 @@ void ConfigColorScheme::retrieveConfigColors() // ____ XColorScheme ____ ::sal_Int32 SAL_CALL ConfigColorScheme::getColorByIndex( ::sal_Int32 nIndex ) - throw (uno::RuntimeException, std::exception) { if( m_bNeedsUpdate ) retrieveConfigColors(); @@ -166,19 +165,16 @@ void ConfigColorScheme::notify( const OUString & rPropertyName ) } OUString SAL_CALL ConfigColorScheme::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ; } sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.ColorScheme" }; } diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 16c18ddb8e2b..dc1122e6eca2 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -45,32 +45,27 @@ DataSource::~DataSource() // ____ XDataSource ____ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSource::getDataSequences() - throw (uno::RuntimeException, std::exception) { return m_aDataSeq; } // ____ XDataSink ____ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException, std::exception) { m_aDataSeq = aData; } OUString SAL_CALL DataSource::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataSource"); } sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.data.DataSource" }; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index aa4573df29df..d717d09dca98 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -129,14 +129,12 @@ ErrorBar::~ErrorBar() {} uno::Reference< util::XCloneable > SAL_CALL ErrorBar::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ErrorBar( *this )); } // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ErrorBar::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > aRef ( new SfxItemPropertySetInfo( GetErrorBarPropertySet()->getPropertyMap() ) ); @@ -144,8 +142,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ErrorBar::getPropertySetInfo( } void ErrorBar::setPropertyValue( const OUString& rPropName, const uno::Any& rAny ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -228,7 +224,6 @@ OUString getSourceRangeStrFromLabeledSequences( const uno::Sequence< uno::Refere } uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -293,7 +288,6 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) } beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) - throw (css::beans::UnknownPropertyException, std::exception) { if(rPropName == "ErrorBarStyle") { @@ -364,7 +358,6 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) } uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Sequence< OUString >& rPropNames ) - throw (css::beans::UnknownPropertyException, std::exception) { uno::Sequence< beans::PropertyState > aRet( rPropNames.getLength() ); for(sal_Int32 i = 0; i < rPropNames.getLength(); ++i) @@ -375,41 +368,34 @@ uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Se } void ErrorBar::setPropertyToDefault( const OUString& ) - throw (beans::UnknownPropertyException, std::exception) { //keep them unimplemented for now } uno::Any ErrorBar::getPropertyDefault( const OUString& ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) { //keep them unimplemented for now return uno::Any(); } void ErrorBar::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } void ErrorBar::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } void ErrorBar::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } void ErrorBar::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } // ____ XModifyBroadcaster ____ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -423,7 +409,6 @@ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyLi } void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -438,21 +423,18 @@ void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModif // ____ XModifyListener ____ void SAL_CALL ErrorBar::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ErrorBar::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } // ____ XDataSink ____ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException, std::exception) { ModifyListenerHelper::removeListenerFromAllElements( m_aDataSequences, m_xModifyEventForwarder ); EventListenerHelper::removeListenerFromAllElements( m_aDataSequences, this ); @@ -463,25 +445,21 @@ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::da // ____ XDataSource ____ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ErrorBar::getDataSequences() - throw (uno::RuntimeException, std::exception) { return comphelper::containerToSequence( m_aDataSequences ); } OUString SAL_CALL ErrorBar::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL ErrorBar::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ErrorBar::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index d620576d3e30..b1439867a449 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -46,7 +46,6 @@ ExponentialRegressionCurveCalculator::~ExponentialRegressionCurveCalculator() void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -113,8 +112,6 @@ void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( } double SAL_CALL ExponentialRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -133,8 +130,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 9f5f3187fd36..f14810a9e64b 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -653,7 +653,6 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::createDataSequenc // ____ XDataProvider ____ sal_Bool SAL_CALL InternalDataProvider::createDataSourcePossible( const Sequence< beans::PropertyValue >& /* aArguments */ ) - throw (uno::RuntimeException, std::exception) { return true; } @@ -678,8 +677,6 @@ sal_Int32 lcl_getInnerLevelCount( const vector< vector< uno::Any > >& rLabels ) Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createDataSource( const Sequence< beans::PropertyValue >& aArguments ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { OUString aRangeRepresentation; bool bUseColumns = true; @@ -769,7 +766,6 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( const Reference< chart2::data::XDataSource >& /* xDataSource */ ) - throw (uno::RuntimeException, std::exception) { Sequence< beans::PropertyValue > aArguments( 4 ); aArguments[0] = beans::PropertyValue( @@ -794,15 +790,12 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( } sal_Bool SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& /* aRangeRepresentation */ ) - throw (uno::RuntimeException, std::exception) { return true; } Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( aRangeRepresentation.match( lcl_aCategoriesRangeName )) { @@ -836,13 +829,11 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa Reference SAL_CALL InternalDataProvider::createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return createDataSequenceFromArray(aRangeRepresentation, aRole); } Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelection() - throw (uno::RuntimeException, std::exception) { // there is no range selection component return Reference< sheet::XRangeSelection >(); @@ -850,7 +841,6 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec // ____ XInternalDataProvider ____ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -874,7 +864,6 @@ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUSt } Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException, std::exception) { Sequence< uno::Any > aResult; @@ -948,7 +937,6 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( const OUString& aRange, const Sequence< uno::Any >& aNewData ) - throw (uno::RuntimeException, std::exception) { vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) ); if( aRange.match( lcl_aLabelRangePrefix ) ) @@ -1014,7 +1002,6 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( } void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) { @@ -1029,7 +1016,6 @@ void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) } void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException, std::exception) { deleteMapReferences( OUString::number( nAtIndex )); deleteMapReferences( lcl_aLabelRangePrefix + OUString::number( nAtIndex )); @@ -1046,7 +1032,6 @@ void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) } void SAL_CALL InternalDataProvider::appendSequence() - throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.appendColumn(); @@ -1055,7 +1040,6 @@ void SAL_CALL InternalDataProvider::appendSequence() } void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel ) - throw (uno::RuntimeException, std::exception) { OSL_ENSURE( nLevel> 0, "you can only insert category levels > 0" );//the first categories level cannot be deleted, check the calling code for error if( nLevel>0 ) @@ -1072,7 +1056,6 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel } } void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel ) - throw (uno::RuntimeException, std::exception) { OSL_ENSURE( nLevel>0, "you can only delete category levels > 0" );//the first categories level cannot be deleted, check the calling code for error if( nLevel>0 ) @@ -1090,7 +1073,6 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel } void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1114,7 +1096,6 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1138,7 +1119,6 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.swapRowWithNext( nAtIndex ); @@ -1158,7 +1138,6 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s } void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq ) - throw (uno::RuntimeException, std::exception) { if( xSeq.is()) addDataSequenceToMap( xSeq->getSourceRangeRepresentation(), xSeq ); @@ -1166,8 +1145,6 @@ void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Refere // ____ XRangeXMLConversion ____ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange; aRange.aTableName = "local-table"; @@ -1244,8 +1221,6 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang } OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXMLRange ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange( XMLRangeHelper::getCellRangeFromXMLString( aXMLRange )); if( aRange.aUpperLeft.bIsEmpty ) @@ -1372,7 +1347,7 @@ uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStr }//anonymous namespace // ____ XDateCategories ____ -Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException, std::exception) +Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() { double fNan = InternalDataProvider::getNotANumber(); double fValue = fNan; @@ -1390,7 +1365,7 @@ Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno return aDoubles; } -void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) { sal_Int32 nCount = rDates.getLength(); vector< vector< uno::Any > > aNewCategories; @@ -1410,56 +1385,53 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& } // ____ XAnyDescriptionAccess ____ -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexRowLabels() ); } -void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) { m_aInternalData.setComplexRowLabels( lcl_convertSequenceSequenceToVectorVector( aRowDescriptions ) ); } -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexColumnLabels() ); } -void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) { m_aInternalData.setComplexColumnLabels( lcl_convertSequenceSequenceToVectorVector( aColumnDescriptions ) ); } // ____ XComplexDescriptionAccess ____ -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() { return comphelper::containerToSequence(lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() )); } -void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) { m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) ); } -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() { return comphelper::containerToSequence(lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() )); } -void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) { m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) ); } // ____ XChartDataArray ____ Sequence< Sequence< double > > SAL_CALL InternalDataProvider::getData() - throw (uno::RuntimeException, std::exception) { return m_aInternalData.getData(); } void SAL_CALL InternalDataProvider::setData( const Sequence< Sequence< double > >& rDataInRows ) - throw (uno::RuntimeException, std::exception) { return m_aInternalData.setData( rDataInRows ); } void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString >& aRowDescriptions ) - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aRowDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aRowDescriptions.getConstArray(), @@ -1468,7 +1440,6 @@ void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString } void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUString >& aColumnDescriptions ) - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aColumnDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aColumnDescriptions.getConstArray(), @@ -1477,7 +1448,6 @@ void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUStr } Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexRowLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1485,7 +1455,6 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() } Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexColumnLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1495,18 +1464,15 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL InternalDataProvider::addChartDataChangeEventListener( const Reference< css::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL InternalDataProvider::removeChartDataChangeEventListener( const Reference< css::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException, std::exception) { } double SAL_CALL InternalDataProvider::getNotANumber() - throw (uno::RuntimeException, std::exception) { double fNan; ::rtl::math::setNan( & fNan ); @@ -1514,13 +1480,12 @@ double SAL_CALL InternalDataProvider::getNotANumber() } sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber ) - throw (uno::RuntimeException, std::exception) { return ::rtl::math::isNan( nNumber ) || ::rtl::math::isInf( nNumber ); } // lang::XInitialization: -void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) +void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) { comphelper::SequenceAsHashMap aArgs(_aArguments); if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData", false ) ) @@ -1529,26 +1494,22 @@ void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() - throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new InternalDataProvider( *this )); } OUString SAL_CALL InternalDataProvider::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { // note: in xmloff this name is used to indicate usage of own data return OUString("com.sun.star.comp.chart.InternalDataProvider"); } sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.data.DataProvider" }; } diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index d5c45694d9c6..279db333e066 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -66,14 +66,12 @@ LabeledDataSequence::~LabeledDataSequence() // ____ XLabeledDataSequence ____ uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getValues() - throw (uno::RuntimeException, std::exception) { return m_xData; } void SAL_CALL LabeledDataSequence::setValues( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException, std::exception) { if( m_xData != xSequence ) { @@ -84,14 +82,12 @@ void SAL_CALL LabeledDataSequence::setValues( } uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getLabel() - throw (uno::RuntimeException, std::exception) { return m_xLabel; } void SAL_CALL LabeledDataSequence::setLabel( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException, std::exception) { if( m_xLabel != xSequence ) { @@ -103,7 +99,6 @@ void SAL_CALL LabeledDataSequence::setLabel( // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() - throw (uno::RuntimeException, std::exception) { uno::Reference< chart2::data::XDataSequence > xNewValues( m_xData ); uno::Reference< chart2::data::XDataSequence > xNewLabel( m_xLabel ); @@ -122,7 +117,6 @@ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -136,7 +130,6 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo } void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -150,19 +143,16 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: } OUString SAL_CALL LabeledDataSequence::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.LabeledDataSequence"); } sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.data.LabeledDataSequence" }; } diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 2dbb9ba7ece2..b04f0a82a548 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -110,7 +110,6 @@ void LifeTimeManager::impl_unregisterApiCall(bool bLongLastingCall) } bool LifeTimeManager::dispose() - throw(uno::RuntimeException) { //hold no mutex { @@ -190,7 +189,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) } bool CloseableLifeTimeManager::g_close_startTryClose(bool bDeliverOwnership) - throw ( uno::Exception ) { //no mutex is allowed to be acquired { @@ -263,7 +261,6 @@ void CloseableLifeTimeManager::g_close_endTryClose(bool bDeliverOwnership, bool } bool CloseableLifeTimeManager::g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, util::CloseVetoException& ex ) - throw ( util::CloseVetoException ) { //this method is called when no closelistener has had a veto during queryclosing //the method returns false, if nothing stands against closing anymore @@ -369,7 +366,6 @@ void CloseableLifeTimeManager::impl_doClose() } void CloseableLifeTimeManager::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) - throw(uno::RuntimeException) { osl::Guard< osl::Mutex > aGuard( m_aAccessMutex ); //Mutex needs to be acquired exactly ones; will be released inbetween diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 05f6aefe66a1..7c6e5240d14e 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -41,7 +41,6 @@ void LinearRegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException, std::exception) { PolynomialRegressionCurveCalculator::setRegressionProperties( 1, @@ -55,8 +54,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LinearRegressionCurveCalculator: const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index c50a8c361b24..a69d68ea4137 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -45,7 +45,6 @@ LogarithmicRegressionCurveCalculator::~LogarithmicRegressionCurveCalculator() void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -90,8 +89,6 @@ void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( } double SAL_CALL LogarithmicRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -110,8 +107,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LogarithmicRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 3835a46ccbef..592a2014e340 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -43,7 +43,6 @@ MeanValueRegressionCurveCalculator::~MeanValueRegressionCurveCalculator() void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& /*aXValues*/, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { const sal_Int32 nDataLength = aYValues.getLength(); sal_Int32 nMax = nDataLength; @@ -89,8 +88,6 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( } double SAL_CALL MeanValueRegressionCurveCalculator::getCurveValue( double /*x*/ ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { return m_fMeanValue; } @@ -100,8 +97,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MeanValueRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation ) { diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 7b4c26156e11..44fd89e248e8 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -157,27 +157,23 @@ void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSou // ____ XModifyBroadcaster ____ void SAL_CALL ModifyEventForwarder::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { AddListener( aListener ); } void SAL_CALL ModifyEventForwarder::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { RemoveListener( aListener ); } // ____ XModifyListener ____ void SAL_CALL ModifyEventForwarder::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { lcl_fireModifyEvent( m_aModifyListeners, Reference< uno::XWeak >(), &aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ModifyEventForwarder::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index dac1616b7ab7..85406c9d62d4 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -41,7 +41,6 @@ MovingAverageRegressionCurveCalculator::~MovingAverageRegressionCurveCalculator( void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { ::rtl::math::setNan( & m_fCorrelationCoeffitient ); @@ -73,8 +72,6 @@ void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( } double SAL_CALL MovingAverageRegressionCurveCalculator::getCurveValue( double /*x*/ ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); @@ -86,8 +83,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MovingAverageRegressionCurveCalc const uno::Reference< chart2::XScaling >& /*xScalingX*/, const uno::Reference< chart2::XScaling >& /*xScalingY*/, sal_Bool /*bMaySkipPointsInCalculation*/ ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { uno::Sequence< geometry::RealPoint2D > aResult( aYList.size() ); diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index ab2d48ec636b..58e9296a678b 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -59,26 +59,22 @@ NameContainer::~NameContainer() //XServiceInfo OUString SAL_CALL NameContainer::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return m_aImplementationName; } sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { m_aServicename }; } // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( m_aMap.find( rName ) != m_aMap.end() ) throw container::ElementExistException(); @@ -86,7 +82,6 @@ void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rEl } void SAL_CALL NameContainer::removeByName( const OUString& Name ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { tContentMap::iterator aIt( m_aMap.find( Name )); if( aIt == m_aMap.end()) @@ -96,7 +91,6 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL NameContainer::replaceByName( const OUString& rName, const Any& rElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { tContentMap::iterator aIt( m_aMap.find( rName )); if( aIt == m_aMap.end() ) @@ -106,7 +100,6 @@ void SAL_CALL NameContainer::replaceByName( const OUString& rName, const Any& rE // XNameAccess Any SAL_CALL NameContainer::getByName( const OUString& rName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { tContentMap::iterator aIter( m_aMap.find( rName ) ); if( aIter == m_aMap.end() ) @@ -115,7 +108,6 @@ Any SAL_CALL NameContainer::getByName( const OUString& rName ) } Sequence< OUString > SAL_CALL NameContainer::getElementNames() - throw( uno::RuntimeException, std::exception ) { sal_Int32 nCount = m_aMap.size(); Sequence< OUString > aSeq(nCount); @@ -126,27 +118,23 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames() } sal_Bool SAL_CALL NameContainer::hasByName( const OUString& rName ) - throw( uno::RuntimeException, std::exception ) { return ( m_aMap.find( rName ) != m_aMap.end() ); } // XElementAccess sal_Bool SAL_CALL NameContainer::hasElements() - throw( uno::RuntimeException, std::exception ) { return ! m_aMap.empty(); } uno::Type SAL_CALL NameContainer::getElementType() - throw( uno::RuntimeException, std::exception ) { return m_aType; } // XCloneable uno::Reference< util::XCloneable > SAL_CALL NameContainer::createClone() - throw ( uno::RuntimeException, std::exception ) { return uno::Reference< util::XCloneable >( new NameContainer( *this )); } diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index 0dcf03c0da1a..30a08c1ad283 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -70,7 +70,6 @@ OPropertySet::~OPropertySet() {} Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { return ::cppu::queryInterface( aType, @@ -86,7 +85,6 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) // ____ XTypeProvider ____ Sequence< uno::Type > SAL_CALL OPropertySet::getTypes() - throw (uno::RuntimeException, std::exception) { static const Sequence< uno::Type > aTypeList{ cppu::UnoType::get(), @@ -102,7 +100,6 @@ Sequence< uno::Type > SAL_CALL Sequence< sal_Int8 > SAL_CALL OPropertySet::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence(); } @@ -110,8 +107,6 @@ Sequence< sal_Int8 > SAL_CALL // ____ XPropertyState ____ beans::PropertyState SAL_CALL OPropertySet::getPropertyState( const OUString& PropertyName ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -121,8 +116,6 @@ beans::PropertyState SAL_CALL Sequence< beans::PropertyState > SAL_CALL OPropertySet::getPropertyStates( const Sequence< OUString >& aPropertyName ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -137,8 +130,6 @@ Sequence< beans::PropertyState > SAL_CALL void SAL_CALL OPropertySet::setPropertyToDefault( const OUString& PropertyName ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -148,9 +139,6 @@ void SAL_CALL Any SAL_CALL OPropertySet::getPropertyDefault( const OUString& aPropertyName ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -164,7 +152,6 @@ Any SAL_CALL void SAL_CALL OPropertySet::setAllPropertiesToDefault() - throw (uno::RuntimeException, std::exception) { m_pImplProperties->SetAllPropertiesToDefault(); firePropertyChangeEvent(); @@ -172,8 +159,6 @@ void SAL_CALL void SAL_CALL OPropertySet::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -188,9 +173,6 @@ void SAL_CALL Sequence< Any > SAL_CALL OPropertySet::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { ::cppu::IPropertyArrayHelper & rPH = getInfoHelper(); const sal_Int32 nElements = aPropertyNames.getLength(); @@ -213,7 +195,6 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (lang::IllegalArgumentException) { getFastPropertyValue( rOldValue, nHandle ); //accept longs also for short values @@ -245,7 +226,6 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const Any& rValue ) - throw (uno::Exception, std::exception) { #if OSL_DEBUG_LEVEL > 0 if( rValue.hasValue()) @@ -359,14 +339,11 @@ void OPropertySet::firePropertyChangeEvent() // ____ XStyleSupplier ____ Reference< style::XStyle > SAL_CALL OPropertySet::getStyle() - throw (uno::RuntimeException, std::exception) { return m_pImplProperties->GetStyle(); } void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( ! m_pImplProperties->SetStyle( xStyle )) throw lang::IllegalArgumentException( @@ -378,10 +355,6 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) // ____ XMultiPropertySet ____ void SAL_CALL OPropertySet::setPropertyValues( const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values ) - throw(beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { ::cppu::OPropertySetHelper::setPropertyValues( PropertyNames, Values ); @@ -390,10 +363,6 @@ void SAL_CALL OPropertySet::setPropertyValues( // ____ XFastPropertySet ____ void SAL_CALL OPropertySet::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) - throw(beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::cppu::OPropertySetHelper::setFastPropertyValue( nHandle, rValue ); diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx index ef3ba7eb3014..2846dbecba09 100644 --- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx @@ -42,7 +42,6 @@ PolynomialRegressionCurveCalculator::~PolynomialRegressionCurveCalculator() void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { rtl::math::setNan(&m_fCorrelationCoeffitient); @@ -199,8 +198,6 @@ void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( } double SAL_CALL PolynomialRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 512b3736cfaa..90a542af26d9 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -46,7 +46,6 @@ PotentialRegressionCurveCalculator::~PotentialRegressionCurveCalculator() void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -102,8 +101,6 @@ void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( } double SAL_CALL PotentialRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -122,8 +119,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PotentialRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 6bc788ec8b9e..13c107a6d2b2 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -75,7 +75,6 @@ RangeHighlighter::~RangeHighlighter() // ____ XRangeHighlighter ____ Sequence< chart2::data::HighlightedRange > SAL_CALL RangeHighlighter::getSelectedRanges() - throw (uno::RuntimeException, std::exception) { return m_aSelectedRanges; } @@ -299,7 +298,6 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface } void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if(!xListener.is()) return; @@ -315,7 +313,6 @@ void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< vie } void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType::get(), xListener ); --m_nAddedListenerCount; @@ -325,7 +322,6 @@ void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< // ____ XSelectionChangeListener ____ void SAL_CALL RangeHighlighter::selectionChanged( const lang::EventObject& /*aEvent*/ ) - throw (uno::RuntimeException, std::exception) { determineRanges(); @@ -352,7 +348,6 @@ void RangeHighlighter::fireSelectionEvent() } void SAL_CALL RangeHighlighter::disposing( const lang::EventObject& Source ) - throw (uno::RuntimeException, std::exception) { if( Source.Source == m_xSelectionSupplier ) { diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 429eeb002121..5174b3d79ffc 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -77,7 +77,6 @@ void RegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException, std::exception) { mDegree = aDegree; mForceIntercept = aForceIntercept; @@ -136,7 +135,6 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa const Reference< chart2::XScaling >& xScalingX, const Reference< chart2::XScaling >& /* xScalingY */, sal_Bool /* bMaySkipPointsInCalculation */ ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if( nPointCount < 2 ) throw lang::IllegalArgumentException(); @@ -172,13 +170,11 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa } double SAL_CALL RegressionCurveCalculator::getCorrelationCoefficient() - throw (uno::RuntimeException, std::exception) { return m_fCorrelationCoeffitient; } OUString SAL_CALL RegressionCurveCalculator::getRepresentation() - throw (uno::RuntimeException, std::exception) { return ImplGetRepresentation( Reference< util::XNumberFormatter >(), 0 ); } @@ -186,7 +182,6 @@ OUString SAL_CALL RegressionCurveCalculator::getRepresentation() OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation( const Reference< util::XNumberFormatsSupplier > & xNumFmtSupplier, sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) -throw (uno::RuntimeException, std::exception) { // create and prepare a number formatter if( !xNumFmtSupplier.is()) @@ -213,7 +208,6 @@ void RegressionCurveCalculator::addStringToEquation( } void SAL_CALL RegressionCurveCalculator::setXYNames( const OUString& aXName, const OUString& aYName ) - throw (uno::RuntimeException, std::exception) { if ( aXName.isEmpty() ) mXName = OUString ("x"); diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index bce0d5064e1f..bbfa82b2e689 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -206,19 +206,16 @@ RegressionCurveModel::~RegressionCurveModel() // ____ XRegressionCurve ____ uno::Reference< chart2::XRegressionCurveCalculator > SAL_CALL RegressionCurveModel::getCalculator() - throw (uno::RuntimeException, std::exception) { return RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( getServiceName()); } uno::Reference< beans::XPropertySet > SAL_CALL RegressionCurveModel::getEquationProperties() - throw (uno::RuntimeException, std::exception) { return m_xEquationProperties; } void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< beans::XPropertySet >& xEquationProperties ) - throw (uno::RuntimeException, std::exception) { if( xEquationProperties.is()) { @@ -233,7 +230,6 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< // ____ XServiceName ____ OUString SAL_CALL RegressionCurveModel::getServiceName() - throw (uno::RuntimeException, std::exception) { switch( m_eRegressionCurveType ) { @@ -258,7 +254,6 @@ OUString SAL_CALL RegressionCurveModel::getServiceName() // ____ XModifyBroadcaster ____ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -272,7 +267,6 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti } void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -287,14 +281,12 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< // ____ XModifyListener ____ void SAL_CALL RegressionCurveModel::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL RegressionCurveModel::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -312,7 +304,6 @@ void RegressionCurveModel::fireModifyEvent() // ____ OPropertySet ____ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticXXXDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -328,7 +319,6 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL RegressionCurveModel::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticRegressionCurveInfo::get(); } @@ -352,25 +342,21 @@ MeanValueRegressionCurve::~MeanValueRegressionCurve() {} OUString SAL_CALL MeanValueRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_MeanValue; } sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL MeanValueRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.MeanValueRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new MeanValueRegressionCurve( *this )); } @@ -386,25 +372,21 @@ LinearRegressionCurve::~LinearRegressionCurve() {} OUString SAL_CALL LinearRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Linear; } sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LinearRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.LinearRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LinearRegressionCurve( *this )); } @@ -420,25 +402,21 @@ LogarithmicRegressionCurve::~LogarithmicRegressionCurve() {} OUString SAL_CALL LogarithmicRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Logarithmic; } sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LogarithmicRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.LogarithmicRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LogarithmicRegressionCurve( *this )); } @@ -454,25 +432,21 @@ ExponentialRegressionCurve::~ExponentialRegressionCurve() {} OUString SAL_CALL ExponentialRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Exponential; } sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ExponentialRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.ExponentialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ExponentialRegressionCurve( *this )); } @@ -488,25 +462,21 @@ PotentialRegressionCurve::~PotentialRegressionCurve() {} OUString SAL_CALL PotentialRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Potential; } sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PotentialRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.PotentialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PotentialRegressionCurve( *this )); } @@ -522,25 +492,21 @@ PolynomialRegressionCurve::~PolynomialRegressionCurve() {} OUString SAL_CALL PolynomialRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Polynomial; } sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PolynomialRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.PolynomialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PolynomialRegressionCurve( *this )); } @@ -556,25 +522,21 @@ MovingAverageRegressionCurve::~MovingAverageRegressionCurve() {} OUString SAL_CALL MovingAverageRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_MovingAverage; } sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL MovingAverageRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.MovingAverageRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new MovingAverageRegressionCurve( *this )); } diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 4e7191a04177..3f9b6cbb46f5 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -76,47 +76,37 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XRegressionCurve ____ - virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties() override; virtual void SAL_CALL setEquationProperties( - const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties ) override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; using ::cppu::OPropertySetHelper::disposing; @@ -143,16 +133,12 @@ public: virtual ~MeanValueRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - 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; }; class LinearRegressionCurve : public RegressionCurveModel @@ -163,16 +149,12 @@ public: virtual ~LinearRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - 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; }; class LogarithmicRegressionCurve : public RegressionCurveModel @@ -183,16 +165,12 @@ public: virtual ~LogarithmicRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - 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; }; class ExponentialRegressionCurve : public RegressionCurveModel @@ -203,16 +181,12 @@ public: virtual ~ExponentialRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - 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; }; class PotentialRegressionCurve : public RegressionCurveModel @@ -223,16 +197,12 @@ public: virtual ~PotentialRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - 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; }; class PolynomialRegressionCurve : public RegressionCurveModel @@ -243,16 +213,12 @@ public: virtual ~PolynomialRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - 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; }; class MovingAverageRegressionCurve : public RegressionCurveModel @@ -263,16 +229,12 @@ public: virtual ~MovingAverageRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - 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; }; } // namespace chart diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index ce759a3fb68f..ab13afc027a1 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -212,14 +212,12 @@ RegressionEquation::~RegressionEquation() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new RegressionEquation( *this )); } // ____ OPropertySet ____ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticRegressionEquationDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -235,14 +233,12 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL RegressionEquation::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticRegressionEquationInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -256,7 +252,6 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util: } void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -271,14 +266,12 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut // ____ XModifyListener ____ void SAL_CALL RegressionEquation::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL RegressionEquation::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -296,14 +289,12 @@ void RegressionEquation::fireModifyEvent() // ____ XTitle ____ uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_aStrings; } void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& Strings ) - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); ModifyListenerHelper::removeListenerFromAllElements( @@ -315,19 +306,16 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< } OUString SAL_CALL RegressionEquation::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.RegressionEquation"); } sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL RegressionEquation::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.RegressionEquation", "com.sun.star.beans.PropertySet", diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 6dcdd605f2d8..e018061f8f33 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -58,15 +58,12 @@ public: 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; /// merge XInterface implementations @@ -76,47 +73,37 @@ protected: explicit RegressionEquation( const RegressionEquation & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + 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; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ XTitle ____ virtual css::uno::Sequence< - css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() override; virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< - css::chart2::XFormattedString > >& Strings ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XFormattedString > >& Strings ) override; using ::cppu::OPropertySetHelper::disposing; diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 83084b9126ae..9edd475afdcb 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -54,7 +54,6 @@ LogarithmicScaling::~LogarithmicScaling() } double SAL_CALL LogarithmicScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -65,31 +64,26 @@ double SAL_CALL LogarithmicScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL LogarithmicScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new ExponentialScaling( m_fBase ); } OUString SAL_CALL LogarithmicScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Logarithmic); } OUString SAL_CALL LogarithmicScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Logarithmic); } sal_Bool SAL_CALL LogarithmicScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LogarithmicScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Logarithmic }; } @@ -109,7 +103,6 @@ ExponentialScaling::~ExponentialScaling() } double SAL_CALL ExponentialScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -120,31 +113,26 @@ double SAL_CALL ExponentialScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL ExponentialScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new LogarithmicScaling( m_fBase ); } OUString SAL_CALL ExponentialScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Exponential); } OUString SAL_CALL ExponentialScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Exponential); } sal_Bool SAL_CALL ExponentialScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ExponentialScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Exponential }; } @@ -163,7 +151,6 @@ LinearScaling::~LinearScaling() {} double SAL_CALL LinearScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -175,7 +162,6 @@ double SAL_CALL LinearScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL LinearScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fSlope == 0 ) @@ -185,25 +171,21 @@ uno::Reference< XScaling > SAL_CALL } OUString SAL_CALL LinearScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Linear); } OUString SAL_CALL LinearScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Linear) ; } sal_Bool SAL_CALL LinearScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LinearScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Linear }; } @@ -220,7 +202,6 @@ PowerScaling::~PowerScaling() {} double SAL_CALL PowerScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -232,7 +213,6 @@ double SAL_CALL PowerScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL PowerScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fExponent == 0 ) @@ -243,25 +223,21 @@ uno::Reference< XScaling > SAL_CALL OUString SAL_CALL PowerScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Power); } OUString SAL_CALL PowerScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Power); } sal_Bool SAL_CALL PowerScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Power }; } diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 67a99d72c361..c4d7290d6fee 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -125,7 +125,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Bas // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -147,19 +146,16 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS } OUString SAL_CALL UncachedDataSequence::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL UncachedDataSequence::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, @@ -171,7 +167,6 @@ css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServic // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() - throw (uno::RuntimeException, std::exception) { Sequence< double > aResult; MutexGuard aGuard( GetMutex() ); @@ -187,7 +182,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() - throw (uno::RuntimeException, std::exception) { Sequence< OUString > aResult; MutexGuard aGuard( GetMutex() ); @@ -203,7 +197,6 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL UncachedDataSequence::getData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); if( m_xDataProvider.is()) @@ -212,31 +205,23 @@ Sequence< Any > SAL_CALL UncachedDataSequence::getData() } OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException, std::exception) { return getName(); } Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data::LabelOrigin ) - throw (uno::RuntimeException, std::exception) { // auto-generated label is an empty string return Sequence< OUString >(1); } ::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { return m_nNumberFormatKey; } // ____ XIndexReplace ____ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) - throw (lang::IllegalArgumentException, - lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); Sequence< Any > aData( getData()); @@ -251,16 +236,12 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno // ____ XIndexAccess (base of XIndexReplace) ____ ::sal_Int32 SAL_CALL UncachedDataSequence::getCount() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return 0; } uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) - throw (lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return uno::Any(); @@ -268,13 +249,11 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) // ____ XElementAccess (base of XIndexAccess) ____ uno::Type SAL_CALL UncachedDataSequence::getElementType() - throw (uno::RuntimeException, std::exception) { return cppu::UnoType::get(); } sal_Bool SAL_CALL UncachedDataSequence::hasElements() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataProvider.is()) return false; @@ -283,20 +262,17 @@ sal_Bool SAL_CALL UncachedDataSequence::hasElements() // ____ XNamed ____ OUString SAL_CALL UncachedDataSequence::getName() - throw (uno::RuntimeException, std::exception) { return m_aSourceRepresentation; } void SAL_CALL UncachedDataSequence::setName( const OUString& aName ) - throw (uno::RuntimeException, std::exception) { m_aSourceRepresentation = aName; fireModifyEvent(); } Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() - throw (uno::RuntimeException, std::exception) { UncachedDataSequence * pNewSeq = new UncachedDataSequence( *this ); return Reference< util::XCloneable >( pNewSeq ); @@ -304,14 +280,11 @@ Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() // ____ XModifiable ____ sal_Bool SAL_CALL UncachedDataSequence::isModified() - throw (uno::RuntimeException, std::exception) { return false; } void SAL_CALL UncachedDataSequence::setModified( sal_Bool bModified ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { if( bModified ) fireModifyEvent(); @@ -319,7 +292,6 @@ void SAL_CALL UncachedDataSequence::setModified( sal_Bool bModified ) // ____ XModifyBroadcaster (base of XModifiable) ____ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -333,7 +305,6 @@ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XM } void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index 6a1b014a418d..12c616f2f72f 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -35,7 +35,6 @@ WeakModifyListenerAdapter::~WeakModifyListenerAdapter() {} void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModListener( getListener() ); if( xModListener.is()) @@ -51,7 +50,6 @@ WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter() {} void SAL_CALL WeakSelectionChangeListenerAdapter::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { Reference< view::XSelectionChangeListener > xSelChgListener( getListener() ); if( xSelChgListener.is()) diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index b9ef06dcf4a1..ef74d61e9dee 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -39,8 +39,6 @@ WrappedDefaultProperty::~WrappedDefaultProperty() void WrappedDefaultProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { Reference< beans::XPropertySet > xInnerPropSet( xInnerPropertyState, uno::UNO_QUERY ); if( xInnerPropSet.is()) @@ -49,17 +47,12 @@ void WrappedDefaultProperty::setPropertyToDefault( uno::Any WrappedDefaultProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException) { return m_aOuterDefaultValue; } beans::PropertyState WrappedDefaultProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE; try diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx index ceef3bfc79cf..34941778926f 100644 --- a/chart2/source/tools/WrappedDirectStateProperty.cxx +++ b/chart2/source/tools/WrappedDirectStateProperty.cxx @@ -37,8 +37,6 @@ WrappedDirectStateProperty::~WrappedDirectStateProperty() beans::PropertyState WrappedDirectStateProperty::getPropertyState( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { return beans::PropertyState_DIRECT_VALUE; } diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 6ac89266bd20..5a0cdef9a61c 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -46,31 +46,26 @@ WrappedIgnoreProperty::~WrappedIgnoreProperty() } void WrappedIgnoreProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { m_aCurrentValue = rOuterValue; } Any WrappedIgnoreProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return m_aCurrentValue; } void WrappedIgnoreProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { m_aCurrentValue = m_aDefaultValue; } Any WrappedIgnoreProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return m_aDefaultValue; } beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { return ( m_aCurrentValue == m_aDefaultValue ? beans::PropertyState_DEFAULT_VALUE diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index c664a6ae92ea..0b7c93c70dc6 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -52,14 +52,12 @@ Any WrappedProperty::convertOuterToInnerValue( const Any& rOuterValue ) const } void WrappedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if(xInnerPropertySet.is()) xInnerPropertySet->setPropertyValue( this->getInnerName(), this->convertOuterToInnerValue( rOuterValue ) ); } Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertySet.is() ) @@ -71,7 +69,6 @@ Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& x } void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( xInnerPropertyState.is() && !this->getInnerName().isEmpty() ) xInnerPropertyState->setPropertyToDefault(this->getInnerName()); @@ -83,7 +80,6 @@ void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertySta } Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertyState.is() ) @@ -95,7 +91,6 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState } beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE; OUString aInnerName( this->getInnerName() ); diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index e7783e201a73..78c86c73852a 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -70,7 +70,6 @@ void WrappedPropertySet::clearWrappedPropertySet() //XPropertySet Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySetInfo( ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySetInfo > xInfo = m_xInfo; if( !xInfo.is() ) @@ -92,7 +91,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySet } void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { try { @@ -137,7 +135,6 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam } } Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -179,7 +176,6 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName } void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -192,7 +188,6 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr } } void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& aListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -205,7 +200,6 @@ void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& } } void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -218,7 +212,6 @@ void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPr } } void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -233,7 +226,6 @@ void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString& //XMultiPropertySet void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& rNameSeq, const Sequence< Any >& rValueSeq ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { bool bUnknownProperty = false; sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); @@ -257,7 +249,6 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& // throw beans::UnknownPropertyException(); } Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -283,19 +274,16 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< return aRetSeq; } void SAL_CALL WrappedPropertySet::addPropertiesChangeListener( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo } void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo } void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo @@ -303,7 +291,6 @@ void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUS //XPropertyState beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -334,7 +321,6 @@ const WrappedProperty* WrappedPropertySet::getWrappedProperty( sal_Int32 nHandle } Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -350,7 +336,6 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( } void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); if( xInnerPropertyState.is() ) @@ -363,7 +348,6 @@ void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropert } } Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); @@ -380,7 +364,6 @@ Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyNa //XMultiPropertyStates void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = getPropertySequence(); for(sal_Int32 nN=0; nN& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) -- cgit v1.2.3