Kaydet (Commit) 27a4d559 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

Fixes to compiler errors, setRegressionProperties description.

Change-Id: I40ef93746e5f2a43ce58f0080db0b643e22404a1
üst 926275d0
...@@ -36,7 +36,8 @@ private: ...@@ -36,7 +36,8 @@ private:
sal_Int32 aDegree, sal_Int32 aDegree,
sal_Bool aForceIntercept, sal_Bool aForceIntercept,
double aInterceptValue, 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( virtual com::sun::star::uno::Sequence< com::sun::star::geometry::RealPoint2D > SAL_CALL getCurveValues(
double min, double min,
......
...@@ -62,7 +62,8 @@ protected: ...@@ -62,7 +62,8 @@ protected:
sal_Int32 aDegree, sal_Int32 aDegree,
sal_Bool aForceIntercept, sal_Bool aForceIntercept,
double aInterceptValue, double aInterceptValue,
sal_Int32 aPeriod); sal_Int32 aPeriod)
throw (com::sun::star::uno::RuntimeException);
virtual void SAL_CALL recalculateRegression( virtual void SAL_CALL recalculateRegression(
const com::sun::star::uno::Sequence< double >& aXValues, const com::sun::star::uno::Sequence< double >& aXValues,
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
namespace chart namespace chart
{ {
...@@ -38,10 +37,11 @@ LinearRegressionCurveCalculator::~LinearRegressionCurveCalculator() ...@@ -38,10 +37,11 @@ LinearRegressionCurveCalculator::~LinearRegressionCurveCalculator()
{} {}
void LinearRegressionCurveCalculator::setRegressionProperties( void LinearRegressionCurveCalculator::setRegressionProperties(
sal_Int32 /*aDegree*/, sal_Int32 /*aDegree*/,
sal_Bool aForceIntercept, sal_Bool aForceIntercept,
double aInterceptValue, double aInterceptValue,
sal_Int32 aPeriod) sal_Int32 aPeriod )
throw (uno::RuntimeException)
{ {
PolynomialRegressionCurveCalculator::setRegressionProperties( PolynomialRegressionCurveCalculator::setRegressionProperties(
1, 1,
......
...@@ -73,7 +73,8 @@ void RegressionCurveCalculator::setRegressionProperties( ...@@ -73,7 +73,8 @@ void RegressionCurveCalculator::setRegressionProperties(
sal_Int32 aDegree, sal_Int32 aDegree,
sal_Bool aForceIntercept, sal_Bool aForceIntercept,
double aInterceptValue, double aInterceptValue,
sal_Int32 aPeriod) sal_Int32 aPeriod )
throw (uno::RuntimeException)
{ {
mDegree = aDegree; mDegree = aDegree;
mForceIntercept = aForceIntercept; mForceIntercept = aForceIntercept;
......
...@@ -36,7 +36,23 @@ module chart2 ...@@ -36,7 +36,23 @@ module chart2
interface XRegressionCurveCalculator : com::sun::star::uno::XInterface 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, void setRegressionProperties( [in] long degree,
[in] boolean forceIntercept, [in] boolean forceIntercept,
[in] double interceptValue, [in] double interceptValue,
......
...@@ -871,7 +871,7 @@ void SchXMLSeries2Context::setStylesToRegressionCurves( ...@@ -871,7 +871,7 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
try try
{ {
OUString aServiceName; OUString aServiceName;
XMLPropStyleContext* pPropStyleContext; XMLPropStyleContext* pPropStyleContext = NULL;
if (!rCurrentStyleName.isEmpty()) if (!rCurrentStyleName.isEmpty())
{ {
...@@ -910,7 +910,8 @@ void SchXMLSeries2Context::setStylesToRegressionCurves( ...@@ -910,7 +910,8 @@ void SchXMLSeries2Context::setStylesToRegressionCurves(
if( xRegCurve.is()) if( xRegCurve.is())
{ {
Reference< beans::XPropertySet > xCurveProperties( xRegCurve, uno::UNO_QUERY ); Reference< beans::XPropertySet > xCurveProperties( xRegCurve, uno::UNO_QUERY );
pPropStyleContext->FillPropertySet( xCurveProperties ); if( pPropStyleContext != NULL)
pPropStyleContext->FillPropertySet( xCurveProperties );
xRegCurve->setEquationProperties( iStyle->m_xEquationProperties ); xRegCurve->setEquationProperties( iStyle->m_xEquationProperties );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment