diff options
Diffstat (limited to 'chart2/source/tools/StatisticsHelper.cxx')
-rw-r--r-- | chart2/source/tools/StatisticsHelper.cxx | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx index c8fad963deab..5f3bbdf802d6 100644 --- a/chart2/source/tools/StatisticsHelper.cxx +++ b/chart2/source/tools/StatisticsHelper.cxx @@ -18,19 +18,19 @@ */ #include <StatisticsHelper.hxx> +#include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <ErrorBar.hxx> #include <unonames.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/data/LabeledDataSequence.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <cmath> #include <limits> @@ -69,7 +69,7 @@ double lcl_getVariance( const Sequence< double > & rData, sal_Int32 & rOutValidC return (fQuadSum - fSum*fSum/fN) / fN; } -Reference< chart2::data::XLabeledDataSequence > lcl_getErrorBarLabeledSequence( +uno::Reference< chart2::data::XLabeledDataSequence > lcl_getErrorBarLabeledSequence( const Reference< chart2::data::XDataSource > & xDataSource, bool bPositiveValue, bool bYError, OUString & rOutRoleNameUsed ) @@ -81,8 +81,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getErrorBarLabeledSequence( aRole.append( 'x'); OUString aPlainRole = aRole.makeStringAndClear(); - aRole.append( aPlainRole ); - aRole.append( '-' ); + aRole.append( aPlainRole + "-" ); if( bPositiveValue ) aRole.append( "positive" ); @@ -90,14 +89,14 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getErrorBarLabeledSequence( aRole.append( "negative" ); OUString aLongRole = aRole.makeStringAndClear(); - Reference< chart2::data::XLabeledDataSequence > xLSeq( - ::chart::DataSeriesHelper::getDataSequenceByRole( xDataSource, aLongRole )); + uno::Reference< chart2::data::XLabeledDataSequence > xLSeq = + ::chart::DataSeriesHelper::getDataSequenceByRole( xDataSource, aLongRole ); // try role without "-negative" or "-positive" postfix if( xLSeq.is()) rOutRoleNameUsed = aLongRole; else { - xLSeq.set( ::chart::DataSeriesHelper::getDataSequenceByRole( xDataSource, aPlainRole )); + xLSeq = ::chart::DataSeriesHelper::getDataSequenceByRole( xDataSource, aPlainRole ); if( xLSeq.is()) rOutRoleNameUsed = aPlainRole; else @@ -144,7 +143,7 @@ void lcl_setXMLRangePropertyAtDataSequence( { try { - static const OUStringLiteral aXMLRangePropName( u"CachedXMLRange"); + static constexpr OUString aXMLRangePropName( u"CachedXMLRange"_ustr); Reference< beans::XPropertySet > xProp( xDataSequence, uno::UNO_QUERY_THROW ); Reference< beans::XPropertySetInfo > xInfo( xProp->getPropertySetInfo()); if( xInfo.is() && xInfo->hasPropertyByName( aXMLRangePropName )) @@ -188,20 +187,20 @@ double StatisticsHelper::getStandardError( const Sequence< double > & rData ) return sqrt( fVar ) / sqrt( double(nValCount) ); } -Reference< chart2::data::XLabeledDataSequence > StatisticsHelper::getErrorLabeledDataSequenceFromDataSource( +uno::Reference< chart2::data::XLabeledDataSequence > StatisticsHelper::getErrorLabeledDataSequenceFromDataSource( const Reference< chart2::data::XDataSource > & xDataSource, bool bPositiveValue, bool bYError /* = true */ ) { - Reference< chart2::data::XLabeledDataSequence > xResult; + uno::Reference< chart2::data::XLabeledDataSequence > xResult; if( !xDataSource.is()) return xResult; OUString aRole; - Reference< chart2::data::XLabeledDataSequence > xLSeq( - lcl_getErrorBarLabeledSequence( xDataSource, bPositiveValue, bYError, aRole )); + uno::Reference< chart2::data::XLabeledDataSequence > xLSeq = + lcl_getErrorBarLabeledSequence( xDataSource, bPositiveValue, bYError, aRole ); if( xLSeq.is()) - xResult.set( xLSeq ); + xResult = xLSeq; return xResult; } @@ -211,10 +210,10 @@ Reference< chart2::data::XDataSequence > StatisticsHelper::getErrorDataSequenceF bool bPositiveValue, bool bYError /* = true */ ) { - Reference< chart2::data::XLabeledDataSequence > xLSeq( + uno::Reference< chart2::data::XLabeledDataSequence > xLSeq = StatisticsHelper::getErrorLabeledDataSequenceFromDataSource( xDataSource, bPositiveValue, - bYError )); + bYError ); if( !xLSeq.is()) return Reference< chart2::data::XDataSequence >(); @@ -281,18 +280,17 @@ void StatisticsHelper::setErrorDataSequence( } Reference< beans::XPropertySet > StatisticsHelper::addErrorBars( - const Reference< chart2::XDataSeries > & xDataSeries, + const rtl::Reference< DataSeries > & xDataSeries, sal_Int32 nStyle, bool bYError /* = true */ ) { Reference< beans::XPropertySet > xErrorBar; - Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY ); - if( !xSeriesProp.is()) + if( !xDataSeries.is()) return xErrorBar; const OUString aPropName( - bYError ? OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X)); - if( !( xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBar ) || + bYError ? CHART_UNONAME_ERRORBAR_Y : CHART_UNONAME_ERRORBAR_X); + if( !( xDataSeries->getPropertyValue( aPropName ) >>= xErrorBar ) || !xErrorBar.is()) { xErrorBar.set( new ErrorBar ); @@ -304,28 +302,27 @@ Reference< beans::XPropertySet > StatisticsHelper::addErrorBars( xErrorBar->setPropertyValue( "ErrorBarStyle", uno::Any( nStyle )); } - xSeriesProp->setPropertyValue( aPropName, uno::Any( xErrorBar )); + xDataSeries->setPropertyValue( aPropName, uno::Any( xErrorBar )); return xErrorBar; } Reference< beans::XPropertySet > StatisticsHelper::getErrorBars( - const Reference< chart2::XDataSeries > & xDataSeries, + const rtl::Reference< DataSeries > & xDataSeries, bool bYError /* = true */ ) { - Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY ); Reference< beans::XPropertySet > xErrorBar; const OUString aPropName( - bYError ? OUString(CHART_UNONAME_ERRORBAR_Y) : OUString(CHART_UNONAME_ERRORBAR_X)); + bYError ? CHART_UNONAME_ERRORBAR_Y : CHART_UNONAME_ERRORBAR_X); - if ( xSeriesProp.is()) - xSeriesProp->getPropertyValue( aPropName ) >>= xErrorBar; + if ( xDataSeries.is()) + xDataSeries->getPropertyValue( aPropName ) >>= xErrorBar; return xErrorBar; } bool StatisticsHelper::hasErrorBars( - const Reference< chart2::XDataSeries > & xDataSeries, + const rtl::Reference< DataSeries > & xDataSeries, bool bYError /* = true */ ) { Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError )); @@ -337,7 +334,7 @@ bool StatisticsHelper::hasErrorBars( } void StatisticsHelper::removeErrorBars( - const Reference< chart2::XDataSeries > & xDataSeries, + const rtl::Reference< DataSeries > & xDataSeries, bool bYError /* = true */ ) { Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError )); @@ -347,7 +344,7 @@ void StatisticsHelper::removeErrorBars( } bool StatisticsHelper::usesErrorBarRanges( - const Reference< chart2::XDataSeries > & xDataSeries, + const rtl::Reference< DataSeries > & xDataSeries, bool bYError /* = true */ ) { Reference< beans::XPropertySet > xErrorBar( getErrorBars( xDataSeries, bYError )); |