mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes to compiler errors, setRegressionProperties description.

Browse Source 
Change-Id: I40ef93746e5f2a43ce58f0080db0b643e22404a1
This commit is contained in:
Tomaž Vajngerl
2013-07-03 22:44:22 +02:00
parent 926275d071
commit 27a4d5597c
6 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
chart2/source/inc/LinearRegressionCurveCalculator.hxx
View File

@@ -36,7 +36,8 @@ private:
sal_Int32 aDegree,
sal_Bool aForceIntercept,
double aInterceptValue,
sal_Int32 aPeriod);
sal_Int32 aPeriod)
throw (com::sun::star::uno::RuntimeException);
virtual com::sun::star::uno::Sequence< com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
double min,

3
chart2/source/inc/RegressionCurveCalculator.hxx
View File

@@ -62,7 +62,8 @@ protected:
sal_Int32 aDegree,
sal_Bool aForceIntercept,
double aInterceptValue,
sal_Int32 aPeriod);
sal_Int32 aPeriod)
throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL recalculateRegression(
const com::sun::star::uno::Sequence< double >& aXValues,

10
chart2/source/tools/LinearRegressionCurveCalculator.cxx
View File

@@ -26,7 +26,6 @@
using namespace ::com::sun::star;
namespace chart
{
@@ -38,10 +37,11 @@ LinearRegressionCurveCalculator::~LinearRegressionCurveCalculator()
{}
void LinearRegressionCurveCalculator::setRegressionProperties(
sal_Int32 /*aDegree*/,
sal_Bool aForceIntercept,
double aInterceptValue,
sal_Int32 aPeriod)
sal_Int32 /*aDegree*/,
sal_Bool aForceIntercept,
double aInterceptValue,
sal_Int32 aPeriod )
throw (uno::RuntimeException)
{
PolynomialRegressionCurveCalculator::setRegressionProperties(
1,

3
chart2/source/tools/RegressionCurveCalculator.cxx
View File

@@ -73,7 +73,8 @@ void RegressionCurveCalculator::setRegressionProperties(
sal_Int32 aDegree,
sal_Bool aForceIntercept,
double aInterceptValue,
sal_Int32 aPeriod)
sal_Int32 aPeriod )
throw (uno::RuntimeException)
{
mDegree = aDegree;
mForceIntercept = aForceIntercept;

16
offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl
View File

@@ -36,7 +36,23 @@ module chart2
interface XRegressionCurveCalculator : com::sun::star::uno::XInterface
{
/** set calculation properties for curve calculation.
@param degree
Degree of polynomial regression curve, value should be greater than zero
If the curve is not polynomial, this property has no effect.
@param period
Period of a moving average regression curve, value should greater or equal to 2
If the curve is not moving average regression curve, this property has no effect.
@param forceIntercept
Should force the intercept value.
@param interceptValue
Intercept value.
*/
void setRegressionProperties( [in] long degree,
[in] boolean forceIntercept,
[in] double interceptValue,

5
xmloff/source/chart/SchXMLSeries2Context.cxx
View File

@@ -871,7 +871,7 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
try
{
OUString aServiceName;
XMLPropStyleContext* pPropStyleContext;
XMLPropStyleContext* pPropStyleContext = NULL;
if (!rCurrentStyleName.isEmpty())
{
@@ -910,7 +910,8 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
if( xRegCurve.is())
{
Reference< beans::XPropertySet > xCurveProperties( xRegCurve, uno::UNO_QUERY );
pPropStyleContext->FillPropertySet( xCurveProperties );
if( pPropStyleContext != NULL)
pPropStyleContext->FillPropertySet( xCurveProperties );
xRegCurve->setEquationProperties( iStyle->m_xEquationProperties );
}