summaryrefslogtreecommitdiff
path: root/chart2/source/tools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-25 21:31:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-26 18:22:20 +0100
commit5e21a413c788f839a66d9e4c14e745ed18058db8 (patch)
treed4451246461346a425ad6f796e08bf1514cdd942 /chart2/source/tools
parent6fc2bd0094a23aafadeef3f4a8c2803d621a588d (diff)
cppuhelper: retrofit std::exception into overriding exception specs
Change-Id: I56e32131b7991ee9948ce46765632eb823d463b3
Diffstat (limited to 'chart2/source/tools')
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx22
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx2
-rw-r--r--chart2/source/tools/DataSource.cxx4
-rw-r--r--chart2/source/tools/ErrorBar.cxx36
-rw-r--r--chart2/source/tools/ExponentialRegressionCurveCalculator.cxx6
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx84
-rw-r--r--chart2/source/tools/LabeledDataSequence.cxx14
-rw-r--r--chart2/source/tools/LinearRegressionCurveCalculator.cxx4
-rw-r--r--chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx6
-rw-r--r--chart2/source/tools/MeanValueRegressionCurveCalculator.cxx6
-rw-r--r--chart2/source/tools/ModifyListenerCallBack.cxx8
-rw-r--r--chart2/source/tools/ModifyListenerHelper.cxx8
-rw-r--r--chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx6
-rw-r--r--chart2/source/tools/NameContainer.cxx24
-rw-r--r--chart2/source/tools/OPropertySet.cxx30
-rw-r--r--chart2/source/tools/PolynomialRegressionCurveCalculator.cxx6
-rw-r--r--chart2/source/tools/PotentialRegressionCurveCalculator.cxx6
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx10
-rw-r--r--chart2/source/tools/RegressionCurveCalculator.cxx10
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx32
-rw-r--r--chart2/source/tools/RegressionCurveModel.hxx32
-rw-r--r--chart2/source/tools/RegressionEquation.cxx16
-rw-r--r--chart2/source/tools/RegressionEquation.hxx16
-rw-r--r--chart2/source/tools/Scaling.cxx24
-rw-r--r--chart2/source/tools/UncachedDataSequence.cxx38
-rw-r--r--chart2/source/tools/WeakListenerAdapter.cxx4
-rw-r--r--chart2/source/tools/WrappedPropertySet.cxx38
27 files changed, 246 insertions, 246 deletions
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 406606c5256d..13ce0b899ff5 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -238,7 +238,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( CachedDataSequence, CachedDataSequence_Base, O
// ____ XPropertySet ____
Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySetInfo()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) );
}
@@ -264,7 +264,7 @@ APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, lcl_aServiceName )
// ________ XNumericalDataSequence ________
Sequence< double > SAL_CALL CachedDataSequence::getNumericalData()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
@@ -276,7 +276,7 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData()
// ________ XTextualDataSequence ________
Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
@@ -288,20 +288,20 @@ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData()
// ________ XDataSequence ________
Sequence< Any > SAL_CALL CachedDataSequence::getData()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
return Impl_getMixedData();
}
OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_sRole;
}
Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::LabelOrigin /*eLabelOrigin*/ )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// return empty label, as we have no range representaions to determine something useful
return Sequence< OUString >();
@@ -309,13 +309,13 @@ Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::L
::sal_Int32 SAL_CALL CachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 /*nIndex*/ )
throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
return 0;
}
Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
CachedDataSequence * pNewSeq = new CachedDataSequence( *this );
@@ -323,7 +323,7 @@ Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone()
}
void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -337,7 +337,7 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod
}
void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -351,7 +351,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)
+void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception)
{
::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 df8d4fe19ae4..821f06923a52 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -143,7 +143,7 @@ void ConfigColorScheme::retrieveConfigColors()
// ____ XColorScheme ____
::sal_Int32 SAL_CALL ConfigColorScheme::getColorByIndex( ::sal_Int32 nIndex )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if( m_bNeedsUpdate )
retrieveConfigColors();
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index 505c5335cebd..f81571142c31 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -50,14 +50,14 @@ DataSource::~DataSource()
// ____ XDataSource ____
Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSource::getDataSequences()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_aDataSeq;
}
// ____ XDataSink ____
void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
m_aDataSeq = aData;
}
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index d5c90e88d773..1469e8e5774d 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -127,14 +127,14 @@ ErrorBar::~ErrorBar()
{}
uno::Reference< util::XCloneable > SAL_CALL ErrorBar::createClone()
- throw (uno::RuntimeException)
+ 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)
+ throw (uno::RuntimeException, std::exception)
{
static uno::Reference< beans::XPropertySetInfo > aRef (
new SfxItemPropertySetInfo( GetErrorBarPropertySet()->getPropertyMap() ) );
@@ -143,7 +143,7 @@ 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)
+ lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -216,7 +216,7 @@ OUString getSourceRangeStrFromLabeledSequences( uno::Sequence< uno::Reference< c
}
uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -269,7 +269,7 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName)
}
beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
- throw (com::sun::star::beans::UnknownPropertyException)
+ throw (com::sun::star::beans::UnknownPropertyException, std::exception)
{
if(rPropName == "ErrorBarStyle")
{
@@ -340,7 +340,7 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName )
}
uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Sequence< OUString >& rPropNames )
- throw (com::sun::star::beans::UnknownPropertyException)
+ throw (com::sun::star::beans::UnknownPropertyException, std::exception)
{
uno::Sequence< beans::PropertyState > aRet( rPropNames.getLength() );
for(sal_Int32 i = 0; i < rPropNames.getLength(); ++i)
@@ -351,41 +351,41 @@ uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Se
}
void ErrorBar::setPropertyToDefault( const OUString& )
- throw (beans::UnknownPropertyException)
+ throw (beans::UnknownPropertyException, std::exception)
{
//keep them unimplemented for now
}
uno::Any ErrorBar::getPropertyDefault( const OUString& )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, std::exception)
{
//keep them unimplemented for now
return uno::Any();
}
void ErrorBar::addPropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
- throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
{
}
void ErrorBar::removePropertyChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& )
- throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
{
}
void ErrorBar::addVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
- throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
{
}
void ErrorBar::removeVetoableChangeListener( const OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& )
- throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException, std::exception)
{
}
// ____ XModifyBroadcaster ____
void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -399,7 +399,7 @@ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyLi
}
void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -414,21 +414,21 @@ void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModif
// ____ XModifyListener ____
void SAL_CALL ErrorBar::modified( const lang::EventObject& aEvent )
- throw (uno::RuntimeException)
+ 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)
+ throw (uno::RuntimeException, std::exception)
{
// nothing
}
// ____ XDataSink ____
void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >& aData )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
ModifyListenerHelper::removeListenerFromAllElements( m_aDataSequences, m_xModifyEventForwarder );
EventListenerHelper::removeListenerFromAllElements( m_aDataSequences, this );
@@ -439,7 +439,7 @@ 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)
+ throw (uno::RuntimeException, std::exception)
{
return ContainerHelper::ContainerToSequence( m_aDataSequences );
}
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 876067587211..6cb949044733 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -44,7 +44,7 @@ ExponentialRegressionCurveCalculator::~ExponentialRegressionCurveCalculator()
void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression(
const uno::Sequence< double >& aXValues,
const uno::Sequence< double >& aYValues )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
RegressionCalculationHelper::tDoubleVectorPair aValues(
RegressionCalculationHelper::cleanup(
@@ -91,7 +91,7 @@ void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression(
double SAL_CALL ExponentialRegressionCurveCalculator::getCurveValue( double x )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
double fResult;
::rtl::math::setNan( & fResult );
@@ -111,7 +111,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul
const uno::Reference< chart2::XScaling >& xScalingY,
::sal_Bool bMaySkipPointsInCalculation )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( bMaySkipPointsInCalculation &&
isLinearScaling( xScalingX ) &&
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index fe70d7c59066..e2874961da1c 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -585,7 +585,7 @@ void InternalDataProvider::createDefaultData()
// ____ XDataProvider ____
::sal_Bool SAL_CALL InternalDataProvider::createDataSourcePossible( const Sequence< beans::PropertyValue >& /* aArguments */ )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return true;
}
@@ -611,7 +611,7 @@ 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)
+ uno::RuntimeException, std::exception)
{
OUString aRangeRepresentation;
bool bUseColumns = true;
@@ -701,7 +701,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
const Reference< chart2::data::XDataSource >& /* xDataSource */ )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
Sequence< beans::PropertyValue > aArguments( 4 );
aArguments[0] = beans::PropertyValue(
@@ -726,7 +726,7 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
}
::sal_Bool SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& /* aRangeRepresentation */ )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return true;
}
@@ -734,7 +734,7 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments(
Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentation(
const OUString& aRangeRepresentation )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( aRangeRepresentation.match( lcl_aCategoriesRangeName ))
{
@@ -766,7 +766,7 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa
}
Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelection()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// there is no range selection component
return Reference< sheet::XRangeSelection >();
@@ -774,7 +774,7 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec
// ____ XInternalDataProvider ____
::sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUString& aRange )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
sal_Bool bResult = false;
@@ -798,7 +798,7 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec
}
Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation( const OUString& aRange )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
Sequence< uno::Any > aResult;
@@ -872,7 +872,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
const OUString& aRange, const Sequence< uno::Any >& aNewData )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) );
if( aRange.match( lcl_aLabelRangePrefix ) )
@@ -938,7 +938,7 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
}
void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if( m_bDataInColumns )
{
@@ -953,7 +953,7 @@ void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex )
}
void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
lcl_deleteMapReferences( OUString::number( nAtIndex ));
lcl_deleteMapReferences( lcl_aLabelRangePrefix + OUString::number( nAtIndex ));
@@ -970,7 +970,7 @@ void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex )
}
void SAL_CALL InternalDataProvider::appendSequence()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if( m_bDataInColumns )
m_aInternalData.appendColumn();
@@ -979,7 +979,7 @@ void SAL_CALL InternalDataProvider::appendSequence()
}
void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel )
- throw (uno::RuntimeException)
+ 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 )
@@ -996,7 +996,7 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel
}
}
void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel )
- throw (uno::RuntimeException)
+ 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 )
@@ -1014,7 +1014,7 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel
}
void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 nAfterIndex )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
sal_Int32 nMaxRep = 0;
if( m_bDataInColumns )
@@ -1038,7 +1038,7 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32
}
void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
sal_Int32 nMaxRep = 0;
if( m_bDataInColumns )
@@ -1062,7 +1062,7 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32
}
void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if( m_bDataInColumns )
m_aInternalData.swapRowWithNext( nAtIndex );
@@ -1082,7 +1082,7 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s
}
void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if( xSeq.is())
lcl_addDataSequenceToMap( xSeq->getSourceRangeRepresentation(), xSeq );
@@ -1091,7 +1091,7 @@ void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Refere
// ____ XRangeXMLConversion ____
OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRangeRepresentation )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
XMLRangeHelper::CellRange aRange;
aRange.aTableName = "local-table";
@@ -1169,7 +1169,7 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang
OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXMLRange )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
XMLRangeHelper::CellRange aRange( XMLRangeHelper::getCellRangeFromXMLString( aXMLRange ));
if( aRange.aUpperLeft.bIsEmpty )
@@ -1298,7 +1298,7 @@ uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStr
}//anonymous namespace
// ____ XDateCategories ____
-Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException)
+Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException, std::exception)
{
double fNan = InternalDataProvider::getNotANumber();
double fValue = fNan;
@@ -1316,7 +1316,7 @@ Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno
return aDoubles;
}
-void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException)
+void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception)
{
sal_Int32 nCount = rDates.getLength();
vector< vector< uno::Any > > aNewCategories;
@@ -1336,56 +1336,56 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >&
}
// ____ XAnyDescriptionAccess ____
-Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException)
+Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception)
{
return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexRowLabels() );
}
-void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception)
{
m_aInternalData.setComplexRowLabels( lcl_convertSequenceSequenceToVectorVector( aRowDescriptions ) );
}
-Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException)
+Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception)
{
return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexColumnLabels() );
}
-void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception)
{
m_aInternalData.setComplexColumnLabels( lcl_convertSequenceSequenceToVectorVector( aColumnDescriptions ) );
}
// ____ XComplexDescriptionAccess ____
-Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException)
+Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception)
{
return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() );
}
-void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception)
{
m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) );
}
-Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException)
+Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception)
{
return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() );
}
-void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception)
{
m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) );
}
// ____ XChartDataArray ____
Sequence< Sequence< double > > SAL_CALL InternalDataProvider::getData()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_aInternalData.getData();
}
void SAL_CALL InternalDataProvider::setData( const Sequence< Sequence< double > >& rDataInRows )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_aInternalData.setData( rDataInRows );
}
void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString >& aRowDescriptions )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
vector< vector< uno::Any > > aComplexDescriptions( aRowDescriptions.getLength() );
transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aRowDescriptions.getConstArray(),
@@ -1394,7 +1394,7 @@ void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString
}
void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUString >& aColumnDescriptions )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
vector< vector< uno::Any > > aComplexDescriptions( aColumnDescriptions.getLength() );
transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aColumnDescriptions.getConstArray(),
@@ -1403,7 +1403,7 @@ void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUStr
}
Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexRowLabels() );
SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels );
@@ -1411,7 +1411,7 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions()
}
Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexColumnLabels() );
SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels );
@@ -1421,18 +1421,18 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions()
// ____ XChartData (base of XChartDataArray) ____
void SAL_CALL InternalDataProvider::addChartDataChangeEventListener(
const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
}
void SAL_CALL InternalDataProvider::removeChartDataChangeEventListener(
const Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
}
double SAL_CALL InternalDataProvider::getNotANumber()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
double fNan;
::rtl::math::setNan( & fNan );
@@ -1440,13 +1440,13 @@ double SAL_CALL InternalDataProvider::getNotANumber()
}
::sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber )
- throw (uno::RuntimeException)
+ 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)
+void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception)
{
comphelper::SequenceAsHashMap aArgs(_aArguments);
if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData" ,sal_False) )
@@ -1454,7 +1454,7 @@ void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > &
}
// ____ XCloneable ____
Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return Reference< util::XCloneable >( new InternalDataProvider( *this ));
}
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index 68df3c83520c..84609b9c2cb7 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -66,14 +66,14 @@ LabeledDataSequence::~LabeledDataSequence()
// ____ XLabeledDataSequence ____
uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getValues()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_xData;
}
void SAL_CALL LabeledDataSequence::setValues(
const uno::Reference< chart2::data::XDataSequence >& xSequence )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if( m_xData != xSequence )
{
@@ -84,14 +84,14 @@ void SAL_CALL LabeledDataSequence::setValues(
}
uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getLabel()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_xLabel;
}
void SAL_CALL LabeledDataSequence::setLabel(
const uno::Reference< chart2::data::XDataSequence >& xSequence )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if( m_xLabel != xSequence )
{
@@ -103,7 +103,7 @@ void SAL_CALL LabeledDataSequence::setLabel(
// ____ XCloneable ____
uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
uno::Reference< chart2::data::XDataSequence > xNewValues( m_xData );
uno::Reference< chart2::data::XDataSequence > xNewLabel( m_xLabel );
@@ -122,7 +122,7 @@ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone()
// ____ XModifyBroadcaster ____
void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -136,7 +136,7 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo
}
void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index ec328926ce8b..7ed0c00ef765 100644
--- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -41,7 +41,7 @@ void LinearRegressionCurveCalculator::setRegressionProperties(
sal_Bool aForceIntercept,
double aInterceptValue,
sal_Int32 aPeriod )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
PolynomialRegressionCurveCalculator::setRegressionProperties(
1,
@@ -56,7 +56,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LinearRegressionCurveCalculator:
const uno::Reference< chart2::XScaling >& xScalingY,
::sal_Bool bMaySkipPointsInCalculation )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( bMaySkipPointsInCalculation &&
isLinearScaling( xScalingX ) &&
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index 58e92a1e3330..a00a0cdde976 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -44,7 +44,7 @@ LogarithmicRegressionCurveCalculator::~LogarithmicRegressionCurveCalculator()
void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression(
const uno::Sequence< double >& aXValues,
const uno::Sequence< double >& aYValues )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
RegressionCalculationHelper::tDoubleVectorPair aValues(
RegressionCalculationHelper::cleanup(
@@ -90,7 +90,7 @@ void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression(
double SAL_CALL LogarithmicRegressionCurveCalculator::getCurveValue( double x )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
double fResult;
::rtl::math::setNan( & fResult );
@@ -110,7 +110,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LogarithmicRegressionCurveCalcul
const uno::Reference< chart2::XScaling >& xScalingY,
::sal_Bool bMaySkipPointsInCalculation )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( bMaySkipPointsInCalculation &&
isLogarithmicScaling( xScalingX ) &&
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index e94861456e05..c263d48b2770 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -41,7 +41,7 @@ MeanValueRegressionCurveCalculator::~MeanValueRegressionCurveCalculator()
void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression(
const uno::Sequence< double >& /*aXValues*/,
const uno::Sequence< double >& aYValues )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const sal_Int32 nDataLength = aYValues.getLength();
sal_Int32 nMax = nDataLength;
@@ -88,7 +88,7 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression(
double SAL_CALL MeanValueRegressionCurveCalculator::getCurveValue( double /*x*/ )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
return m_fMeanValue;
}
@@ -99,7 +99,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MeanValueRegressionCurveCalculat
const uno::Reference< chart2::XScaling >& xScalingY,
::sal_Bool bMaySkipPointsInCalculation )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( bMaySkipPointsInCalculation )
{
diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx
index 15834b891522..3dcd37a05faa 100644
--- a/chart2/source/tools/ModifyListenerCallBack.cxx
+++ b/chart2/source/tools/ModifyListenerCallBack.cxx
@@ -42,10 +42,10 @@ public:
void stopListening();
//XModifyListener
- virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException);
+ virtual void SAL_CALL modified( const lang::EventObject& aEvent ) throw (uno::RuntimeException, std::exception);
//XEventListener
- virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException);
+ virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (uno::RuntimeException, std::exception);
using ::cppu::WeakComponentImplHelperBase::disposing;
@@ -66,13 +66,13 @@ ModifyListenerCallBack_impl::~ModifyListenerCallBack_impl()
}
//XModifyListener
-void SAL_CALL ModifyListenerCallBack_impl::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException)
+void SAL_CALL ModifyListenerCallBack_impl::modified( const lang::EventObject& /*aEvent*/ ) throw (uno::RuntimeException, std::exception)
{
m_aLink.Call(0);
}
//XEventListener
-void SAL_CALL ModifyListenerCallBack_impl::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
+void SAL_CALL ModifyListenerCallBack_impl::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
{
m_xBroadcaster.clear();
}
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 36c62ee7f9ff..3245ca527c1a 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -163,27 +163,27 @@ void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSou
// ____ XModifyBroadcaster ____
void SAL_CALL ModifyEventForwarder::addModifyListener( const Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
AddListener( aListener );
}
void SAL_CALL ModifyEventForwarder::removeModifyListener( const Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
RemoveListener( aListener );
}
// ____ XModifyListener ____
void SAL_CALL ModifyEventForwarder::modified( const lang::EventObject& aEvent )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
FireEvent( aEvent );
}
// ____ XEventListener (base of XModifyListener) ____
void SAL_CALL ModifyEventForwarder::disposing( const lang::EventObject& /* Source */ )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// nothing
}
diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index 55193f11b210..ee61c9c7cd9a 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -41,7 +41,7 @@ MovingAverageRegressionCurveCalculator::~MovingAverageRegressionCurveCalculator(
void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression(
const uno::Sequence< double >& aXValues,
const uno::Sequence< double >& aYValues )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
::rtl::math::setNan( & m_fCorrelationCoeffitient );
@@ -74,7 +74,7 @@ void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression(
double SAL_CALL MovingAverageRegressionCurveCalculator::getCurveValue( double /*x*/ )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
double fResult;
rtl::math::setNan(&fResult);
@@ -87,7 +87,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MovingAverageRegressionCurveCalc
const uno::Reference< chart2::XScaling >& /*xScalingY*/,
sal_Bool /*bMaySkipPointsInCalculation*/ )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ 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 c7b7507b729e..8961dd7b51df 100644
--- a/chart2/source/tools/NameContainer.cxx
+++ b/chart2/source/tools/NameContainer.cxx
@@ -59,19 +59,19 @@ NameContainer::~NameContainer()
//XServiceInfo
OUString SAL_CALL NameContainer::getImplementationName()
- throw( ::com::sun::star::uno::RuntimeException )
+ throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
return m_aImplementationName;
}
sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName )
- throw( ::com::sun::star::uno::RuntimeException )
+ throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, ServiceName);
}
Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames()
- throw( ::com::sun::star::uno::RuntimeException )
+ throw( ::com::sun::star::uno::RuntimeException, std::exception )
{
Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] = m_aServicename;
@@ -80,7 +80,7 @@ Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames()
// XNameContainer
void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rElement )
- throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException )
+ throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
{
if( m_aMap.find( rName ) != m_aMap.end() )
throw container::ElementExistException();
@@ -88,7 +88,7 @@ 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)
+ throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
tContentMap::iterator aIt( m_aMap.find( Name ));
if( aIt == m_aMap.end())
@@ -98,7 +98,7 @@ 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 )
+ throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception )
{
tContentMap::iterator aIt( m_aMap.find( rName ));
if( aIt == m_aMap.end() )
@@ -108,7 +108,7 @@ 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)
+ throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
tContentMap::iterator aIter( m_aMap.find( rName ) );
if( aIter == m_aMap.end() )
@@ -117,7 +117,7 @@ Any SAL_CALL NameContainer::getByName( const OUString& rName )
}
Sequence< OUString > SAL_CALL NameContainer::getElementNames()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
sal_Int32 nCount = m_aMap.size();
Sequence< OUString > aSeq(nCount);
@@ -128,27 +128,27 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames()
}
sal_Bool SAL_CALL NameContainer::hasByName( const OUString& rName )
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
return ( m_aMap.find( rName ) != m_aMap.end() );
}
// XElementAccess
sal_Bool SAL_CALL NameContainer::hasElements()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
return ! m_aMap.empty();
}
uno::Type SAL_CALL NameContainer::getElementType()
- throw( uno::RuntimeException )
+ throw( uno::RuntimeException, std::exception )
{
return m_aType;
}
// XCloneable
uno::Reference< util::XCloneable > SAL_CALL NameContainer::createClone()
- throw ( uno::RuntimeException )
+ 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 db4efffd5057..304e101b5514 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -79,7 +79,7 @@ void OPropertySet::disposePropertySet()
}
Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return ::cppu::queryInterface(
aType,
@@ -97,7 +97,7 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType )
// // ____ XTypeProvider ____
Sequence< uno::Type > SAL_CALL
OPropertySet::getTypes()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
static Sequence< uno::Type > aTypeList;
@@ -128,7 +128,7 @@ namespace
Sequence< sal_Int8 > SAL_CALL
OPropertySet::getImplementationId()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return theOPropertySetImplementationId::get().getSeq();
}
@@ -137,7 +137,7 @@ Sequence< sal_Int8 > SAL_CALL
beans::PropertyState SAL_CALL
OPropertySet::getPropertyState( const OUString& PropertyName )
throw (beans::UnknownPropertyException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
cppu::IPropertyArrayHelper & rPH = getInfoHelper();
@@ -148,7 +148,7 @@ beans::PropertyState SAL_CALL
Sequence< beans::PropertyState > SAL_CALL
OPropertySet::getPropertyStates( const Sequence< OUString >& aPropertyName )
throw (beans::UnknownPropertyException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
cppu::IPropertyArrayHelper & rPH = getInfoHelper();
@@ -164,7 +164,7 @@ Sequence< beans::PropertyState > SAL_CALL
void SAL_CALL
OPropertySet::setPropertyToDefault( const OUString& PropertyName )
throw (beans::UnknownPropertyException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
cppu::IPropertyArrayHelper & rPH = getInfoHelper();
@@ -176,7 +176,7 @@ Any SAL_CALL
OPropertySet::getPropertyDefault( const OUString& aPropertyName )
throw (beans::UnknownPropertyException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
cppu::IPropertyArrayHelper & rPH = getInfoHelper();
@@ -190,7 +190,7 @@ Any SAL_CALL
void SAL_CALL
OPropertySet::setAllPropertiesToDefault()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
m_pImplProperties->SetAllPropertiesToDefault();
firePropertyChangeEvent();
@@ -199,7 +199,7 @@ void SAL_CALL
void SAL_CALL
OPropertySet::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames )
throw (beans::UnknownPropertyException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
cppu::IPropertyArrayHelper & rPH = getInfoHelper();
@@ -216,7 +216,7 @@ Sequence< Any > SAL_CALL
OPropertySet::getPropertyDefaults( const Sequence< OUString >& aPropertyNames )
throw (beans::UnknownPropertyException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
::cppu::IPropertyArrayHelper & rPH = getInfoHelper();
const sal_Int32 nElements = aPropertyNames.getLength();
@@ -271,7 +271,7 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue
void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast
( sal_Int32 nHandle,
const Any& rValue )
- throw (uno::Exception)
+ throw (uno::Exception, std::exception)
{
#if OSL_DEBUG_LEVEL > 0
if( rValue.hasValue())
@@ -385,14 +385,14 @@ void OPropertySet::firePropertyChangeEvent()
// ____ XStyleSupplier ____
Reference< style::XStyle > SAL_CALL OPropertySet::getStyle()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_pImplProperties->GetStyle();
}
void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( ! m_pImplProperties->SetStyle( xStyle ))
throw lang::IllegalArgumentException(
@@ -407,7 +407,7 @@ void SAL_CALL OPropertySet::setPropertyValues(
throw(beans::PropertyVetoException,
lang::IllegalArgumentException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
::cppu::OPropertySetHelper::setPropertyValues( PropertyNames, Values );
@@ -419,7 +419,7 @@ void SAL_CALL OPropertySet::setFastPropertyValue( sal_Int32 nHandle, const Any&
throw(beans::UnknownPropertyException,
beans::PropertyVetoException,
lang::IllegalArgumentException,
- lang::WrappedTargetException, uno::RuntimeException)
+ 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 21b564d63d08..90be5a163af5 100644
--- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx
@@ -40,7 +40,7 @@ PolynomialRegressionCurveCalculator::~PolynomialRegressionCurveCalculator()
void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression(
const uno::Sequence< double >& aXValues,
const uno::Sequence< double >& aYValues )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
rtl::math::setNan(&m_fCorrelationCoeffitient);
@@ -200,7 +200,7 @@ void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression(
double SAL_CALL PolynomialRegressionCurveCalculator::getCurveValue( double x )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
double fResult;
rtl::math::setNan(&fResult);
@@ -227,7 +227,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PolynomialRegressionCurveCalcula
const uno::Reference< chart2::XScaling >& xScalingY,
sal_Bool bMaySkipPointsInCalculation )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
return RegressionCurveCalculator::getCurveValues( min, max, nPointCount, xScalingX, xScalingY, bMaySkipPointsInCalculation );
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index 0d0898008fbf..0489eeaba995 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -44,7 +44,7 @@ PotentialRegressionCurveCalculator::~PotentialRegressionCurveCalculator()
void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression(
const uno::Sequence< double >& aXValues,
const uno::Sequence< double >& aYValues )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
RegressionCalculationHelper::tDoubleVectorPair aValues(
RegressionCalculationHelper::cleanup(
@@ -92,7 +92,7 @@ void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression(
double SAL_CALL PotentialRegressionCurveCalculator::getCurveValue( double x )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
double fResult;
::rtl::math::setNan( & fResult );
@@ -112,7 +112,7 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PotentialRegressionCurveCalculat
const uno::Reference< chart2::XScaling >& xScalingY,
::sal_Bool bMaySkipPointsInCalculation )
throw (lang::IllegalArgumentException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( bMaySkipPointsInCalculation &&
isLogarithmicScaling( xScalingX ) &&
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index bbe879f77ca5..6a865a175cec 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -75,7 +75,7 @@ RangeHighlighter::~RangeHighlighter()
// ____ XRangeHighlighter ____
Sequence< chart2::data::HighlightedRange > SAL_CALL RangeHighlighter::getSelectedRanges()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_aSelectedRanges;
}
@@ -298,7 +298,7 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface
}
void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if(!xListener.is())
return;
@@ -314,7 +314,7 @@ void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< vie
}
void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
rBHelper.removeListener( ::getCppuType( & xListener ), xListener );
--m_nAddedListenerCount;
@@ -324,7 +324,7 @@ void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference<
// ____ XSelectionChangeListener ____
void SAL_CALL RangeHighlighter::selectionChanged( const lang::EventObject& /*aEvent*/ )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
determineRanges();
@@ -351,7 +351,7 @@ void RangeHighlighter::fireSelectionEvent()
}
void SAL_CALL RangeHighlighter::disposing( const lang::EventObject& Source )
- throw (uno::RuntimeException)
+ 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 d05fd44d6bfc..694e056e6b9f 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -73,7 +73,7 @@ void RegressionCurveCalculator::setRegressionProperties(
sal_Bool aForceIntercept,
double aInterceptValue,
sal_Int32 aPeriod )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
mDegree = aDegree;
mForceIntercept = aForceIntercept;
@@ -101,7 +101,7 @@ 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)
+ throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
if( nPointCount < 2 )
throw lang::IllegalArgumentException();
@@ -137,13 +137,13 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa
}
double SAL_CALL RegressionCurveCalculator::getCorrelationCoefficient()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_fCorrelationCoeffitient;
}
OUString SAL_CALL RegressionCurveCalculator::getRepresentation()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return ImplGetRepresentation( Reference< util::XNumberFormatter >(), 0 );
}
@@ -151,7 +151,7 @@ OUString SAL_CALL RegressionCurveCalculator::getRepresentation()
OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation(
const Reference< util::XNumberFormatsSupplier > & xNumFmtSupplier,
sal_Int32 nNumberFormatKey )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// create and prepare a number formatter
if( !xNumFmtSupplier.is())
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 2ff4f4523e9d..f921ae82343c 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -216,19 +216,19 @@ RegressionCurveModel::~RegressionCurveModel()
// ____ XRegressionCurve ____
uno::Reference< chart2::XRegressionCurveCalculator > SAL_CALL
RegressionCurveModel::getCalculator()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( getServiceName());
}
uno::Reference< beans::XPropertySet > SAL_CALL RegressionCurveModel::getEquationProperties()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_xEquationProperties;
}
void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< beans::XPropertySet >& xEquationProperties )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if( xEquationProperties.is())
{
@@ -243,7 +243,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference<
// ____ XServiceName ____
OUString SAL_CALL RegressionCurveModel::getServiceName()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
switch( m_eRegressionCurveType )
{
@@ -268,7 +268,7 @@ OUString SAL_CALL RegressionCurveModel::getServiceName()
// ____ XModifyBroadcaster ____
void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -282,7 +282,7 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti
}
void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -297,14 +297,14 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference<
// ____ XModifyListener ____
void SAL_CALL RegressionCurveModel::modified( const lang::EventObject& aEvent )
- throw (uno::RuntimeException)
+ 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)
+ throw (uno::RuntimeException, std::exception)
{
// nothing
}
@@ -338,7 +338,7 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const
// ____ XPropertySet ____
uno::Reference< beans::XPropertySetInfo > SAL_CALL RegressionCurveModel::getPropertySetInfo()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return *StaticRegressionCurveInfo::get();
}
@@ -372,7 +372,7 @@ uno::Sequence< OUString > MeanValueRegressionCurve::getSupportedServiceNames_Sta
APPHELPER_XSERVICEINFO_IMPL( MeanValueRegressionCurve, lcl_aImplementationName_MeanValue );
uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return uno::Reference< util::XCloneable >( new MeanValueRegressionCurve( *this ));
}
@@ -398,7 +398,7 @@ uno::Sequence< OUString > LinearRegressionCurve::getSupportedServiceNames_Static
APPHELPER_XSERVICEINFO_IMPL( LinearRegressionCurve, lcl_aImplementationName_Linear );
uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return uno::Reference< util::XCloneable >( new LinearRegressionCurve( *this ));
}
@@ -424,7 +424,7 @@ uno::Sequence< OUString > LogarithmicRegressionCurve::getSupportedServiceNames_S
APPHELPER_XSERVICEINFO_IMPL( LogarithmicRegressionCurve, lcl_aImplementationName_Logarithmic );
uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return uno::Reference< util::XCloneable >( new LogarithmicRegressionCurve( *this ));
}
@@ -450,7 +450,7 @@ uno::Sequence< OUString > ExponentialRegressionCurve::getSupportedServiceNames_S
APPHELPER_XSERVICEINFO_IMPL( ExponentialRegressionCurve, lcl_aImplementationName_Exponential );
uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return uno::Reference< util::XCloneable >( new ExponentialRegressionCurve( *this ));
}
@@ -476,7 +476,7 @@ uno::Sequence< OUString > PotentialRegressionCurve::getSupportedServiceNames_Sta
APPHELPER_XSERVICEINFO_IMPL( PotentialRegressionCurve, lcl_aImplementationName_Potential );
uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return uno::Reference< util::XCloneable >( new PotentialRegressionCurve( *this ));
}
@@ -502,7 +502,7 @@ uno::Sequence< OUString > PolynomialRegressionCurve::getSupportedServiceNames_St
APPHELPER_XSERVICEINFO_IMPL( PolynomialRegressionCurve, lcl_aImplementationName_Polynomial );
uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return uno::Reference< util::XCloneable >( new PolynomialRegressionCurve( *this ));
}
@@ -528,7 +528,7 @@ uno::Sequence< OUString > MovingAverageRegressionCurve::getSupportedServiceNames
APPHELPER_XSERVICEINFO_IMPL( MovingAverageRegressionCurve, lcl_aImplementationName_MovingAverage );
uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone()
- throw (uno::RuntimeException)
+ 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 a077b687b43e..3da827761450 100644
--- a/chart2/source/tools/RegressionCurveModel.hxx
+++ b/chart2/source/tools/RegressionCurveModel.hxx
@@ -88,21 +88,21 @@ protected:
// ____ XPropertySet ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XRegressionCurve ____
virtual ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getEquationProperties()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL setEquationProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xEquationProperties )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XServiceName ____
virtual OUString SAL_CALL getServiceName()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XCloneable ____
// not implemented here
@@ -112,20 +112,20 @@ protected:
// ____ XModifyBroadcaster ____
virtual void SAL_CALL addModifyListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL removeModifyListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XModifyListener ____
virtual void SAL_CALL modified(
const ::com::sun::star::lang::EventObject& aEvent )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
const ::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
using ::cppu::OPropertySetHelper::disposing;
@@ -159,7 +159,7 @@ public:
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
@@ -179,7 +179,7 @@ public:
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
@@ -199,7 +199,7 @@ public:
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
@@ -219,7 +219,7 @@ public:
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
@@ -239,7 +239,7 @@ public:
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
@@ -259,7 +259,7 @@ public:
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
@@ -279,7 +279,7 @@ public:
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index acbc9e55a2fc..22f67a413c1d 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -197,7 +197,7 @@ RegressionEquation::~RegressionEquation()
// ____ XCloneable ____
uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return uno::Reference< util::XCloneable >( new RegressionEquation( *this ));
}
@@ -220,14 +220,14 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const
// ____ XPropertySet ____
Reference< beans::XPropertySetInfo > SAL_CALL RegressionEquation::getPropertySetInfo()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return *StaticRegressionEquationInfo::get();
}
// ____ XModifyBroadcaster ____
void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -241,7 +241,7 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util:
}
void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -256,14 +256,14 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut
// ____ XModifyListener ____
void SAL_CALL RegressionEquation::modified( const lang::EventObject& aEvent )
- throw (uno::RuntimeException)
+ 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)
+ throw (uno::RuntimeException, std::exception)
{
// nothing
}
@@ -281,14 +281,14 @@ void RegressionEquation::fireModifyEvent()
// ____ XTitle ____
uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText()
- throw (uno::RuntimeException)
+ 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)
+ throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
ModifyListenerHelper::removeListenerFromAllElements(
diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx
index 2546071cd052..f3239fe77885 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -76,39 +76,39 @@ protected:
// ____ XPropertySet ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
getPropertySetInfo()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XModifyBroadcaster ____
virtual void SAL_CALL addModifyListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL removeModifyListener(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XModifyListener ____
virtual void SAL_CALL modified(
const ::com::sun::star::lang::EventObject& aEvent )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
const ::com::sun::star::lang::EventObject& Source )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
// ____ XTitle ____
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XFormattedString > > SAL_CALL getText()
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL setText( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XFormattedString > >& Strings )
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException, std::exception);
using ::cppu::OPropertySetHelper::disposing;
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index 7b710ceeeb7a..e30f8d0b5037 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -55,7 +55,7 @@ LogarithmicScaling::~LogarithmicScaling()
double SAL_CALL
LogarithmicScaling::doScaling( double value )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
double fResult;
if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -67,14 +67,14 @@ LogarithmicScaling::doScaling( double value )
uno::Reference< XScaling > SAL_CALL
LogarithmicScaling::getInverseScaling()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return new ExponentialScaling( m_fBase );
}
OUString SAL_CALL
LogarithmicScaling::getServiceName()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return lcl_aServiceName_Logarithmic;
}
@@ -104,7 +104,7 @@ ExponentialScaling::~ExponentialScaling()
double SAL_CALL
ExponentialScaling::doScaling( double value )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
double fResult;
if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -116,14 +116,14 @@ ExponentialScaling::doScaling( double value )
uno::Reference< XScaling > SAL_CALL
ExponentialScaling::getInverseScaling()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return new LogarithmicScaling( m_fBase );
}
OUString SAL_CALL
ExponentialScaling::getServiceName()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return lcl_aServiceName_Exponential;
}
@@ -151,7 +151,7 @@ LinearScaling::~LinearScaling()
{}
double SAL_CALL LinearScaling::doScaling( double value )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
double fResult;
if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -163,7 +163,7 @@ double SAL_CALL LinearScaling::doScaling( double value )
uno::Reference< XScaling > SAL_CALL
LinearScaling::getInverseScaling()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// ToDo: ApproxEqual ?
if( m_fSlope == 0 )
@@ -174,7 +174,7 @@ uno::Reference< XScaling > SAL_CALL
OUString SAL_CALL
LinearScaling::getServiceName()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return lcl_aServiceName_Linear;
}
@@ -200,7 +200,7 @@ PowerScaling::~PowerScaling()
{}
double SAL_CALL PowerScaling::doScaling( double value )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
double fResult;
if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) )
@@ -212,7 +212,7 @@ double SAL_CALL PowerScaling::doScaling( double value )
uno::Reference< XScaling > SAL_CALL
PowerScaling::getInverseScaling()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// ToDo: ApproxEqual ?
if( m_fExponent == 0 )
@@ -223,7 +223,7 @@ uno::Reference< XScaling > SAL_CALL
OUString SAL_CALL
PowerScaling::getServiceName()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return lcl_aServiceName_Power;
}
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index aff3f2a13093..6498e57d3cc1 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -134,7 +134,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Bas
// ____ XPropertySet ____
Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertySetInfo()
- throw(uno::RuntimeException)
+ throw(uno::RuntimeException, std::exception)
{
return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) );
}
@@ -160,7 +160,7 @@ APPHELPER_XSERVICEINFO_IMPL( UncachedDataSequence, lcl_aServiceName )
// ________ XNumericalDataSequence ________
Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
Sequence< double > aResult;
MutexGuard aGuard( GetMutex() );
@@ -176,7 +176,7 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
// ________ XTextualDataSequence ________
Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
Sequence< OUString > aResult;
MutexGuard aGuard( GetMutex() );
@@ -192,7 +192,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
// ________ XDataSequence ________
Sequence< Any > SAL_CALL UncachedDataSequence::getData()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
if( m_xDataProvider.is())
@@ -201,13 +201,13 @@ Sequence< Any > SAL_CALL UncachedDataSequence::getData()
}
OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return getName();
}
Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data::LabelOrigin )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
// auto-generated label is an empty string
return Sequence< OUString >(1);
@@ -215,7 +215,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data:
::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 )
throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
return m_nNumberFormatKey;
}
@@ -225,7 +225,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno
throw (lang::IllegalArgumentException,
lang::IndexOutOfBoundsException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
Sequence< Any > aData( getData());
@@ -240,7 +240,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno
// ____ XIndexAccess (base of XIndexReplace) ____
::sal_Int32 SAL_CALL UncachedDataSequence::getCount()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "Implement!" );
return 0;
@@ -249,7 +249,7 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno
uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 )
throw (lang::IndexOutOfBoundsException,
lang::WrappedTargetException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
OSL_FAIL( "Implement!" );
return uno::Any();
@@ -257,13 +257,13 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 )
// ____ XElementAccess (base of XIndexAccess) ____
uno::Type SAL_CALL UncachedDataSequence::getElementType()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return ::getCppuType( reinterpret_cast< uno::Any * >(0));
}
::sal_Bool SAL_CALL UncachedDataSequence::hasElements()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
if( ! m_xDataProvider.is())
return sal_False;
@@ -272,20 +272,20 @@ uno::Type SAL_CALL UncachedDataSequence::getElementType()
// ____ XNamed ____
OUString SAL_CALL UncachedDataSequence::getName()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return m_aSourceRepresentation;
}
void SAL_CALL UncachedDataSequence::setName( const OUString& aName )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
m_aSourceRepresentation = aName;
fireModifyEvent();
}
Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
UncachedDataSequence * pNewSeq = new UncachedDataSequence( *this );
return Reference< util::XCloneable >( pNewSeq );
@@ -293,14 +293,14 @@ Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone()
// ____ XModifiable ____
::sal_Bool SAL_CALL UncachedDataSequence::isModified()
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
return sal_False;
}
void SAL_CALL UncachedDataSequence::setModified( ::sal_Bool bModified )
throw (beans::PropertyVetoException,
- uno::RuntimeException)
+ uno::RuntimeException, std::exception)
{
if( bModified )
fireModifyEvent();
@@ -308,7 +308,7 @@ 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)
+ throw (uno::RuntimeException, std::exception)
{
try
{
@@ -322,7 +322,7 @@ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XM
}
void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
try
{
diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx
index fc5429337d80..3a19c1807a99 100644
--- a/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/chart2/source/tools/WeakListenerAdapter.cxx
@@ -36,7 +36,7 @@ WeakModifyListenerAdapter::~WeakModifyListenerAdapter()
{}
void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEvent )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
Reference< util::XModifyListener > xModListener( getListener() );
if( xModListener.is())
@@ -52,7 +52,7 @@ WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter()
{}
void SAL_CALL WeakSelectionChangeListenerAdapter::selectionChanged( const lang::EventObject& aEvent )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
Reference< view::XSelectionChangeListener > xSelChgListener( getListener() );
if( xSelChgListener.is())
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index b967bd128f69..86c4195003e2 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -71,7 +71,7 @@ void WrappedPropertySet::clearWrappedPropertySet()
//XPropertySet
Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySetInfo( )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySetInfo > xInfo = m_xInfo;
if( !xInfo.is() )
@@ -93,7 +93,7 @@ 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)
+ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
try
{
@@ -140,7 +140,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam
}
}
Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Any aRet;
@@ -184,7 +184,7 @@ 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)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
if( xInnerPropertySet.is() )
@@ -197,7 +197,7 @@ 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)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
if( xInnerPropertySet.is() )
@@ -210,7 +210,7 @@ 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)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
if( xInnerPropertySet.is() )
@@ -223,7 +223,7 @@ 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)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() );
if( xInnerPropertySet.is() )
@@ -238,7 +238,7 @@ 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)
+ throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
bool bUnknownProperty = false;
sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
@@ -262,7 +262,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >&
// throw beans::UnknownPropertyException();
}
Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< OUString >& rNameSeq )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
Sequence< Any > aRetSeq;
if( rNameSeq.getLength() )
@@ -288,19 +288,19 @@ 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)
+ throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented yet");
//todo
}
void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ )
- throw (uno::RuntimeException)
+ 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)
+ throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented yet");
//todo
@@ -308,7 +308,7 @@ void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUS
//XPropertyState
beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE );
@@ -339,7 +339,7 @@ const WrappedProperty* WrappedPropertySet::getWrappedProperty( sal_Int32 nHandle
}
Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( const Sequence< OUString >& rNameSeq )
- throw (beans::UnknownPropertyException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
Sequence< beans::PropertyState > aRetSeq;
if( rNameSeq.getLength() )
@@ -355,7 +355,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates(
}
void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() );
if( xInnerPropertyState.is() )
@@ -368,7 +368,7 @@ void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropert
}
}
Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Any aRet;
Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() );
@@ -385,7 +385,7 @@ Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyNa
//XMultiPropertyStates
void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( )
- throw (uno::RuntimeException)
+ throw (uno::RuntimeException, std::exception)
{
const Sequence< beans::Property >& rPropSeq = getPropertySequence();
for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
@@ -395,7 +395,7 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( )
}
}
void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUString >& rNameSeq )
- throw (beans::UnknownPropertyException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
@@ -404,7 +404,7 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri
}
}
Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence< OUString >& rNameSeq )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
+ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Sequence< Any > aRetSeq;
if( rNameSeq.getLength() )